[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-patches
Subject:    [3/5] wined3d: Fix the value of HIGHEST_TRANSFORMSTATE.
From:       Henri Verbeet <hverbeet () codeweavers ! com>
Date:       2008-12-31 16:01:14
Message-ID: 495B974A.6090307 () codeweavers ! com
[Download RAW message or body]

["0003-wined3d-Fix-the-value-of-HIGHEST_TRANSFORMSTATE.patch" (text/plain)]

From 232a77a96987a9f18fc193d3bc8cfd63b9b0f0bd Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Wed, 31 Dec 2008 16:57:10 +0100
Subject: wined3d: Fix the value of HIGHEST_TRANSFORMSTATE.

The highest transform state should be 511.
---
 dlls/wined3d/device.c          |    2 +-
 dlls/wined3d/wined3d_private.h |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 64dd866..3a382da 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2726,7 +2726,7 @@ static HRESULT WINAPI \
IWineD3DDeviceImpl_MultiplyTransform(IWineD3DDevice *iface  IWineD3DDeviceImpl *This \
= (IWineD3DDeviceImpl *)iface;  TRACE("(%p) : For state %s\n", This, \
debug_d3dtstype(State));  
-    if (State < HIGHEST_TRANSFORMSTATE)
+    if (State <= HIGHEST_TRANSFORMSTATE)
     {
         mat = &This->updateStateBlock->transforms[State];
     } else {
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 82931ea..60df5bb 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -531,9 +531,7 @@ extern int num_lock;
 
 #define MAX_STREAMS  16  /* Maximum possible streams - used for fixed size arrays
                             See MaxStreams in MSDN under GetDeviceCaps */
-                         /* Maximum number of constants provided to the shaders */
-#define HIGHEST_TRANSFORMSTATE 512 
-                         /* Highest value in WINED3DTRANSFORMSTATETYPE */
+#define HIGHEST_TRANSFORMSTATE WINED3DTS_WORLDMATRIX(255) /* Highest value in \
WINED3DTRANSFORMSTATETYPE */  
 /* Checking of API calls */
 /* --------------------- */
-- 
1.6.0.6





[prev in list] [next in list] [prev in thread] [next in thread]