[7/15]: WineD3D: Avoid false resultarg warnings
Stefan Dösinger
stefan at codeweavers.com
Wed Jan 10 04:31:18 CST 2007
If the resultarg for an unsupported stage is changed, there is no need to
warn. tex_colorop and sampler warn if an unsupported stage is used, so no
need to write a fixme about that either.
-------------- next part --------------
From dcddc7c983db45b7eb943831ae69d493ffff9871 Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan at codeweavers.com>
Date: Sun, 7 Jan 2007 13:27:02 +0100
Subject: [PATCH] WineD3D: Avoid false resultarg warnings
---
dlls/wined3d/state.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index bfcd0eb..e8914c7 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1725,6 +1725,10 @@ static void tex_bumpenvloffset(DWORD state, IWineD3DStateBlockImpl *stateblock)
static void tex_resultarg(DWORD state, IWineD3DStateBlockImpl *stateblock) {
DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE;
+ if(stage >= GL_LIMITS(texture_stages)) {
+ return;
+ }
+
if(stateblock->textureState[stage][WINED3DTSS_RESULTARG] != D3DTA_CURRENT) {
ERR("WINED3DTSS_RESULTARG not supported yet\n");
}
--
1.4.4.3
More information about the wine-patches
mailing list