diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2010-09-14 11:39:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-14 11:39:53 -0700 |
| commit | d3326231dc3d334054fbeeacdf691965d1618a0c (patch) | |
| tree | 57446faee5b38f37d9bd00aba59d50054900b23b /libs/rs/rsProgram.h | |
| parent | 9322775014432ed6c87c864e98fe482f879ff233 (diff) | |
| parent | c984dd73c6f96d16e11813ae433ef70f7648ae77 (diff) | |
| download | frameworks_base-d3326231dc3d334054fbeeacdf691965d1618a0c.zip frameworks_base-d3326231dc3d334054fbeeacdf691965d1618a0c.tar.gz frameworks_base-d3326231dc3d334054fbeeacdf691965d1618a0c.tar.bz2 | |
Merge "Shader changes to allow for more flexible constant binding."
Diffstat (limited to 'libs/rs/rsProgram.h')
| -rw-r--r-- | libs/rs/rsProgram.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/rs/rsProgram.h b/libs/rs/rsProgram.h index ddc5e8a..e7329c2 100644 --- a/libs/rs/rsProgram.h +++ b/libs/rs/rsProgram.h @@ -23,10 +23,10 @@ // --------------------------------------------------------------------------- namespace android { namespace renderscript { - - class ShaderCache; +#define RS_SHADER_INTERNAL "//rs_shader_internal\n" + class Program : public ObjectBase { public: @@ -42,7 +42,7 @@ public: void bindAllocation(Allocation *, uint32_t slot); virtual void createShader(); - bool isUserProgram() const {return mUserShader.size() > 0;} + bool isUserProgram() const {return !mIsInternal;} void bindTexture(uint32_t slot, Allocation *); void bindSampler(uint32_t slot, Sampler *); @@ -71,6 +71,7 @@ protected: uint32_t mOutputCount; uint32_t mConstantCount; bool mIsValid; + bool mIsInternal; // Applies to vertex and fragment shaders only void appendUserConstants(); |