Use the specified Program instead of current in GetUniform.

This bug slipped in with the GetUniform validation refactor. BUG=angle:571 Change-Id: I2b87e6fe98224ba99c5b21a71d66b197fd618741 Reviewed-on: https://chromium-review.googlesource.com/214872Reviewed-by: Nicolas Capens <capn@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Use the specified Program instead of current in GetUniform.
a502c749 · Jamie Madill · b1196687 · a502c749 · a502c749 · a502c749
Commit a502c749 authored Aug 28, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 92 additions and 6 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +15 -5

validationES.cpp src/libGLESv2/validationES.cpp +3 -1

UniformTest.cpp tests/angle_tests/UniformTest.cpp +74 -0

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -3141,7 +3141,9 @@ void __stdcall glGetnUniformfvEXT(GLuint program, GLint location, GLsizei bufSiz
            return;
        }

-        gl::ProgramBinary *programBinary = context->getState().getCurrentProgramBinary();
+        gl::Program *programObject = context->getProgram(program);
+        ASSERT(programObject);
+        gl::ProgramBinary *programBinary = programObject->getProgramBinary();
        ASSERT(programBinary);

        programBinary->getUniformfv(location, params);
@@ -3160,7 +3162,9 @@ void __stdcall glGetUniformfv(GLuint program, GLint location, GLfloat* params)
            return;
        }

-        gl::ProgramBinary *programBinary = context->getState().getCurrentProgramBinary();
+        gl::Program *programObject = context->getProgram(program);
+        ASSERT(programObject);
+        gl::ProgramBinary *programBinary = programObject->getProgramBinary();
        ASSERT(programBinary);

        programBinary->getUniformfv(location, params);
@@ -3180,7 +3184,9 @@ void __stdcall glGetnUniformivEXT(GLuint program, GLint location, GLsizei bufSiz
            return;
        }

-        gl::ProgramBinary *programBinary = context->getState().getCurrentProgramBinary();
+        gl::Program *programObject = context->getProgram(program);
+        ASSERT(programObject);
+        gl::ProgramBinary *programBinary = programObject->getProgramBinary();
        ASSERT(programBinary);

        programBinary->getUniformiv(location, params);
@@ -3199,7 +3205,9 @@ void __stdcall glGetUniformiv(GLuint program, GLint location, GLint* params)
            return;
        }

-        gl::ProgramBinary *programBinary = context->getState().getCurrentProgramBinary();
+        gl::Program *programObject = context->getProgram(program);
+        ASSERT(programObject);
+        gl::ProgramBinary *programBinary = programObject->getProgramBinary();
        ASSERT(programBinary);

        programBinary->getUniformiv(location, params);
@@ -6399,7 +6407,9 @@ void __stdcall glGetUniformuiv(GLuint program, GLint location, GLuint* params)
            return;
        }

-        gl::ProgramBinary *programBinary = context->getState().getCurrentProgramBinary();
+        gl::Program *programObject = context->getProgram(program);
+        ASSERT(programObject);
+        gl::ProgramBinary *programBinary = programObject->getProgramBinary();
        ASSERT(programBinary);

        programBinary->getUniformuiv(location, params);

--- a/src/libGLESv2/validationES.cpp
+++ b/src/libGLESv2/validationES.cpp
@@ -1859,7 +1859,9 @@ static bool ValidateSizedGetUniform(Context *context, GLuint program, GLint loca
        return false;
    }

-    gl::ProgramBinary *programBinary = context->getState().getCurrentProgramBinary();
+    gl::Program *programObject = context->getProgram(program);
+    ASSERT(programObject);
+    gl::ProgramBinary *programBinary = programObject->getProgramBinary();

    // sized queries -- ensure the provided buffer is large enough
    LinkedUniform *uniform = programBinary->getUniformByLocation(location);

--- a/tests/angle_tests/UniformTest.cpp
+++ b/tests/angle_tests/UniformTest.cpp
+#include "ANGLETest.h"
+
+class UniformTest : public ANGLETest
+{
+  protected:
+    UniformTest()
+    {
+        setWindowWidth(128);
+        setWindowHeight(128);
+        setConfigRedBits(8);
+        setConfigGreenBits(8);
+        setConfigBlueBits(8);
+        setConfigAlphaBits(8);
+    }
+
+    virtual void SetUp()
+    {
+        ANGLETest::SetUp();
+
+        const std::string &vertexShader = "void main() { gl_Position = vec4(1); }";
+        const std::string &fragShader =
+            "precision mediump float;\n"
+            "uniform float uniF;\n"
+            "uniform int uniI;\n"
+            "void main() { gl_FragColor = vec4(uniF + float(uniI)); }";
+
+        mProgram = CompileProgram(vertexShader, fragShader);
+        ASSERT_NE(mProgram, 0u);
+
+        mUniformFLocation = glGetUniformLocation(mProgram, "uniF");
+        ASSERT_NE(mUniformFLocation, -1);
+
+        mUniformILocation = glGetUniformLocation(mProgram, "uniI");
+        ASSERT_NE(mUniformILocation, -1);
+
+        ASSERT_GL_NO_ERROR();
+    }
+
+    virtual void TearDown()
+    {
+        glDeleteProgram(mProgram);
+        ANGLETest::TearDown();
+    }
+
+    GLuint mProgram;
+    GLint mUniformFLocation;
+    GLint mUniformILocation;
+};
+
+TEST_F(UniformTest, GetUniformNoCurrentProgram)
+{
+    glUseProgram(mProgram);
+    glUniform1f(mUniformFLocation, 1.0f);
+    glUniform1i(mUniformILocation, 1);
+    glUseProgram(0);
+
+    GLfloat f;
+    glGetnUniformfvEXT(mProgram, mUniformFLocation, 4, &f);
+    ASSERT_GL_NO_ERROR();
+    EXPECT_EQ(1.0f, f);
+
+    glGetUniformfv(mProgram, mUniformFLocation, &f);
+    ASSERT_GL_NO_ERROR();
+    EXPECT_EQ(1.0f, f);
+
+    GLint i;
+    glGetnUniformivEXT(mProgram, mUniformILocation, 4, &i);
+    ASSERT_GL_NO_ERROR();
+    EXPECT_EQ(1, i);
+
+    glGetUniformiv(mProgram, mUniformILocation, &i);
+    ASSERT_GL_NO_ERROR();
+    EXPECT_EQ(1, i);
+}