AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/nine: Switch {Set/Get/Free}PrivateData functions

Browse Source 
Switch {Set/Get/Free}PrivateData function to introduced IUnknown functions.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Axel Davy <axel.davy@ens.fr>
This commit is contained in:
Patrick Rudolph
2016-09-16 17:29:47 +02:00
committed by Axel Davy
parent 4117f5e1ab
commit 485cba7eb4
8 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/nine/cubetexture9.c
+3 -3
View File
@@ -302,9 +302,9 @@ IDirect3DCubeTexture9Vtbl NineCubeTexture9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Resource9 iface */
(void *)NineResource9_SetPrivateData,
(void *)NineResource9_GetPrivateData,
(void *)NineResource9_FreePrivateData,
(void *)NineUnknown_SetPrivateData,
(void *)NineUnknown_GetPrivateData,
(void *)NineUnknown_FreePrivateData,
(void *)NineResource9_SetPriority,
(void *)NineResource9_GetPriority,
(void *)NineBaseTexture9_PreLoad,
src/gallium/state_trackers/nine/indexbuffer9.c
+3 -3
View File
@@ -115,9 +115,9 @@ IDirect3DIndexBuffer9Vtbl NineIndexBuffer9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Resource9 iface */
(void *)NineResource9_SetPrivateData,
(void *)NineResource9_GetPrivateData,
(void *)NineResource9_FreePrivateData,
(void *)NineUnknown_SetPrivateData,
(void *)NineUnknown_GetPrivateData,
(void *)NineUnknown_FreePrivateData,
(void *)NineResource9_SetPriority,
(void *)NineResource9_GetPriority,
(void *)NineResource9_PreLoad,
src/gallium/state_trackers/nine/nine_lock.c
+59 -59
View File
@@ -122,6 +122,44 @@ IDirect3DAuthenticatedChannel9Vtbl LockAuthenticatedChannel9_vtable = {
(void *)LockAuthenticatedChannel9_Configure
};
static HRESULT NINE_WINAPI
LockUnknown_SetPrivateData( struct NineUnknown *This,
REFGUID refguid,
const void *pData,
DWORD SizeOfData,
DWORD Flags )
{
HRESULT r;
pipe_mutex_lock(d3dlock_global);
r = NineUnknown_SetPrivateData(This, refguid, pData, SizeOfData, Flags);
pipe_mutex_unlock(d3dlock_global);
return r;
}
static HRESULT NINE_WINAPI
LockUnknown_GetPrivateData( struct NineUnknown *This,
REFGUID refguid,
void *pData,
DWORD *pSizeOfData )
{
HRESULT r;
pipe_mutex_lock(d3dlock_global);
r = NineUnknown_GetPrivateData(This, refguid, pData, pSizeOfData);
pipe_mutex_unlock(d3dlock_global);
return r;
}
static HRESULT NINE_WINAPI
LockUnknown_FreePrivateData( struct NineUnknown *This,
REFGUID refguid )
{
HRESULT r;
pipe_mutex_lock(d3dlock_global);
r = NineUnknown_FreePrivateData(This, refguid);
pipe_mutex_unlock(d3dlock_global);
return r;
}
#if 0
static HRESULT NINE_WINAPI
LockResource9_GetDevice( struct NineResource9 *This,
@@ -135,44 +173,6 @@ LockResource9_GetDevice( struct NineResource9 *This,
}
#endif
static HRESULT NINE_WINAPI
LockResource9_SetPrivateData( struct NineResource9 *This,
REFGUID refguid,
const void *pData,
DWORD SizeOfData,
DWORD Flags )
{
HRESULT r;
pipe_mutex_lock(d3dlock_global);
r = NineResource9_SetPrivateData(This, refguid, pData, SizeOfData, Flags);
pipe_mutex_unlock(d3dlock_global);
return r;
}
static HRESULT NINE_WINAPI
LockResource9_GetPrivateData( struct NineResource9 *This,
REFGUID refguid,
void *pData,
DWORD *pSizeOfData )
{
HRESULT r;
pipe_mutex_lock(d3dlock_global);
r = NineResource9_GetPrivateData(This, refguid, pData, pSizeOfData);
pipe_mutex_unlock(d3dlock_global);
return r;
}
static HRESULT NINE_WINAPI
LockResource9_FreePrivateData( struct NineResource9 *This,
REFGUID refguid )
{
HRESULT r;
pipe_mutex_lock(d3dlock_global);
r = NineResource9_FreePrivateData(This, refguid);
pipe_mutex_unlock(d3dlock_global);
return r;
}
static DWORD NINE_WINAPI
LockResource9_SetPriority( struct NineResource9 *This,
DWORD PriorityNew )
@@ -483,9 +483,9 @@ IDirect3DCubeTexture9Vtbl LockCubeTexture9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Resource9 iface */
(void *)LockResource9_SetPrivateData,
(void *)LockResource9_GetPrivateData,
(void *)LockResource9_FreePrivateData,
(void *)LockUnknown_SetPrivateData,
(void *)LockUnknown_GetPrivateData,
(void *)LockUnknown_FreePrivateData,
(void *)LockResource9_SetPriority,
(void *)LockResource9_GetPriority,
(void *)LockBaseTexture9_PreLoad,
@@ -2495,9 +2495,9 @@ IDirect3DIndexBuffer9Vtbl LockIndexBuffer9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Resource9 iface */
(void *)LockResource9_SetPrivateData,
(void *)LockResource9_GetPrivateData,
(void *)LockResource9_FreePrivateData,
(void *)LockUnknown_SetPrivateData,
(void *)LockUnknown_GetPrivateData,
(void *)LockUnknown_FreePrivateData,
(void *)LockResource9_SetPriority,
(void *)LockResource9_GetPriority,
(void *)NineResource9_PreLoad, /* nop */
@@ -2729,9 +2729,9 @@ IDirect3DSurface9Vtbl LockSurface9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Resource9 iface */
(void *)LockResource9_SetPrivateData,
(void *)LockResource9_GetPrivateData,
(void *)LockResource9_FreePrivateData,
(void *)LockUnknown_SetPrivateData,
(void *)LockUnknown_GetPrivateData,
(void *)LockUnknown_FreePrivateData,
(void *)LockResource9_SetPriority,
(void *)LockResource9_GetPriority,
(void *)NineResource9_PreLoad, /* nop */
@@ -2961,9 +2961,9 @@ IDirect3DTexture9Vtbl LockTexture9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Resource9 iface */
(void *)LockResource9_SetPrivateData,
(void *)LockResource9_GetPrivateData,
(void *)LockResource9_FreePrivateData,
(void *)LockUnknown_SetPrivateData,
(void *)LockUnknown_GetPrivateData,
(void *)LockUnknown_FreePrivateData,
(void *)LockResource9_SetPriority,
(void *)LockResource9_GetPriority,
(void *)LockBaseTexture9_PreLoad,
@@ -3023,9 +3023,9 @@ IDirect3DVertexBuffer9Vtbl LockVertexBuffer9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Resource9 iface */
(void *)LockResource9_SetPrivateData,
(void *)LockResource9_GetPrivateData,
(void *)LockResource9_FreePrivateData,
(void *)LockUnknown_SetPrivateData,
(void *)LockUnknown_GetPrivateData,
(void *)LockUnknown_FreePrivateData,
(void *)LockResource9_SetPriority,
(void *)LockResource9_GetPriority,
(void *)NineResource9_PreLoad, /* nop */
@@ -3205,9 +3205,9 @@ IDirect3DVolume9Vtbl LockVolume9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Volume9 iface */
(void *)LockVolume9_SetPrivateData,
(void *)LockVolume9_GetPrivateData,
(void *)LockVolume9_FreePrivateData,
(void *)NineUnknown_SetPrivateData,
(void *)NineUnknown_GetPrivateData,
(void *)NineUnknown_FreePrivateData,
(void *)LockVolume9_GetContainer,
(void *)NineVolume9_GetDesc, /* immutable */
(void *)LockVolume9_LockBox,
@@ -3283,9 +3283,9 @@ IDirect3DVolumeTexture9Vtbl LockVolumeTexture9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Resource9 iface */
(void *)LockResource9_SetPrivateData,
(void *)LockResource9_GetPrivateData,
(void *)LockResource9_FreePrivateData,
(void *)LockUnknown_SetPrivateData,
(void *)LockUnknown_GetPrivateData,
(void *)LockUnknown_FreePrivateData,
(void *)LockResource9_SetPriority,
(void *)LockResource9_GetPriority,
(void *)LockBaseTexture9_PreLoad,
src/gallium/state_trackers/nine/surface9.c
+3 -3
View File
@@ -545,9 +545,9 @@ IDirect3DSurface9Vtbl NineSurface9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Resource9 iface */
(void *)NineResource9_SetPrivateData,
(void *)NineResource9_GetPrivateData,
(void *)NineResource9_FreePrivateData,
(void *)NineUnknown_SetPrivateData,
(void *)NineUnknown_GetPrivateData,
(void *)NineUnknown_FreePrivateData,
(void *)NineResource9_SetPriority,
(void *)NineResource9_GetPriority,
(void *)NineResource9_PreLoad,
src/gallium/state_trackers/nine/texture9.c
+3 -3
View File
@@ -345,9 +345,9 @@ IDirect3DTexture9Vtbl NineTexture9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Resource9 iface */
(void *)NineResource9_SetPrivateData,
(void *)NineResource9_GetPrivateData,
(void *)NineResource9_FreePrivateData,
(void *)NineUnknown_SetPrivateData,
(void *)NineUnknown_GetPrivateData,
(void *)NineUnknown_FreePrivateData,
(void *)NineResource9_SetPriority,
(void *)NineResource9_GetPriority,
(void *)NineBaseTexture9_PreLoad,
src/gallium/state_trackers/nine/vertexbuffer9.c
+3 -3
View File
@@ -98,9 +98,9 @@ IDirect3DVertexBuffer9Vtbl NineVertexBuffer9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Resource9 iface */
(void *)NineResource9_SetPrivateData,
(void *)NineResource9_GetPrivateData,
(void *)NineResource9_FreePrivateData,
(void *)NineUnknown_SetPrivateData,
(void *)NineUnknown_GetPrivateData,
(void *)NineUnknown_FreePrivateData,
(void *)NineResource9_SetPriority,
(void *)NineResource9_GetPriority,
(void *)NineResource9_PreLoad,
src/gallium/state_trackers/nine/volume9.c
+3 -3
View File
@@ -513,9 +513,9 @@ IDirect3DVolume9Vtbl NineVolume9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Volume9 iface */
(void *)NineVolume9_SetPrivateData,
(void *)NineVolume9_GetPrivateData,
(void *)NineVolume9_FreePrivateData,
(void *)NineUnknown_SetPrivateData,
(void *)NineUnknown_GetPrivateData,
(void *)NineUnknown_FreePrivateData,
(void *)NineVolume9_GetContainer,
(void *)NineVolume9_GetDesc,
(void *)NineVolume9_LockBox,
src/gallium/state_trackers/nine/volumetexture9.c
+3 -3
View File
@@ -243,9 +243,9 @@ IDirect3DVolumeTexture9Vtbl NineVolumeTexture9_vtable = {
(void *)NineUnknown_AddRef,
(void *)NineUnknown_Release,
(void *)NineUnknown_GetDevice, /* actually part of Resource9 iface */
(void *)NineResource9_SetPrivateData,
(void *)NineResource9_GetPrivateData,
(void *)NineResource9_FreePrivateData,
(void *)NineUnknown_SetPrivateData,
(void *)NineUnknown_GetPrivateData,
(void *)NineUnknown_FreePrivateData,
(void *)NineResource9_SetPriority,
(void *)NineResource9_GetPriority,
(void *)NineBaseTexture9_PreLoad,