diff options
| author | 2009-12-15 13:00:25 -0800 | |
|---|---|---|
| committer | 2009-12-15 13:00:25 -0800 | |
| commit | b686ec70445226d3f865b6e838b3f2cdf034ca31 (patch) | |
| tree | 521af59aa15cbe1dec696067f0749c7e9f4006a3 /libs/rs/RenderScript.h | |
| parent | e2f126cc30f2449ff32f343565c974ede9455f2c (diff) | |
| parent | 0011bcf57ff711a221a3a4c73f2a79125111647d (diff) | |
Merge change I0011bcf5
* changes:
Continue development of es2.0 user shader support for renderscript. This change cleans up ProgramVertex creation and adds support for passing input, output, and constant type info.
Diffstat (limited to 'libs/rs/RenderScript.h')
| -rw-r--r-- | libs/rs/RenderScript.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libs/rs/RenderScript.h b/libs/rs/RenderScript.h index 3ca8b158c8b7..12ae6e16a77d 100644 --- a/libs/rs/RenderScript.h +++ b/libs/rs/RenderScript.h @@ -36,11 +36,11 @@ typedef void * RsElement; typedef void * RsFile; typedef void * RsSampler; typedef void * RsScript; -typedef void * RsScriptBasicTemp; typedef void * RsSimpleMesh; typedef void * RsType; typedef void * RsLight; +typedef void * RsProgram; typedef void * RsProgramVertex; typedef void * RsProgramFragment; typedef void * RsProgramFragmentStore; @@ -163,6 +163,12 @@ enum RsTexEnvMode { RS_TEX_ENV_MODE_DECAL }; +enum RsProgramParam { + RS_PROGRAM_PARAM_INPUT, + RS_PROGRAM_PARAM_OUTPUT, + RS_PROGRAM_PARAM_CONSTANT, +}; + enum RsPrimitive { RS_PRIMITIVE_POINT, RS_PRIMITIVE_LINE, |