commit 3d3d2f20fe3ea4ed42cad6199c7c9a9fa876e8d6
author Jamie Madill <jmadill@chromium.org> Wed Sep 23 16:47:51 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Thu Sep 24 18:31:15 2015 +0000
tree 00fd28beb4da391b3abb1cb0d7253c510c6af8b2
parent 260efc2179e5325659fd132445fcb95cdb3eb245

Re-re-land "Move sampler validation to the GL layer."

This previously was D3D-only, but is required for every draw call.
This completes the work of removing the D3D-specific Impl methods
from ProgramImpl.

Also add several regression tests to cover texture and sampler
validation.

Re-land with a fix for duplicate sampler active uniforms.

Re-re-land with a fix for a test comparison warning on Linux.

BUG=angleproject:1123

Change-Id: Iaf7b33861c07b9ceed4bd53ac2f010d35f05df45
Reviewed-on: https://chromium-review.googlesource.com/301712
Tryjob-Request: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/State.cpp

diff --git a/src/libANGLE/State.cpp b/src/libANGLE/State.cpp
index 752f995..d51015a 100644
--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -633,6 +633,7 @@
 {
     const auto it = mSamplerTextures.find(type);
     ASSERT(it != mSamplerTextures.end());
+    ASSERT(sampler < it->second.size());
     return it->second[sampler].get();
 }
 
@@ -640,6 +641,7 @@
 {
     const auto it = mSamplerTextures.find(type);
     ASSERT(it != mSamplerTextures.end());
+    ASSERT(sampler < it->second.size());
     return it->second[sampler].id();
 }