diff options
| author | Jason Sams <rjsams@android.com> | 2009-11-30 14:49:55 -0800 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2009-11-30 15:34:03 -0800 |
| commit | 54c0ec14e016e4a1bf3ceab40ed6ca5447da4725 (patch) | |
| tree | 343acd699d50a4090b451d05135aa7887a6a7984 /libs/rs/rsProgram.cpp | |
| parent | 5154ae7665743b114c71f90dcc577dc50c63b398 (diff) | |
Beging GL2 user shaders. Switch master to using GL2 by default.
Diffstat (limited to 'libs/rs/rsProgram.cpp')
| -rw-r--r-- | libs/rs/rsProgram.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libs/rs/rsProgram.cpp b/libs/rs/rsProgram.cpp index 8e9ba08d2908..db40f1619185 100644 --- a/libs/rs/rsProgram.cpp +++ b/libs/rs/rsProgram.cpp @@ -67,7 +67,7 @@ bool Program::loadShader(uint32_t type) mShaderID = glCreateShader(type); rsAssert(mShaderID); - LOGV("Loading shader type %x", type); + LOGV("Loading shader type %x, ID %i", type, mShaderID); LOGE(mShader.string()); if (mShaderID) { @@ -96,3 +96,9 @@ bool Program::loadShader(uint32_t type) LOGV("--Shader load result %x ", glGetError()); return true; } + +void Program::setShader(const char *txt, uint32_t len) +{ + mUserShader.setTo(txt, len); +} + |