Skip to content

W
wine-winehq
Commit c866eab7 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3d8: Just return the resource type in IDirect3DResource8::GetType() implementations.

There's no need to ask wined3d, since it's constant for a given implementation.
parent 84ce0020
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 24 deletions
dlls/d3d8/cubetexture.c
View file @ c866eab7
...@@ -194,16 +194,9 @@ static void WINAPI IDirect3DCubeTexture8Impl_PreLoad(IDirect3DCubeTexture8 *ifac ...@@ -194,16 +194,9 @@ static void WINAPI IDirect3DCubeTexture8Impl_PreLoad(IDirect3DCubeTexture8 *ifac
static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture8Impl_GetType(IDirect3DCubeTexture8 *iface) static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture8Impl_GetType(IDirect3DCubeTexture8 *iface)
{ {
IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface);
D3DRESOURCETYPE type;
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
wined3d_mutex_lock(); return D3DRTYPE_CUBETEXTURE;
type = wined3d_texture_get_type(This->wined3d_texture);
wined3d_mutex_unlock();
return type;
} }
/* IDirect3DCubeTexture8 IDirect3DBaseTexture8 Interface follow: */ /* IDirect3DCubeTexture8 IDirect3DBaseTexture8 Interface follow: */
......
dlls/d3d8/texture.c
View file @ c866eab7
...@@ -192,16 +192,9 @@ static void WINAPI IDirect3DTexture8Impl_PreLoad(IDirect3DTexture8 *iface) ...@@ -192,16 +192,9 @@ static void WINAPI IDirect3DTexture8Impl_PreLoad(IDirect3DTexture8 *iface)
static D3DRESOURCETYPE WINAPI IDirect3DTexture8Impl_GetType(IDirect3DTexture8 *iface) static D3DRESOURCETYPE WINAPI IDirect3DTexture8Impl_GetType(IDirect3DTexture8 *iface)
{ {
IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface);
D3DRESOURCETYPE type;
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
wined3d_mutex_lock(); return D3DRTYPE_TEXTURE;
type = wined3d_texture_get_type(This->wined3d_texture);
wined3d_mutex_unlock();
return type;
} }
/* IDirect3DTexture8 IDirect3DBaseTexture8 Interface follow: */ /* IDirect3DTexture8 IDirect3DBaseTexture8 Interface follow: */
......
dlls/d3d8/volumetexture.c
View file @ c866eab7
...@@ -192,16 +192,9 @@ static void WINAPI IDirect3DVolumeTexture8Impl_PreLoad(IDirect3DVolumeTexture8 * ...@@ -192,16 +192,9 @@ static void WINAPI IDirect3DVolumeTexture8Impl_PreLoad(IDirect3DVolumeTexture8 *
static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture8Impl_GetType(IDirect3DVolumeTexture8 *iface) static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture8Impl_GetType(IDirect3DVolumeTexture8 *iface)
{ {
IDirect3DVolumeTexture8Impl *This = impl_from_IDirect3DVolumeTexture8(iface);
D3DRESOURCETYPE type;
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
wined3d_mutex_lock(); return D3DRTYPE_VOLUMETEXTURE;
type = wined3d_texture_get_type(This->wined3d_texture);
wined3d_mutex_unlock();
return type;
} }
/* IDirect3DVolumeTexture8 IDirect3DBaseTexture8 Interface follow: */ /* IDirect3DVolumeTexture8 IDirect3DBaseTexture8 Interface follow: */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment