Consider out-of-range texture units to be incomplete.

TRAC #12224 Signed-off-by: Shannon Woods Signed-off-by: Daniel Koch Author: Andrew Lewycky git-svn-id: https://angleproject.googlecode.com/svn/trunk@271 736b8ea6-26fd-11df-bfd4-992fa37f6226

Consider out-of-range texture units to be incomplete.
4071e661 · daniel@transgaming.com · a71cdd7c · 4071e661
Commit 4071e661 authored May 12, 2010 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 8 deletions

Program.cpp src/libGLESv2/Program.cpp +12 -8

No files found.
--- a/src/libGLESv2/Program.cpp
+++ b/src/libGLESv2/Program.cpp
@@ -190,9 +190,16 @@ GLint Program::getSamplerMapping(unsigned int samplerIndex)
 {
    assert(samplerIndex < sizeof(mSamplers)/sizeof(mSamplers[0]));

+    GLint logicalTextureUnit = -1;
+
    if (mSamplers[samplerIndex].active)
    {
-        return mSamplers[samplerIndex].logicalTextureUnit;
+        logicalTextureUnit = mSamplers[samplerIndex].logicalTextureUnit;
+    }
+
+    if (logicalTextureUnit < MAX_TEXTURE_IMAGE_UNITS)
+    {
+        return logicalTextureUnit;
    }

    return -1;
@@ -1816,14 +1823,11 @@ bool Program::applyUniform1iv(GLint location, GLsizei count, const GLint *v)
            {
                GLint mappedSampler = v[0];

-                if (mappedSampler >= 0 && mappedSampler < MAX_TEXTURE_IMAGE_UNITS)
+                if (samplerIndex >= 0 && samplerIndex < MAX_TEXTURE_IMAGE_UNITS)
                {
-                    if (samplerIndex >= 0 && samplerIndex < MAX_TEXTURE_IMAGE_UNITS)
-                    {
-                        ASSERT(mSamplers[samplerIndex].active);
-                        mSamplers[samplerIndex].logicalTextureUnit = mappedSampler;
-                        mSamplers[samplerIndex].dirty = true;
-                    }
+                    ASSERT(mSamplers[samplerIndex].active);
+                    mSamplers[samplerIndex].logicalTextureUnit = mappedSampler;
+                    mSamplers[samplerIndex].dirty = true;
                }
            }