Stefan Dösinger : wined3d: Silently ignore setting the 0 texture on gdi surfaces.

Alexandre Julliard julliard at winehq.org
Wed Oct 10 06:46:15 CDT 2007


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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Tue Oct  9 14:53:58 2007 +0200

wined3d: Silently ignore setting the 0 texture on gdi surfaces.

---

 dlls/wined3d/surface_gdi.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c
index 33dfb10..c198dbb 100644
--- a/dlls/wined3d/surface_gdi.c
+++ b/dlls/wined3d/surface_gdi.c
@@ -710,7 +710,16 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3DSurface *iface)
 
 void WINAPI IWineGDISurfaceImpl_SetGlTextureDesc(IWineD3DSurface *iface, UINT textureName, int target) {
     IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface;
-    FIXME("(%p) : Should not be called on a GDI surface. textureName %u, target %i\n", This, textureName, target);
+
+    /* Ignore 0 textureName and target. D3D textures can be created with gdi surfaces as plain
+     * containers, but they're useless until the app creates a d3d device from a d3d point of
+     * view, it's not an implementation limitation. This avoids false warnings when the texture
+     * is destroyed and sets the description back to 0/0
+     */
+    if(textureName != 0 || target != 0) {
+        FIXME("(%p) : Should not be called on a GDI surface. textureName %u, target %i\n", This, textureName, target);
+        DebugBreak();
+    }
 }
 
 void WINAPI IWineGDISurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor **glDescription) {




More information about the wine-cvs mailing list