Ivan Gyurdiev : wined3d:
Make GetTexture and GetSamplerState read from the correct stateblock.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Oct 30 05:22:34 CST 2006
Module: wine
Branch: master
Commit: 69550f2c4790a109552466224d6a0e97422ceef3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=69550f2c4790a109552466224d6a0e97422ceef3
Author: Ivan Gyurdiev <ivg231 at gmail.com>
Date: Sat Oct 28 19:55:55 2006 -0400
wined3d: Make GetTexture and GetSamplerState read from the correct stateblock.
---
dlls/wined3d/device.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 33b4e87..dc360db 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4638,7 +4638,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
static HRESULT WINAPI IWineD3DDeviceImpl_GetSamplerState(IWineD3DDevice *iface, DWORD Sampler, WINED3DSAMPLERSTATETYPE Type, DWORD* Value) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
/** TODO: check that sampler is in range **/
- *Value = This->updateStateBlock->samplerState[Sampler][Type];
+ *Value = This->stateBlock->samplerState[Sampler][Type];
TRACE("(%p) : Sampler %d Type %u Returning %d\n", This, Sampler, Type, *Value);
return WINED3D_OK;
@@ -5817,7 +5817,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
TRACE("Attempt to access invalid texture rejected\n");
return WINED3DERR_INVALIDCALL;
}
- *ppTexture=This->updateStateBlock->textures[Stage];
+ *ppTexture=This->stateBlock->textures[Stage];
if (*ppTexture)
IWineD3DBaseTexture_AddRef(*ppTexture);
More information about the wine-cvs
mailing list