[WINED3D 6/7] Added correct cast support for gl_FogFragCoord and gl_PointSize output registers.

[Jason Green]

-------------- next part --------------
From nobody Mon Sep 17 00:00:00 2001
From: Jason <jason at jave02.(none)>
Date: Fri, 16 Jun 2006 15:58:58 -0400
Subject: [PATCH 6/7] Added correct cast support for gl_FogFragCoord and gl_PointSize output registers.

---

 dlls/wined3d/glsl_shader.c |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

ed1be00f017ebb3ea2769e0d495230960d465763
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 4ed71de..e5f9d2c 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -384,13 +384,22 @@ static const char* shift_glsl_tab[] = {
 static void shader_glsl_add_dst(DWORD param, const char* reg_name, const 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 (reg_name[0] == 'A') {
+        /* Address register for vertex shaders (ivec4) */
+        strcpy(cast, "ivec4");
+        
+    } else if ((shader_get_regtype(param) == D3DSPR_RASTOUT)
+               && ((param & D3DSP_REGNUM_MASK) != 0)) {
+        /* gl_FogFragCoord or glPointSize - both floats */
+        strcpy(cast, "float");
+    } 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 */
-- 
1.3.3