Ivan Gyurdiev : wined3d: Add D3DVS_RASTOUT_OFFSETS to the WINED3D namespace .

Alexandre Julliard julliard at wine.codeweavers.com
Tue Oct 24 13:39:56 CDT 2006


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

Author: Ivan Gyurdiev <ivg231 at gmail.com>
Date:   Tue Oct 24 06:04:12 2006 -0400

wined3d: Add D3DVS_RASTOUT_OFFSETS to the WINED3D namespace.

---

 dlls/wined3d/vertexshader.c          |    6 +++---
 dlls/wined3d/wined3d_private_types.h |    9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index d48be44..1b84c00 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -942,13 +942,13 @@ #endif
                         break;
                     case WINED3DSPR_RASTOUT:
                         switch (reg) {
-                        case D3DSRO_POSITION:
+                        case WINED3DSRO_POSITION:
                             p[i] = &output->oPos;
                             break;
-                        case D3DSRO_FOG:
+                        case WINED3DSRO_FOG:
                             p[i] = &output->oFog;
                             break;
-                        case D3DSRO_POINT_SIZE:
+                        case WINED3DSRO_POINT_SIZE:
                             p[i] = &output->oPts;
                             break;
                         }
diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h
index 2466fa5..f02e980 100644
--- a/dlls/wined3d/wined3d_private_types.h
+++ b/dlls/wined3d/wined3d_private_types.h
@@ -80,6 +80,15 @@ typedef enum _WINED3DSHADER_PARAM_REGIST
   WINED3DSPR_FORCE_DWORD  = 0x7FFFFFFF
 } WINED3DSHADER_PARAM_REGISTER_TYPE;
 
+/* RASTOUT register offsets */
+typedef enum _WINED3DVS_RASTOUT_OFFSETS {
+  WINED3DSRO_POSITION     = 0,
+  WINED3DSRO_FOG          = 1,
+  WINED3DSRO_POINT_SIZE   = 2,
+
+  WINED3DSRO_FORCE_DWORD  = 0x7FFFFFFF
+} WINED3DVS_RASTOUT_OFFSETS;
+
 /** Source register modifiers **/
 #define WINED3DVS_SWIZZLE_SHIFT      16
 #define WINED3DVS_SWIZZLE_MASK       (0xFF << WINED3DVS_SWIZZLE_SHIFT)




More information about the wine-cvs mailing list