summaryrefslogtreecommitdiff
path: root/rsProgram.h
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-01-12 12:12:28 -0800
committerJason Sams <rjsams@android.com>2010-01-12 12:12:28 -0800
commit9ebb0c44ece47531f3d0a98ba52ae448de42032b (patch)
tree0b9c3b04fdad0b6951d564c09f4093bd27d8c32f /rsProgram.h
parent7c52898ac201043a26b3edb7526d414684cfb96b (diff)
Implement type generation for user uniforms in vertex shader.
Diffstat (limited to 'rsProgram.h')
-rw-r--r--rsProgram.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/rsProgram.h b/rsProgram.h
index 4bb7802f..a34e89fa 100644
--- a/rsProgram.h
+++ b/rsProgram.h
@@ -39,7 +39,7 @@ public:
const uint32_t * params, uint32_t paramLength);
virtual ~Program();
- void bindAllocation(Allocation *);
+ void bindAllocation(Allocation *, uint32_t slot);
virtual void createShader();
bool isUserProgram() const {return mUserShader.size() > 0;}
@@ -69,7 +69,7 @@ protected:
uint32_t mOutputCount;
uint32_t mConstantCount;
- ObjectBaseRef<Allocation> mConstants;
+ ObjectBaseRef<Allocation> mConstants[MAX_UNIFORMS];
mutable bool mDirty;
String8 mShader;