[WINED3D 7/8] Return NULL textures, instead of INVALIDCALL

Ivan Gyurdiev ivg231 at gmail.com
Mon Oct 2 19:20:12 CDT 2006


Return NULL texture if the sampler isn't set to anything, instead of 
INVALIDCALL.

This fixes failures in the textures test.
(by the way, so does the previous patch - vtf/dmap)

-------------- next part --------------
>From 41982b9c2764d21cfff7159a75937fe39f6d235c Mon Sep 17 00:00:00 2001
From: Ivan Gyurdiev <ivg2 at cornell.edu>
Date: Sun, 24 Sep 2006 02:07:05 -0400
Subject: [PATCH] Return NULL textures, instead of INVALIDCALL.

This fixes failures in the textures test.
---
 dlls/wined3d/device.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index a99798f..c8c3b4e 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5860,8 +5860,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
 
     if (*ppTexture)
         IWineD3DBaseTexture_AddRef(*ppTexture);
-    else
-        return WINED3DERR_INVALIDCALL;
+
     return WINED3D_OK;
 }
 
-- 
1.4.2.1



More information about the wine-patches mailing list