diff options
| author | Jean-Luc Brouillet <jeanluc@google.com> | 2014-03-25 16:27:34 -0700 |
|---|---|---|
| committer | Jean-Luc Brouillet <jeanluc@google.com> | 2014-03-25 17:04:31 -0700 |
| commit | 23037481bccbc09baa8f76b0015534571ccd2a4e (patch) | |
| tree | 71b798ec3d4e9fee49aefd4e4596b4591aaaaedf /rsScriptC.h | |
| parent | 6dc86b492191f9062e912afd948e08362201f332 (diff) | |
| download | rs-23037481bccbc09baa8f76b0015534571ccd2a4e.tar.gz | |
Remove the obsolete ScriptCState. Simplify cascading #ifdefs.
Change-Id: I1cb561c6325d80c764d386f7b76e6a416261cd8f
modified: rsContext.h
modified: rsScriptC.cpp
modified: rsScriptC.h
Diffstat (limited to 'rsScriptC.h')
| -rw-r--r-- | rsScriptC.h | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/rsScriptC.h b/rsScriptC.h index fdf678d5..4a033f15 100644 --- a/rsScriptC.h +++ b/rsScriptC.h @@ -17,23 +17,19 @@ #ifndef ANDROID_RS_SCRIPT_C_H #define ANDROID_RS_SCRIPT_C_H -#include "rsScript.h" - #include "rsEnv.h" +#include "rsScript.h" -#ifndef FAKE_ARM64_BUILD -#ifndef RS_COMPATIBILITY_LIB -#ifndef ANDROID_RS_SERIALIZE +#if !defined(FAKE_ARM64_BUILD) && !defined(RS_COMPATIBILITY_LIB) && !defined(ANDROID_RS_SERIALIZE) #include "bcinfo/BitcodeTranslator.h" #endif -#endif -#endif // --------------------------------------------------------------------------- namespace android { namespace renderscript { +/** This class represents a script compiled from an .rs file. */ class ScriptC : public Script { public: typedef int (*RunScript_t)(); @@ -65,36 +61,15 @@ public: void setupScript(Context *); void setupGLState(Context *); private: -#ifndef FAKE_ARM64_BUILD -#ifndef RS_COMPATIBILITY_LIB -#ifndef ANDROID_RS_SERIALIZE +#if !defined(FAKE_ARM64_BUILD) && !defined(RS_COMPATIBILITY_LIB) && !defined(ANDROID_RS_SERIALIZE) bcinfo::BitcodeTranslator *BT; #endif +#if !defined(FAKE_ARM64_BUILD) && !defined(RS_COMPATIBILITY_LIB) bool createCacheDir(const char *cacheDir); #endif -#endif }; -class ScriptCState { -public: - ScriptCState(); - ~ScriptCState(); - - char * mScriptText; - size_t mScriptLen; - - struct SymbolTable_t { - const char * mName; - void * mPtr; - bool threadable; - }; - static const SymbolTable_t * lookupSymbol(const char *); - static const SymbolTable_t * lookupSymbolCL(const char *); - static const SymbolTable_t * lookupSymbolGL(const char *); -}; - - } } #endif |