wined3d: Use gl_Color and gl_SecondaryColor to support more varyings in SM3.0 shaders.

SM3.0 requires 10 4 component float varyings for passing stuff between vertex and pixel shaders. GF7 and earlier report 8 generic varyings + gl_Color and gl_SecondaryColor in GLSL. This patch allows us to use gl_Color and gl_SecondaryColor to get 2 extra varyings, which some games, like C&C3 with highest gfx settings, require.

wined3d: Use gl_Color and gl_SecondaryColor to support more varyings in SM3.0 shaders.
a6fa6a4a · H. Verbeet · Alexandre Julliard · 4a4ab5f2 · a6fa6a4a · a6fa6a4a
Commit a6fa6a4a authored Jun 19, 2008 by H. Verbeet Committed by Alexandre Julliard Jun 19, 2008
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

glsl_shader.c dlls/wined3d/glsl_shader.c +0 -0

pixelshader.c dlls/wined3d/pixelshader.c +2 -0

wined3d_private.h dlls/wined3d/wined3d_private.h +2 -0

No files found.
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -359,6 +359,7 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i
            for(i = 0; i < MAX_REG_INPUT; i++) {
                This->input_reg_map[i] = i;
            }
+            This->declared_in_count = highest_reg_used + 1;
        } else {
            j = 0;
            for(i = 0; i < MAX_REG_INPUT; i++) {
@@ -369,6 +370,7 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i
                    This->input_reg_map[i] = -1;
                }
            }
+            This->declared_in_count = j;
        }
    }
    This->baseShader.load_local_constsF = FALSE;

--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1830,6 +1830,7 @@ struct glsl_shader_prog_link {
    GLhandleARB             srgb_comparison_location;
    GLhandleARB             srgb_mul_low_location;
    GLhandleARB             ycorrection_location;
+    GLenum                  vertex_color_clamp;
    GLhandleARB             vshader;
    GLhandleARB             pshader;
 };
@@ -2343,6 +2344,7 @@ typedef struct IWineD3DPixelShaderImpl {
    semantic semantics_in [MAX_REG_INPUT];
    DWORD                 input_reg_map[MAX_REG_INPUT];
    BOOL                  input_reg_used[MAX_REG_INPUT];
+    int                         declared_in_count;

    /* run time data */
    PSHADERDATA                *data;