commit 8f0095cd33558e9cc8a440047908e53b68906f5f
author Romain Guy <romainguy@google.com> Mon May 02 17:24:22 2011 -0700
committer Romain Guy <romainguy@google.com> Mon May 02 18:32:29 2011 -0700
tree 2f55d779bf102e0c134357d89c7de69d0444634a
parent 3a5c227279011f850036c29e7c0bc96023298d5c

Allows to render with an OpenGL context inside a TextureView.

Change-Id: I59453f7fc3997f0502a1c5d325d37fed376fabc7

libs/hwui/ProgramCache.cpp

diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp
index 62ac2ba..297f5a9 100644
--- a/libs/hwui/ProgramCache.cpp
+++ b/libs/hwui/ProgramCache.cpp
@@ -385,7 +385,7 @@
     }
     // Uniforms
     shader.append(gVS_Header_Uniforms);
-    if (description.hasExternalTexture) {
+    if (description.hasTextureTransform) {
         shader.append(gVS_Header_Uniforms_TextureTransform);
     }
     if (description.hasGradient) {
@@ -415,11 +415,10 @@
 
     // Begin the shader
     shader.append(gVS_Main); {
-        if (description.hasTexture) {
-            shader.append(gVS_Main_OutTexCoords);
-        }
-        if (description.hasExternalTexture) {
+        if (description.hasTextureTransform) {
             shader.append(gVS_Main_OutTransformedTexCoords);
+        } else if (description.hasTexture || description.hasExternalTexture) {
+            shader.append(gVS_Main_OutTexCoords);
         }
         if (description.hasWidth) {
             shader.append(gVS_Main_Width);
@@ -487,8 +486,7 @@
     }
     if (description.hasTexture) {
         shader.append(gFS_Uniforms_TextureSampler);
-    }
-    if (description.hasExternalTexture) {
+    } else if (description.hasExternalTexture) {
         shader.append(gFS_Uniforms_ExternalTextureSampler);
     }
     if (description.hasWidth) {