Henri Verbeet : wined3d: Remove a redundant check from basetexture_get_autogen_filter_type().

Alexandre Julliard julliard at winehq.org
Wed Aug 5 09:47:58 CDT 2009


Module: wine
Branch: master
Commit: 62ac872b3688dcc1f497d63c19aad8eacecd1f58
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=62ac872b3688dcc1f497d63c19aad8eacecd1f58

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Aug  5 09:01:01 2009 +0200

wined3d: Remove a redundant check from basetexture_get_autogen_filter_type().

This is already initialized to an appropriate value in basetexture_init().
Also fix the indentation while we're at it.

---

 dlls/wined3d/basetexture.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index 086315e..2970108 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -176,12 +176,11 @@ HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DT
 
 WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface)
 {
-  IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface;
-  FIXME("(%p) : stub\n", This);
-  if (!(This->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP)) {
-     return WINED3DTEXF_NONE;
-  }
-  return This->baseTexture.filterType;
+    IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface;
+
+    FIXME("(%p) : stub\n", This);
+
+    return This->baseTexture.filterType;
 }
 
 void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface)




More information about the wine-cvs mailing list