Use the ProgramBinary's serial to track changed D3D9 shaders instead of the Program's

Trac #21270 Bug=351 Signed-off-by: Nicolas Capens This is necessary since the shaders can change every time a new ProgramBinary is created (eg when re-linking or loading a new binary). git-svn-id: https://angleproject.googlecode.com/svn/trunk@1233 736b8ea6-26fd-11df-bfd4-992fa37f6226

Use the ProgramBinary's serial to track changed D3D9 shaders instead of the Program's
e6af4f93 · daniel@transgaming.com · e87ca000 · e6af4f93 · e6af4f93
Commit e6af4f93 authored Jul 24, 2012 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Context.cpp src/libGLESv2/Context.cpp +3 -3

Context.h src/libGLESv2/Context.h +1 -1

No files found.
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -384,7 +384,7 @@ void Context::markAllStateDirty()
        mAppliedTextureSerialVS[t] = 0;
    }

-    mAppliedProgramSerial = 0;
+    mAppliedProgramBinarySerial = 0;
    mAppliedRenderTargetSerial = 0;
    mAppliedDepthbufferSerial = 0;
    mAppliedStencilbufferSerial = 0;
@@ -2339,7 +2339,7 @@ void Context::applyShaders()
    Program *programObject = getCurrentProgram();
    ProgramBinary *programBinary = programObject->getProgramBinary();

-    if (programObject->getSerial() != mAppliedProgramSerial)
+    if (programBinary->getSerial() != mAppliedProgramBinarySerial)
    {
        IDirect3DVertexShader9 *vertexShader = programBinary->getVertexShader();
        IDirect3DPixelShader9 *pixelShader = programBinary->getPixelShader();
@@ -2347,7 +2347,7 @@ void Context::applyShaders()
        mDevice->SetPixelShader(pixelShader);
        mDevice->SetVertexShader(vertexShader);
        programBinary->dirtyAllUniforms();
-        mAppliedProgramSerial = programObject->getSerial();
+        mAppliedProgramBinarySerial = programBinary->getSerial();
    }

    programBinary->applyUniforms();

--- a/src/libGLESv2/Context.h
+++ b/src/libGLESv2/Context.h
@@ -586,7 +586,7 @@ class Context

    unsigned int mAppliedTextureSerialPS[MAX_TEXTURE_IMAGE_UNITS];
    unsigned int mAppliedTextureSerialVS[MAX_VERTEX_TEXTURE_IMAGE_UNITS_VTF];
-    unsigned int mAppliedProgramSerial;
+    unsigned int mAppliedProgramBinarySerial;
    unsigned int mAppliedRenderTargetSerial;
    unsigned int mAppliedDepthbufferSerial;
    unsigned int mAppliedStencilbufferSerial;