Fix support for arrays of samplers.

TRAC #14840 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@507 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fix support for arrays of samplers.
41b2fbdd · daniel@transgaming.com · 5efd8b45 · 41b2fbdd
Commit 41b2fbdd authored Dec 13, 2010 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

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

No files found.
--- a/src/libGLESv2/Program.cpp
+++ b/src/libGLESv2/Program.cpp
@@ -1659,14 +1659,15 @@ bool Program::defineUniform(const D3DXHANDLE &constantHandle, const D3DXCONSTANT
 {
    if (constantDescription.RegisterSet == D3DXRS_SAMPLER)
    {
-        unsigned int samplerIndex = constantDescription.RegisterIndex;
+        for (unsigned int samplerIndex = constantDescription.RegisterIndex; samplerIndex < constantDescription.RegisterIndex + constantDescription.RegisterCount; samplerIndex++)
+        {
-        assert(samplerIndex < sizeof(mSamplers)/sizeof(mSamplers[0]));
+            ASSERT(samplerIndex < sizeof(mSamplers)/sizeof(mSamplers[0]));
-        mSamplers[samplerIndex].active = true;
+            mSamplers[samplerIndex].active = true;
-        mSamplers[samplerIndex].type = (constantDescription.Type == D3DXPT_SAMPLERCUBE) ? SAMPLER_CUBE : SAMPLER_2D;
+            mSamplers[samplerIndex].type = (constantDescription.Type == D3DXPT_SAMPLERCUBE) ? SAMPLER_CUBE : SAMPLER_2D;
-        mSamplers[samplerIndex].logicalTextureUnit = 0;
+            mSamplers[samplerIndex].logicalTextureUnit = 0;
-        mSamplers[samplerIndex].dirty = true;
+            mSamplers[samplerIndex].dirty = true;
+        }
    }
    switch(constantDescription.Class)