diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2010-10-06 16:09:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-06 16:09:36 -0700 |
| commit | 38d509697c7d1f989509281cbd9cfaacf9a20ac3 (patch) | |
| tree | 115316a5e0a7e0335ffb125df3c5f66e5c114a71 /graphics/java | |
| parent | 3139ab218aeb34bfeac0cd6a42ed84d6e2220131 (diff) | |
| parent | d2091639be426574c04f74969fe553162d7a51c9 (diff) | |
| download | frameworks_base-38d509697c7d1f989509281cbd9cfaacf9a20ac3.zip frameworks_base-38d509697c7d1f989509281cbd9cfaacf9a20ac3.tar.gz frameworks_base-38d509697c7d1f989509281cbd9cfaacf9a20ac3.tar.bz2 | |
Merge "changing vec4 to vec2 for perf reasons."
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/renderscript/ProgramFragment.java | 2 | ||||
| -rw-r--r-- | graphics/java/android/renderscript/ProgramVertex.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/java/android/renderscript/ProgramFragment.java b/graphics/java/android/renderscript/ProgramFragment.java index c1d6428..8858b74 100644 --- a/graphics/java/android/renderscript/ProgramFragment.java +++ b/graphics/java/android/renderscript/ProgramFragment.java @@ -104,7 +104,7 @@ public class ProgramFragment extends Program { private void buildShaderString() { mShader = "//rs_shader_internal\n"; mShader += "varying lowp vec4 varColor;\n"; - mShader += "varying vec4 varTex0;\n"; + mShader += "varying vec2 varTex0;\n"; mShader += "void main() {\n"; if (mVaryingColorEnable) { diff --git a/graphics/java/android/renderscript/ProgramVertex.java b/graphics/java/android/renderscript/ProgramVertex.java index 63e2598..65a0af2 100644 --- a/graphics/java/android/renderscript/ProgramVertex.java +++ b/graphics/java/android/renderscript/ProgramVertex.java @@ -101,7 +101,7 @@ public class ProgramVertex extends Program { mShader = "//rs_shader_internal\n"; mShader += "varying vec4 varColor;\n"; - mShader += "varying vec4 varTex0;\n"; + mShader += "varying vec2 varTex0;\n"; mShader += "void main() {\n"; mShader += " gl_Position = UNI_MVP * ATTRIB_position;\n"; @@ -109,7 +109,7 @@ public class ProgramVertex extends Program { mShader += " varColor = ATTRIB_color;\n"; if (mTextureMatrixEnable) { - mShader += " varTex0 = UNI_TexMatrix * ATTRIB_texture0;\n"; + mShader += " varTex0 = (UNI_TexMatrix * vec4(ATTRIB_texture0, 0.0, 1.0)).xy;\n"; } else { mShader += " varTex0 = ATTRIB_texture0;\n"; } @@ -126,7 +126,7 @@ public class ProgramVertex extends Program { b.add(Element.F32_4(mRS), "position"); b.add(Element.F32_4(mRS), "color"); b.add(Element.F32_3(mRS), "normal"); - b.add(Element.F32_4(mRS), "texture0"); + b.add(Element.F32_2(mRS), "texture0"); addInput(b.create()); return super.create(); |