summaryrefslogtreecommitdiffstats
path: root/libs/rs/rsProgram.h
diff options
context:
space:
mode:
authorAlex Sakhartchouk <alexst@google.com>2010-08-31 15:05:43 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-31 15:05:43 -0700
commitfdf5b0808ff6f6a3c067dab17a9533cfd66229f1 (patch)
treed5420eae07ee6dad39c471fe0a847e16bfd48cd0 /libs/rs/rsProgram.h
parent03cf22057a9f494346b0160c1709500741741e03 (diff)
parent8442e0bffe0cdf731449d16494da35f9df956cee (diff)
downloadframeworks_base-fdf5b0808ff6f6a3c067dab17a9533cfd66229f1.zip
frameworks_base-fdf5b0808ff6f6a3c067dab17a9533cfd66229f1.tar.gz
frameworks_base-fdf5b0808ff6f6a3c067dab17a9533cfd66229f1.tar.bz2
Merge "Fixing uniform binding for fragment shader. Updating the glsl fragment shader to color the lights."
Diffstat (limited to 'libs/rs/rsProgram.h')
-rw-r--r--libs/rs/rsProgram.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/rs/rsProgram.h b/libs/rs/rsProgram.h
index 86f85fb..ddc5e8a 100644
--- a/libs/rs/rsProgram.h
+++ b/libs/rs/rsProgram.h
@@ -72,6 +72,11 @@ protected:
uint32_t mConstantCount;
bool mIsValid;
+ // Applies to vertex and fragment shaders only
+ void appendUserConstants();
+ void setupUserConstants(ShaderCache *sc, bool isFragment);
+ void initAddUserElement(const Element *e, String8 *names, uint32_t *count, const char *prefix);
+
ObjectBaseRef<Allocation> mConstants[MAX_UNIFORMS];
mutable bool mDirty;