Move program binary serial caching to renderer

src/libGLESv2/Context.cpp

@@ -317,8 +317,6 @@ void Context::markAllStateDirty()
         mAppliedTextureSerialVS[t] = 0;
     }
 
-    mAppliedProgramBinarySerial = 0;
-
     mDxUniformsDirty = true;
 }
 
@@ -1784,11 +1782,7 @@ void Context::applyShaders()
 {
     ProgramBinary *programBinary = getCurrentProgramBinary();
 
-    if (programBinary->getSerial() != mAppliedProgramBinarySerial)
-    {
-        mRenderer->applyShaders(programBinary);
-        mAppliedProgramBinarySerial = programBinary->getSerial();
-    }
+    mRenderer->applyShaders(programBinary);
     
     programBinary->applyUniforms();
 }

src/libGLESv2/Context.h

@@ -490,7 +490,6 @@ class Context
 
     unsigned int mAppliedTextureSerialPS[MAX_TEXTURE_IMAGE_UNITS];
     unsigned int mAppliedTextureSerialVS[MAX_VERTEX_TEXTURE_IMAGE_UNITS_VTF];
-    unsigned int mAppliedProgramBinarySerial;
     bool mDxUniformsDirty;
     BindingPointer<ProgramBinary> mCurrentProgramBinary;
     Framebuffer *mBoundDrawFramebuffer;

src/libGLESv2/renderer/Renderer11.cpp

@@ -696,18 +696,24 @@ void Renderer11::drawElements(GLenum mode, GLsizei count, GLenum type, const GLv
 
 void Renderer11::applyShaders(gl::ProgramBinary *programBinary)
 {
-    ShaderExecutable *vertexExe = programBinary->getVertexExecutable();
-    ShaderExecutable *pixelExe = programBinary->getPixelExecutable();
+    unsigned int programBinarySerial = programBinary->getSerial();
+    if (programBinarySerial != mAppliedProgramBinarySerial)
+    {
+        ShaderExecutable *vertexExe = programBinary->getVertexExecutable();
+        ShaderExecutable *pixelExe = programBinary->getPixelExecutable();
+
+        ID3D11VertexShader *vertexShader = NULL;
+        if (vertexExe) vertexShader = ShaderExecutable11::makeShaderExecutable11(vertexExe)->getVertexShader();
 
-    ID3D11VertexShader *vertexShader = NULL;
-    if (vertexExe) vertexShader = ShaderExecutable11::makeShaderExecutable11(vertexExe)->getVertexShader();
+        ID3D11PixelShader *pixelShader = NULL;
+        if (pixelExe) pixelShader = ShaderExecutable11::makeShaderExecutable11(pixelExe)->getPixelShader();
 
-    ID3D11PixelShader *pixelShader = NULL;
-    if (pixelExe) pixelShader = ShaderExecutable11::makeShaderExecutable11(pixelExe)->getPixelShader();
+        mDeviceContext->PSSetShader(pixelShader, NULL, 0);
+        mDeviceContext->VSSetShader(vertexShader, NULL, 0);
+        programBinary->dirtyAllUniforms();
 
-    mDeviceContext->PSSetShader(pixelShader, NULL, 0);
-    mDeviceContext->VSSetShader(vertexShader, NULL, 0);
-    programBinary->dirtyAllUniforms();
+        mAppliedProgramBinarySerial = programBinarySerial;
+    }
 }
 
 void Renderer11::clear(const gl::ClearParameters &clearParams, gl::Framebuffer *frameBuffer)
@@ -839,6 +845,8 @@ void Renderer11::markAllStateDirty()
     mForceSetDepthStencilState = true;
     mForceSetScissor = true;
     mForceSetViewport = true;
+
+    mAppliedProgramBinarySerial = 0;
 }
 
 void Renderer11::releaseDeviceResources()

src/libGLESv2/renderer/Renderer11.h

@@ -192,6 +192,8 @@ class Renderer11 : public Renderer
     float mCurNear;
     float mCurFar;
 
+    unsigned int mAppliedProgramBinarySerial;
+
     ID3D11Device *mDevice;
     D3D_FEATURE_LEVEL mFeatureLevel;
     ID3D11DeviceContext *mDeviceContext;

src/libGLESv2/renderer/Renderer9.cpp

@@ -1412,18 +1412,24 @@ void Renderer9::drawLineLoop(GLsizei count, GLenum type, const GLvoid *indices,
 
 void Renderer9::applyShaders(gl::ProgramBinary *programBinary)
 {
-    ShaderExecutable *vertexExe = programBinary->getVertexExecutable();
-    ShaderExecutable *pixelExe = programBinary->getPixelExecutable();
+    unsigned int programBinarySerial = programBinary->getSerial();
+    if (programBinarySerial != mAppliedProgramBinarySerial)
+    {
+        ShaderExecutable *vertexExe = programBinary->getVertexExecutable();
+        ShaderExecutable *pixelExe = programBinary->getPixelExecutable();
+
+        IDirect3DVertexShader9 *vertexShader = NULL;
+        if (vertexExe) vertexShader = ShaderExecutable9::makeShaderExecutable9(vertexExe)->getVertexShader();
 
-    IDirect3DVertexShader9 *vertexShader = NULL;
-    if (vertexExe) vertexShader = ShaderExecutable9::makeShaderExecutable9(vertexExe)->getVertexShader();
+        IDirect3DPixelShader9 *pixelShader = NULL;
+        if (pixelExe) pixelShader = ShaderExecutable9::makeShaderExecutable9(pixelExe)->getPixelShader();
 
-    IDirect3DPixelShader9 *pixelShader = NULL;
-    if (pixelExe) pixelShader = ShaderExecutable9::makeShaderExecutable9(pixelExe)->getPixelShader();
+        mDevice->SetPixelShader(pixelShader);
+        mDevice->SetVertexShader(vertexShader);
+        programBinary->dirtyAllUniforms();
 
-    mDevice->SetPixelShader(pixelShader);
-    mDevice->SetVertexShader(vertexShader);
-    programBinary->dirtyAllUniforms();
+        mAppliedProgramBinarySerial = programBinarySerial;
+    }
 }
 
 void Renderer9::clear(const gl::ClearParameters &clearParams, gl::Framebuffer *frameBuffer)
@@ -1625,6 +1631,7 @@ void Renderer9::markAllStateDirty()
     mForceSetBlendState = true;
 
     mAppliedIBSerial = 0;
+    mAppliedProgramBinarySerial = 0;
 
     mVertexDeclarationCache.markStateDirty();
 }

src/libGLESv2/renderer/Renderer9.h

@@ -259,6 +259,7 @@ class Renderer9 : public Renderer
     GLuint mCurSampleMask;
 
     unsigned int mAppliedIBSerial;
+    unsigned int mAppliedProgramBinarySerial;
 
     // A pool of event queries that are currently unused.
     std::vector<IDirect3DQuery9*> mEventQueryPool;