diff options
| author | 2009-12-15 13:00:25 -0800 | |
|---|---|---|
| committer | 2009-12-15 13:00:25 -0800 | |
| commit | b686ec70445226d3f865b6e838b3f2cdf034ca31 (patch) | |
| tree | 521af59aa15cbe1dec696067f0749c7e9f4006a3 /libs/rs/rsProgramFragment.cpp | |
| parent | e2f126cc30f2449ff32f343565c974ede9455f2c (diff) | |
| parent | 0011bcf57ff711a221a3a4c73f2a79125111647d (diff) | |
Merge change I0011bcf5
* changes:
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.
Diffstat (limited to 'libs/rs/rsProgramFragment.cpp')
| -rw-r--r-- | libs/rs/rsProgramFragment.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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) { |