commit 1377689c30fcaea7ab57257a929c961873f7677c
author Jamie Madill <jmadill@chromium.org> Tue Apr 28 12:39:06 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Wed Apr 29 19:59:31 2015 +0000
tree 52305da3ed96b72c5ea8007adbb4029c0998acb6
parent 667ef099593c9c1b86f50efcf0a7e651c23246f4

Cache validate samplers result.

This gives ~23% increase in the validation-only draw call perf test.

BUG=angleproject:959

Change-Id: I384a5c4fbb1c2cd47483bd7cf4bc1d39447a99bc
Reviewed-on: https://chromium-review.googlesource.com/267750
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>

src/libANGLE/renderer/d3d/ProgramD3D.cpp

diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
index d7b16f6..15cd8fb 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -336,6 +336,13 @@
 
 bool ProgramD3D::validateSamplers(gl::InfoLog *infoLog, const gl::Caps &caps)
 {
+    // Skip cache if we're using an infolog, so we get the full error.
+    // Also skip the cache if the sample mapping has changed, or if we haven't ever validated.
+    if (!mDirtySamplerMapping && infoLog == nullptr && mCachedValidateSamplersResult.valid())
+    {
+        return mCachedValidateSamplersResult.value();
+    }
+
     // if any two active samplers in a program are of different types, but refer to the same
     // texture image unit, and this is the current program, then ValidateProgram will fail, and
     // DrawArrays and DrawElements will issue the INVALID_OPERATION error.
@@ -356,6 +363,7 @@
                     infoLog->append("Sampler uniform (%d) exceeds GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS (%d)", unit, caps.maxCombinedTextureImageUnits);
                 }
 
+                mCachedValidateSamplersResult = false;
                 return false;
             }
 
@@ -368,6 +376,7 @@
                         infoLog->append("Samplers of conflicting types refer to the same texture image unit (%d).", unit);
                     }
 
+                    mCachedValidateSamplersResult = false;
                     return false;
                 }
             }
@@ -391,6 +400,7 @@
                     infoLog->append("Sampler uniform (%d) exceeds GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS (%d)", unit, caps.maxCombinedTextureImageUnits);
                 }
 
+                mCachedValidateSamplersResult = false;
                 return false;
             }
 
@@ -403,6 +413,7 @@
                         infoLog->append("Samplers of conflicting types refer to the same texture image unit (%d).", unit);
                     }
 
+                    mCachedValidateSamplersResult = false;
                     return false;
                 }
             }
@@ -413,6 +424,7 @@
         }
     }
 
+    mCachedValidateSamplersResult = true;
     return true;
 }