Jason Green : wined3d: Added correct cast support for gl_FogFragCoord and gl_PointSize output registers .

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 9afa540eb54976a497ba16e6cfde06bf47bc8cdb
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=9afa540eb54976a497ba16e6...

Author: Jason Green 
Date:   Sat Jun 17 15:55:15 2006 -0400

wined3d: Added correct cast support for gl_FogFragCoord and gl_PointSize output registers.

---

dlls/wined3d/glsl_shader.c |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 6b4fd72..a9b5820 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -380,17 +380,29 @@ static const char* shift_glsl_tab[] = {
     "0.5 * "      /* 15 (d2)   */ 
 };

-/** Print the beginning of the generated GLSL string. example: "reg_name.xyzw = vec4("  */
-static void shader_glsl_add_dst(DWORD param, const char* reg_name, const char* reg_mask, char* outStr) {
+/** Print the beginning of the generated GLSL string. example: "reg_name.xyzw = vec4("
+ * Will also change the reg_mask if necessary (not all register types are equal in DX vs GL)  */
+static void shader_glsl_add_dst(DWORD param, const char* reg_name, char* reg_mask, char* outStr) {

int shift = (param & D3DSP_DSTSHIFT_MASK) >> D3DSP_DSTSHIFT_SHIFT;
-
-    /* TODO: determine if destination is anything other than a float vector and accommodate*/
-    if (reg_name[0] == 'A')
-            sprintf(outStr, "%s%s = %sivec4(", reg_name, reg_mask, shift_glsl_tab[shift]);
-    else 
-    sprintf(outStr, "%s%s = %svec4(", reg_name, reg_mask, shift_glsl_tab[shift]); 
-
+    char cast[6];
+    
+    if ((shader_get_regtype(param) == D3DSPR_RASTOUT)
+         && ((param & D3DSP_REGNUM_MASK) != 0)) {
+        /* gl_FogFragCoord or glPointSize - both floats */
+        strcpy(cast, "float");
+        strcpy(reg_mask, "");
+
+    } else if (reg_name[0] == 'A') {
+        /* Address register for vertex shaders (ivec4) */
+        strcpy(cast, "ivec4");
+        
+    } else {
+        /* Everything else should be a 4 component float vector */
+        strcpy(cast, "vec4");
+    }
+    
+    sprintf(outStr, "%s%s = %s%s(", reg_name, reg_mask, shift_glsl_tab[shift], cast); 
 }

/* Generate a GLSL parameter that does the input modifier computation and return the input register/mask to use */