diff options
| author | Jason Sams <rjsams@android.com> | 2009-12-15 13:27:04 -0800 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2009-12-15 13:27:04 -0800 |
| commit | 7e5ab3b177b10fee304d011b3a4b9ee03e2b18b5 (patch) | |
| tree | 87e037e70a81ed8d250eff1c20ae8f799c62c7c6 /libs/rs/rsProgram.h | |
| parent | b686ec70445226d3f865b6e838b3f2cdf034ca31 (diff) | |
| download | frameworks_base-7e5ab3b177b10fee304d011b3a4b9ee03e2b18b5.zip frameworks_base-7e5ab3b177b10fee304d011b3a4b9ee03e2b18b5.tar.gz frameworks_base-7e5ab3b177b10fee304d011b3a4b9ee03e2b18b5.tar.bz2 | |
Continue es2 shader dev
Conflicts:
graphics/java/android/renderscript/Program.java
graphics/java/android/renderscript/ProgramVertex.java
Diffstat (limited to 'libs/rs/rsProgram.h')
| -rw-r--r-- | libs/rs/rsProgram.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/rs/rsProgram.h b/libs/rs/rsProgram.h index 01b4c88..e9837b7 100644 --- a/libs/rs/rsProgram.h +++ b/libs/rs/rsProgram.h @@ -66,6 +66,7 @@ protected: String8 mUserShader; uint32_t mShaderID; + uint32_t mTextureCount; uint32_t mAttribCount; uint32_t mUniformCount; String8 mAttribNames[MAX_ATTRIBS]; |