diff options
| author | Wei-Ta Chen <weita@google.com> | 2011-08-30 09:59:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-30 09:59:58 -0700 |
| commit | 82cb3ddd27747fa11baffa4cb7b1b9bc119f9ec9 (patch) | |
| tree | 2a409eab0a9cb6d95057497d40f294a733f0cc58 | |
| parent | 82111c5d1fe1539a5ff70c1a459a09256ae50c1e (diff) | |
| parent | c73d5e20e80cf8b28017dff3b7672b8416a3a9f4 (diff) | |
| download | LegacyCamera-82cb3ddd27747fa11baffa4cb7b1b9bc119f9ec9.zip LegacyCamera-82cb3ddd27747fa11baffa4cb7b1b9bc119f9ec9.tar.gz LegacyCamera-82cb3ddd27747fa11baffa4cb7b1b9bc119f9ec9.tar.bz2 | |
Merge "Update the transform matrix from SurfaceTexture."
| -rwxr-xr-x | jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp b/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp index c547d4d..5b6292b 100755 --- a/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp +++ b/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp @@ -9,13 +9,13 @@ const GLfloat g_vVertices[] = { -1.f, -1.f, 0.0f, 1.0f, // Position 0 - 0.0f, 1.0f, // TexCoord 0 + 0.0f, 0.0f, // TexCoord 0 1.f, -1.f, 0.0f, 1.0f, // Position 1 - 1.0f, 1.0f, // TexCoord 1 + 1.0f, 0.0f, // TexCoord 1 -1.f, 1.f, 0.0f, 1.0f, // Position 2 - 0.0f, 0.0f, // TexCoord 2 + 0.0f, 1.0f, // TexCoord 2 1.f, 1.f, 0.0f, 1.0f, // Position 3 - 1.0f, 0.0f // TexCoord 3 + 1.0f, 1.0f // TexCoord 3 }; GLushort g_iIndices2[] = { 0, 1, 2, 3 }; @@ -125,6 +125,7 @@ bool SurfaceTextureRenderer::DrawTexture(GLfloat *affine) if (!checkGlError("glBindTexture")) break; glUniformMatrix4fv(mScalingtransLoc, 1, GL_FALSE, mScalingMatrix); + glUniformMatrix4fv(muSTMatrixHandle, 1, GL_FALSE, mSTMatrix); // Load the vertex position glVertexAttribPointer(maPositionHandle, 4, GL_FLOAT, @@ -151,12 +152,10 @@ const char* SurfaceTextureRenderer::VertexShaderSource() const "uniform mat4 u_scalingtrans; \n" "attribute vec4 aPosition;\n" "attribute vec4 aTextureCoord;\n" - "varying vec2 vTextureCoord;\n" "varying vec2 vTextureNormCoord;\n" "void main() {\n" " gl_Position = u_scalingtrans * aPosition;\n" - " vTextureCoord = (uSTMatrix * aTextureCoord).xy;\n" - " vTextureNormCoord = aTextureCoord.xy;\n" + " vTextureNormCoord = (uSTMatrix * aTextureCoord).xy;\n" "}\n"; return gVertexShader; @@ -167,7 +166,6 @@ const char* SurfaceTextureRenderer::FragmentShaderSource() const static const char gFragmentShader[] = "#extension GL_OES_EGL_image_external : require\n" "precision mediump float;\n" - "varying vec2 vTextureCoord;\n" "varying vec2 vTextureNormCoord;\n" "uniform samplerExternalOES sTexture;\n" "void main() {\n" |