From 0011bcf57ff711a221a3a4c73f2a79125111647d Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Tue, 15 Dec 2009 12:58:36 -0800 Subject: Continue development of es2.0 user shader support for renderscript. This change cleans up ProgramVertex creation and adds support for passing input, output, and constant type info. --- libs/rs/rsProgramFragment.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libs/rs/rsProgramFragment.cpp') diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp index 1225ff3e016e..3ddaa37a5cb8 100644 --- a/libs/rs/rsProgramFragment.cpp +++ b/libs/rs/rsProgramFragment.cpp @@ -27,7 +27,7 @@ using namespace android::renderscript; ProgramFragment::ProgramFragment(Context *rsc, Element *in, Element *out, bool pointSpriteEnable) : - Program(rsc, in, out) + Program(rsc) { mAllocFile = __FILE__; mAllocLine = __LINE__; @@ -174,7 +174,6 @@ void ProgramFragment::createShader() mShader.append("void main() {\n"); - //mShader.append(" gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);\n"); mShader.append(" vec4 col = varColor;\n"); if (mTextureEnableMask) { -- cgit v1.2.3-59-g8ed1b