diff options
author | Romain Guy <romainguy@google.com> | 2012-05-16 20:04:46 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-16 20:04:46 -0700 |
commit | 1b283b4e7f66d5cc3e1e2cc63cae9d3bc8a5ad5c (patch) | |
tree | cfbe081a81278e5987a3d8498ec2852b7db0e91b /tests | |
parent | 20c0cdbbf79cef18e59514e0f53dfbcac0bef600 (diff) | |
parent | 4c43f66d06fe7f75ad6f9c860cf0936b8ee36082 (diff) | |
download | frameworks_base-1b283b4e7f66d5cc3e1e2cc63cae9d3bc8a5ad5c.zip frameworks_base-1b283b4e7f66d5cc3e1e2cc63cae9d3bc8a5ad5c.tar.gz frameworks_base-1b283b4e7f66d5cc3e1e2cc63cae9d3bc8a5ad5c.tar.bz2 |
Merge "Fix TextureView OpenGL sample" into jb-dev
Diffstat (limited to 'tests')
-rw-r--r-- | tests/HwAccelerationTest/src/com/android/test/hwui/GLTextureViewActivity.java | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/GLTextureViewActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/GLTextureViewActivity.java index 414ae0d..0e75b80 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/GLTextureViewActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/GLTextureViewActivity.java @@ -210,28 +210,31 @@ public class GLTextureViewActivity extends Activity implements TextureView.Surfa glEnableVertexAttribArray(attribTexCoords); checkGlError(); - glUniform1i(uniformTexture, texture); + glUniform1i(uniformTexture, 0); + checkGlError(); + + // drawQuad + triangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET); + glVertexAttribPointer(attribPosition, 3, GL_FLOAT, false, + TRIANGLE_VERTICES_DATA_STRIDE_BYTES, triangleVertices); + checkGlError(); + + triangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET); + glVertexAttribPointer(attribTexCoords, 3, GL_FLOAT, false, + TRIANGLE_VERTICES_DATA_STRIDE_BYTES, triangleVertices); + checkGlError(); + + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); checkGlError(); while (!mFinished) { checkCurrent(); - glClearColor(0.0f, 0.0f, 0.0f, 0.0f); - checkGlError(); - glClear(GL_COLOR_BUFFER_BIT); checkGlError(); - // drawQuad - triangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET); - glVertexAttribPointer(attribPosition, 3, GL_FLOAT, false, - TRIANGLE_VERTICES_DATA_STRIDE_BYTES, triangleVertices); - - triangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET); - glVertexAttribPointer(attribTexCoords, 3, GL_FLOAT, false, - TRIANGLE_VERTICES_DATA_STRIDE_BYTES, triangleVertices); - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); + checkGlError(); if (!mEgl.eglSwapBuffers(mEglDisplay, mEglSurface)) { throw new RuntimeException("Cannot swap buffers"); |