wined3d: Correct an off-by-one error in constant dirtification.

Constant numbers start at 0, and the loading loop has a for(i; i < dirtyconsts; i++). This means that the highest dirty constant isn't loaded correctly. Rather than replacing the < with <=, which would make it impossible to have no dirty constant, add 1 to the dirty constant counter.

wined3d: Correct an off-by-one error in constant dirtification.
9be8f36c · Stefan Dösinger · Alexandre Julliard · 5bd57c59 · 9be8f36c · 9be8f36c
Commit 9be8f36c authored Jul 06, 2008 by Stefan Dösinger Committed by Alexandre Julliard Jul 07, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

arb_program_shader.c dlls/wined3d/arb_program_shader.c +1 -1

device.c dlls/wined3d/device.c +2 -2

No files found.
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -134,7 +134,7 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl* This, Win
        ret = 0;
        LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) {
            dirty_consts[lconst->idx] = 1; /* Dirtify so the non-immediate constant overwrites it next time */
-            ret = max(ret, lconst->idx);
+            ret = max(ret, lconst->idx + 1);
            GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, lconst->idx, (GLfloat*)lconst->value));
        }
        checkGLcall("glProgramEnvParameter4fvARB()");

--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3602,7 +3602,7 @@ UINT count) {
     */
    memset(This->activeContext->vshader_const_dirty + start, 1,
           sizeof(*This->activeContext->vshader_const_dirty) * count);
-    This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start+count);
+    This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start+count+1);

    IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VERTEXSHADERCONSTANT);

@@ -4030,7 +4030,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantF_DirtyConst(
     */
    memset(This->activeContext->pshader_const_dirty + start, 1,
           sizeof(*This->activeContext->pshader_const_dirty) * count);
-    This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start+count);
+    This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start+count+1);

    IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADERCONSTANT);