From ea87e96959895ef94cc3aa9576f41a660d2bbf03 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Tue, 12 Jan 2010 12:12:28 -0800 Subject: Implement type generation for user uniforms in vertex shader. --- libs/rs/rsProgram.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/rs/rsProgram.h') diff --git a/libs/rs/rsProgram.h b/libs/rs/rsProgram.h index 4bb7802..a34e89f 100644 --- a/libs/rs/rsProgram.h +++ b/libs/rs/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 mConstants; + ObjectBaseRef mConstants[MAX_UNIFORMS]; mutable bool mDirty; String8 mShader; -- cgit v1.1