Skip to content

A
angle
Commit 27359ff7 by Geoff Lang
Options

Read the proper uniform location instead of assuming location 0.

Fixes MipMapTest on Intel/OpenGL. BUG=angleproject:1038 Change-Id: I19a0704969ef03d5d2ee3c9092daf4bd3a9818f7 Reviewed-on: https://chromium-review.googlesource.com/274818Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 2469dad9
Showing with 12 additions and 6 deletions
src/tests/gl_tests/MipmapTest.cpp
...@@ -94,6 +94,9 @@ class MipmapTest : public ANGLETest ...@@ -94,6 +94,9 @@ class MipmapTest : public ANGLETest
m2DPositionAttributePosition = glGetAttribLocation(m2DProgram, "aPosition"); m2DPositionAttributePosition = glGetAttribLocation(m2DProgram, "aPosition");
m2DTexCoordAttributePosition = glGetAttribLocation(m2DProgram, "aTexCoord"); m2DTexCoordAttributePosition = glGetAttribLocation(m2DProgram, "aTexCoord");
mCubeTextureUniformPosition = glGetUniformLocation(mCubeProgram, "uTexture");
mCubePositionAttributePosition = glGetAttribLocation(mCubeProgram, "aPosition");
mLevelZeroBlueInitData = createRGBInitData(getWindowWidth(), getWindowHeight(), 0, 0, 255); // Blue mLevelZeroBlueInitData = createRGBInitData(getWindowWidth(), getWindowHeight(), 0, 0, 255); // Blue
mLevelZeroWhiteInitData = createRGBInitData(getWindowWidth(), getWindowHeight(), 255, 255, 255); // White mLevelZeroWhiteInitData = createRGBInitData(getWindowWidth(), getWindowHeight(), 255, 255, 255); // White
mLevelOneInitData = createRGBInitData((getWindowWidth() / 2), (getWindowHeight() / 2), 0, 255, 0); // Green mLevelOneInitData = createRGBInitData((getWindowWidth() / 2), (getWindowHeight() / 2), 0, 255, 0); // Green
...@@ -210,6 +213,9 @@ class MipmapTest : public ANGLETest ...@@ -210,6 +213,9 @@ class MipmapTest : public ANGLETest
GLint m2DPositionAttributePosition; GLint m2DPositionAttributePosition;
GLint m2DTexCoordAttributePosition; GLint m2DTexCoordAttributePosition;
GLint mCubeTextureUniformPosition;
GLint mCubePositionAttributePosition;
GLubyte* mLevelZeroBlueInitData; GLubyte* mLevelZeroBlueInitData;
GLubyte* mLevelZeroWhiteInitData; GLubyte* mLevelZeroWhiteInitData;
GLubyte* mLevelOneInitData; GLubyte* mLevelOneInitData;
...@@ -645,9 +651,9 @@ TEST_P(MipmapTest, TextureCubeGeneralLevelZero) ...@@ -645,9 +651,9 @@ TEST_P(MipmapTest, TextureCubeGeneralLevelZero)
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
glViewport(0, 0, getWindowWidth(), getWindowHeight()); glViewport(0, 0, getWindowWidth(), getWindowHeight());
glUseProgram(mCubeProgram); glUseProgram(mCubeProgram);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, vertexLocations); glVertexAttribPointer(mCubePositionAttributePosition, 3, GL_FLOAT, GL_FALSE, 0, vertexLocations);
glEnableVertexAttribArray(0); glEnableVertexAttribArray(mCubePositionAttributePosition);
glUniform1i(0, 0); glUniform1i(mCubeTextureUniformPosition, 0);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_CUBE_MAP, mOffscreenTextureCube); glBindTexture(GL_TEXTURE_CUBE_MAP, mOffscreenTextureCube);
...@@ -719,9 +725,9 @@ TEST_P(MipmapTest, TextureCubeRenderToLevelZero) ...@@ -719,9 +725,9 @@ TEST_P(MipmapTest, TextureCubeRenderToLevelZero)
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
glViewport(0, 0, getWindowWidth(), getWindowHeight()); glViewport(0, 0, getWindowWidth(), getWindowHeight());
glUseProgram(mCubeProgram); glUseProgram(mCubeProgram);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, vertexLocations); glVertexAttribPointer(mCubePositionAttributePosition, 3, GL_FLOAT, GL_FALSE, 0, vertexLocations);
glEnableVertexAttribArray(0); glEnableVertexAttribArray(mCubePositionAttributePosition);
glUniform1i(0, 0); glUniform1i(mCubeTextureUniformPosition, 0);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_CUBE_MAP, mOffscreenTextureCube); glBindTexture(GL_TEXTURE_CUBE_MAP, mOffscreenTextureCube);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment