diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2011-05-05 16:56:27 -0700 |
|---|---|---|
| committer | Alex Sakhartchouk <alexst@google.com> | 2011-05-05 16:56:27 -0700 |
| commit | 438505431c253fd891f3deda38033c30268913e8 (patch) | |
| tree | 956640c1f809f6ffaf17c434539a920b126e794a /libs/rs/rsProgram.h | |
| parent | 19c5c7a7bc0fe7d91a3d39c10a001aed25a6f1ca (diff) | |
| download | frameworks_base-438505431c253fd891f3deda38033c30268913e8.zip frameworks_base-438505431c253fd891f3deda38033c30268913e8.tar.gz frameworks_base-438505431c253fd891f3deda38033c30268913e8.tar.bz2 | |
Moving samplers behind the hal.
Change-Id: I494e5a9d2b599d07b985328b346f1f10ae4972e1
Diffstat (limited to 'libs/rs/rsProgram.h')
| -rw-r--r-- | libs/rs/rsProgram.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/libs/rs/rsProgram.h b/libs/rs/rsProgram.h index 2922270..948ba3e 100644 --- a/libs/rs/rsProgram.h +++ b/libs/rs/rsProgram.h @@ -17,7 +17,7 @@ #ifndef ANDROID_RS_PROGRAM_H #define ANDROID_RS_PROGRAM_H -#include "rsObjectBase.h" +#include "rsProgramBase.h" #include "rsElement.h" // --------------------------------------------------------------------------- @@ -28,10 +28,9 @@ namespace renderscript { #define RS_SHADER_ATTR "ATTRIB_" #define RS_SHADER_UNI "UNI_" -class Program : public ObjectBase { +class Program : public ProgramBase { public: - Program(Context *); Program(Context *, const char * shaderText, uint32_t shaderLength, const uint32_t * params, uint32_t paramLength); virtual ~Program(); @@ -43,8 +42,6 @@ public: void bindTexture(Context *, uint32_t slot, Allocation *); void bindSampler(Context *, uint32_t slot, Sampler *); - void forceDirty() const {mDirty = true;} - struct Hal { mutable void *drv; @@ -75,18 +72,13 @@ public: protected: bool mIsInternal; - - mutable bool mDirty; String8 mUserShader; - - void logUniform(const Element *field, const float *fd, uint32_t arraySize ); - void setUniform(Context *rsc, const Element *field, const float *fd, int32_t slot, uint32_t arraySize ); void initMemberVars(); }; } } -#endif +#endif // ANDROID_RS_PROGRAM_H |