wined3d: Move constant loading out of DrawPrimDrawStrided() and enable

loading float constants for GLSL. - DrawPrim is just too big of a function. This separates the passing of constants to the shader into new functions. - Fixes an off-by-one error when loading vertex declaration constants (should be <, not <=) - Adds a function for GLSL loading of constants (aka Uniforms) - Adds a GLSL program variable to the stateblock and sets it to 0 (a future patch will actually create this program)

wined3d: Move constant loading out of DrawPrimDrawStrided() and enable
1f1057fc · Jason Green · Alexandre Julliard · 217dae68 · 1f1057fc · 1f1057fc
Commit 1f1057fc authored Jun 08, 2006 by Jason Green Committed by Alexandre Julliard Jun 09, 2006
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

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

stateblock.c dlls/wined3d/stateblock.c +4 -0

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

No files found.
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -874,6 +874,10 @@ HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStateBlock* 
    }
    This->wineD3DDevice->currentPalette = 0;

+    /* Set default GLSL program ID to 0.  We won't actually create one
+     * until the app sets a vertex or pixel shader */
+    This->shaderPrgId = 0;
+
    TRACE("-----------------------> Device defaults now set up...\n");
    return WINED3D_OK;
 }

--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1070,6 +1070,8 @@ struct IWineD3DStateBlockImpl
    /* Sampler States */
    DWORD                     samplerState[MAX_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1];

+    /* Current GLSL Shader Program */
+    GLhandleARB               shaderPrgId;
 };

 extern const IWineD3DStateBlockVtbl IWineD3DStateBlock_Vtbl;