Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38d50969 authored by Alex Sakhartchouk's avatar Alex Sakhartchouk Committed by Android (Google) Code Review
Browse files

Merge "changing vec4 to vec2 for perf reasons."

parents 3139ab21 d2091639

graphics/java/android/renderscript/ProgramFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

graphics/java/android/renderscript/ProgramVertex.java

+3 −3
Original line number Diff line number Diff line
@@ -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();

libs/rs/java/Samples/res/raw/multitexf.glsl

+1 −1
Original line number Diff line number Diff line 
varying vec4 varTex0;

varying vec2 varTex0;



void main() {

   vec2 t0 = varTex0.xy;

libs/rs/rsFont.cpp

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ bool FontState::cacheBitmap(FT_Bitmap *bitmap, uint32_t *retOriginX, uint32_t *r 


void FontState::initRenderState()

{

    String8 shaderString("varying vec4 varTex0;\n");

    String8 shaderString("varying vec2 varTex0;\n");

    shaderString.append("void main() {\n");

    shaderString.append("  lowp vec4 col = UNI_Color;\n");

    shaderString.append("  col.a = texture2D(UNI_Tex0, varTex0.xy).a;\n");

libs/rs/rsProgramFragment.cpp

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ void ProgramFragmentState::init(Context *rsc) 
{

    String8 shaderString(RS_SHADER_INTERNAL);

    shaderString.append("varying lowp vec4 varColor;\n");

    shaderString.append("varying vec4 varTex0;\n");

    shaderString.append("varying vec2 varTex0;\n");

    shaderString.append("void main() {\n");

    shaderString.append("  lowp vec4 col = UNI_Color;\n");

    shaderString.append("  gl_FragColor = col;\n");