diff options
| author | Jason Sams <rjsams@android.com> | 2009-12-15 12:58:36 -0800 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2009-12-15 12:58:36 -0800 |
| commit | 4815c0d121310cfcd6a8aba4eab77a9910af53ac (patch) | |
| tree | 6e6154879389c6b5bd745f3c0922d83ed232de8f /rsProgramFragment.cpp | |
| parent | cf4c7c9b2f513be77a5b9853319ca82ac2b128ed (diff) | |
| download | android_frameworks_rs-4815c0d121310cfcd6a8aba4eab77a9910af53ac.tar.gz android_frameworks_rs-4815c0d121310cfcd6a8aba4eab77a9910af53ac.tar.bz2 android_frameworks_rs-4815c0d121310cfcd6a8aba4eab77a9910af53ac.zip | |
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 'rsProgramFragment.cpp')
| -rw-r--r-- | rsProgramFragment.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/rsProgramFragment.cpp b/rsProgramFragment.cpp index 1225ff3e..3ddaa37a 100644 --- a/rsProgramFragment.cpp +++ b/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) { |