commit ea87e96959895ef94cc3aa9576f41a660d2bbf03
author Jason Sams <rjsams@android.com> Tue Jan 12 12:12:28 2010 -0800
committer Jason Sams <rjsams@android.com> Tue Jan 12 12:12:28 2010 -0800
tree 651c5131fada7c1a2ab55c71e3d6b71901f0832c
parent 917cd4fcda61c63429d73639284f34bb85c97f37

Implement type generation for user uniforms in vertex shader.

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 @@
                        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 @@
     uint32_t mOutputCount;
     uint32_t mConstantCount;
 
-    ObjectBaseRef<Allocation> mConstants;
+    ObjectBaseRef<Allocation> mConstants[MAX_UNIFORMS];
 
     mutable bool mDirty;
     String8 mShader;