summaryrefslogtreecommitdiffstats
path: root/libs/rs/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
commitea87e96959895ef94cc3aa9576f41a660d2bbf03 (patch)
tree651c5131fada7c1a2ab55c71e3d6b71901f0832c /libs/rs/rsProgram.h
parent917cd4fcda61c63429d73639284f34bb85c97f37 (diff)
downloadframeworks_base-ea87e96959895ef94cc3aa9576f41a660d2bbf03.zip
frameworks_base-ea87e96959895ef94cc3aa9576f41a660d2bbf03.tar.gz
frameworks_base-ea87e96959895ef94cc3aa9576f41a660d2bbf03.tar.bz2
Implement type generation for user uniforms in vertex shader.
Diffstat (limited to 'libs/rs/rsProgram.h')
-rw-r--r--libs/rs/rsProgram.h4
1 files changed, 2 insertions, 2 deletions
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<Allocation> mConstants;
+ ObjectBaseRef<Allocation> mConstants[MAX_UNIFORMS];
mutable bool mDirty;
String8 mShader;