Skip to content

Commit 4c43f66

Browse files
author
Romain Guy
committed
Fix TextureView OpenGL sample
The sample was doing something dumb: instead of binding the texture unit to the shader's sampler, it was binding the texture name. Oops. Change-Id: I13450dacbbd2dad362a2573aebb95e8eb87b25f0
1 parent c1c1406 commit 4c43f66

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

tests/HwAccelerationTest/src/com/android/test/hwui/GLTextureViewActivity.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -210,28 +210,31 @@ public void run() {
210210
glEnableVertexAttribArray(attribTexCoords);
211211
checkGlError();
212212

213-
glUniform1i(uniformTexture, texture);
213+
glUniform1i(uniformTexture, 0);
214+
checkGlError();
215+
216+
// drawQuad
217+
triangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET);
218+
glVertexAttribPointer(attribPosition, 3, GL_FLOAT, false,
219+
TRIANGLE_VERTICES_DATA_STRIDE_BYTES, triangleVertices);
220+
checkGlError();
221+
222+
triangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET);
223+
glVertexAttribPointer(attribTexCoords, 3, GL_FLOAT, false,
224+
TRIANGLE_VERTICES_DATA_STRIDE_BYTES, triangleVertices);
225+
checkGlError();
226+
227+
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
214228
checkGlError();
215229

216230
while (!mFinished) {
217231
checkCurrent();
218232

219-
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
220-
checkGlError();
221-
222233
glClear(GL_COLOR_BUFFER_BIT);
223234
checkGlError();
224235

225-
// drawQuad
226-
triangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET);
227-
glVertexAttribPointer(attribPosition, 3, GL_FLOAT, false,
228-
TRIANGLE_VERTICES_DATA_STRIDE_BYTES, triangleVertices);
229-
230-
triangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET);
231-
glVertexAttribPointer(attribTexCoords, 3, GL_FLOAT, false,
232-
TRIANGLE_VERTICES_DATA_STRIDE_BYTES, triangleVertices);
233-
234236
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
237+
checkGlError();
235238

236239
if (!mEgl.eglSwapBuffers(mEglDisplay, mEglSurface)) {
237240
throw new RuntimeException("Cannot swap buffers");

0 commit comments

Comments
 (0)