commit 41e373d91a60043afa0f9abd026218b49cbc1201
author Jason Sams <jsams@google.com> Fri Jan 13 14:01:20 2012 -0800
committer Jason Sams <jsams@google.com> Fri Jan 13 14:01:20 2012 -0800
tree c212a481256382d0f2b69dfa4dff115fbb5ead00
parent 9719bd4a0187c400ba868712612fe66da4635aac

Start implementing SurfaceTexture streaming into RS allocations.

Change-Id: I561fbb63c63371ea59047c07fb2d68c21d16e76b

driver/rsdShader.cpp

diff --git a/driver/rsdShader.cpp b/driver/rsdShader.cpp
index 8bf3207..dc7f8ab 100644
--- a/driver/rsdShader.cpp
+++ b/driver/rsdShader.cpp
@@ -139,7 +139,12 @@
     char buf[256];
     for (uint32_t ct=0; ct < mRSProgram->mHal.state.texturesCount; ct++) {
         if (mRSProgram->mHal.state.textureTargets[ct] == RS_TEXTURE_2D) {
-            snprintf(buf, sizeof(buf), "uniform sampler2D UNI_Tex%i;\n", ct);
+            Allocation *a = mRSProgram->mHal.state.textures[ct];
+            if (a && a->mHal.state.surfaceTextureID) {
+                snprintf(buf, sizeof(buf), "uniform samplerExternalOES UNI_Tex%i;\n", ct);
+            } else {
+                snprintf(buf, sizeof(buf), "uniform sampler2D UNI_Tex%i;\n", ct);
+            }
             mTextureTargets[ct] = GL_TEXTURE_2D;
         } else {
             snprintf(buf, sizeof(buf), "uniform samplerCube UNI_Tex%i;\n", ct);