diff options
| author | 2009-12-15 13:33:24 -0800 | |
|---|---|---|
| committer | 2009-12-15 13:33:24 -0800 | |
| commit | d6542507e73e1d7f3380cb4657a0745772818002 (patch) | |
| tree | 4f3e38a86d46931a4e9fccc68f3021e7f3e44ba1 /libs/rs/rsProgram.cpp | |
| parent | 1890be79cfb59bf5e2976bbf3823ec0a510ac961 (diff) | |
| parent | 7e5ab3b177b10fee304d011b3a4b9ee03e2b18b5 (diff) | |
Merge change I7e5ab3b1
* changes:
Continue es2 shader dev
Diffstat (limited to 'libs/rs/rsProgram.cpp')
| -rw-r--r-- | libs/rs/rsProgram.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/rs/rsProgram.cpp b/libs/rs/rsProgram.cpp index ba27fd4196a7..bcda5fbaa140 100644 --- a/libs/rs/rsProgram.cpp +++ b/libs/rs/rsProgram.cpp @@ -51,6 +51,7 @@ Program::Program(Context *rsc, const char * shaderText, uint32_t shaderLength, mShaderID = 0; mAttribCount = 0; mUniformCount = 0; + mTextureCount = 0; mInputCount = 0; mOutputCount = 0; @@ -66,6 +67,9 @@ Program::Program(Context *rsc, const char * shaderText, uint32_t shaderLength, if (params[ct] == RS_PROGRAM_PARAM_CONSTANT) { mConstantCount++; } + if (params[ct] == RS_PROGRAM_PARAM_TEXTURE_COUNT) { + mTextureCount = params[ct+1]; + } } mInputElements = new ObjectBaseRef<Element>[mInputCount]; |