diff options
author | Alex Sakhartchouk <alexst@google.com> | 2011-12-29 11:17:38 -0800 |
---|---|---|
committer | Alex Sakhartchouk <alexst@google.com> | 2011-12-29 11:17:38 -0800 |
commit | 25a59d051a218bd608b005a149509464b3e6d4f0 (patch) | |
tree | b66dfa8b31f50390c5d3dc411e989a2ddeb3eeaa | |
parent | 4a43e3ea8a0328c56ace0af1869b4c8c781a7b26 (diff) | |
download | rs-25a59d051a218bd608b005a149509464b3e6d4f0.tar.gz |
Adding better error behavior to RS
Change-Id: Iea1cc76793f8978d60575404d7b1c5145e268d6e
-rw-r--r-- | RenderScriptDefines.h | 20 | ||||
-rw-r--r-- | driver/rsdMeshObj.cpp | 1 | ||||
-rw-r--r-- | driver/rsdProgramRaster.cpp | 3 | ||||
-rw-r--r-- | rsComponent.cpp | 4 | ||||
-rw-r--r-- | scriptc/rs_graphics.rsh | 18 | ||||
-rw-r--r-- | scriptc/rs_types.rsh | 8 |
6 files changed, 45 insertions, 9 deletions
diff --git a/RenderScriptDefines.h b/RenderScriptDefines.h index 728b27aa..49c75c5d 100644 --- a/RenderScriptDefines.h +++ b/RenderScriptDefines.h @@ -153,6 +153,8 @@ enum RsDataType { RS_TYPE_PROGRAM_VERTEX, RS_TYPE_PROGRAM_RASTER, RS_TYPE_PROGRAM_STORE, + + RS_TYPE_INVALID = 10000, }; enum RsDataKind { @@ -164,6 +166,8 @@ enum RsDataKind { RS_KIND_PIXEL_RGB, RS_KIND_PIXEL_RGBA, RS_KIND_PIXEL_DEPTH, + + RS_KIND_INVALID = 100, }; enum RsSamplerParam { @@ -182,6 +186,8 @@ enum RsSamplerValue { RS_SAMPLER_WRAP, RS_SAMPLER_CLAMP, RS_SAMPLER_LINEAR_MIP_NEAREST, + + RS_SAMPLER_INVALID = 100, }; enum RsTextureTarget { @@ -222,7 +228,8 @@ enum RsBlendSrcFunc { RS_BLEND_SRC_ONE_MINUS_SRC_ALPHA, // 5 RS_BLEND_SRC_DST_ALPHA, // 6 RS_BLEND_SRC_ONE_MINUS_DST_ALPHA, // 7 - RS_BLEND_SRC_SRC_ALPHA_SATURATE // 8 + RS_BLEND_SRC_SRC_ALPHA_SATURATE, // 8 + RS_BLEND_SRC_INVALID = 100, }; enum RsBlendDstFunc { @@ -233,7 +240,9 @@ enum RsBlendDstFunc { RS_BLEND_DST_SRC_ALPHA, // 4 RS_BLEND_DST_ONE_MINUS_SRC_ALPHA, // 5 RS_BLEND_DST_DST_ALPHA, // 6 - RS_BLEND_DST_ONE_MINUS_DST_ALPHA // 7 + RS_BLEND_DST_ONE_MINUS_DST_ALPHA, // 7 + + RS_BLEND_DST_INVALID = 100, }; enum RsTexEnvMode { @@ -256,7 +265,9 @@ enum RsPrimitive { RS_PRIMITIVE_LINE_STRIP, RS_PRIMITIVE_TRIANGLE, RS_PRIMITIVE_TRIANGLE_STRIP, - RS_PRIMITIVE_TRIANGLE_FAN + RS_PRIMITIVE_TRIANGLE_FAN, + + RS_PRIMITIVE_INVALID = 100, }; enum RsPathPrimitive { @@ -315,7 +326,8 @@ enum RsA3DClassID { enum RsCullMode { RS_CULL_BACK, RS_CULL_FRONT, - RS_CULL_NONE + RS_CULL_NONE, + RS_CULL_INVALID = 100, }; typedef struct { diff --git a/driver/rsdMeshObj.cpp b/driver/rsdMeshObj.cpp index 9ac63835..9a8c4d56 100644 --- a/driver/rsdMeshObj.cpp +++ b/driver/rsdMeshObj.cpp @@ -191,6 +191,7 @@ void RsdMeshObj::updateGLPrimitives() { case RS_PRIMITIVE_TRIANGLE: mGLPrimitives[i] = GL_TRIANGLES; break; case RS_PRIMITIVE_TRIANGLE_STRIP: mGLPrimitives[i] = GL_TRIANGLE_STRIP; break; case RS_PRIMITIVE_TRIANGLE_FAN: mGLPrimitives[i] = GL_TRIANGLE_FAN; break; + default: LOGE("Invalid mesh primitive"); break; } } } diff --git a/driver/rsdProgramRaster.cpp b/driver/rsdProgramRaster.cpp index b4937594..9b64fa99 100644 --- a/driver/rsdProgramRaster.cpp +++ b/driver/rsdProgramRaster.cpp @@ -45,6 +45,9 @@ void rsdProgramRasterSetActive(const Context *rsc, const ProgramRaster *pr) { case RS_CULL_NONE: RSD_CALL_GL(glDisable, GL_CULL_FACE); break; + default: + LOGE("Invalid cull type"); + break; } } diff --git a/rsComponent.cpp b/rsComponent.cpp index 21b98f61..9c2c2005 100644 --- a/rsComponent.cpp +++ b/rsComponent.cpp @@ -62,6 +62,7 @@ void Component::set(RsDataType dt, RsDataKind dk, bool norm, uint32_t vecSize) { rsAssert(mNormalized == true); break; default: + rsAssert(mKind != RS_KIND_INVALID); break; } @@ -167,6 +168,9 @@ void Component::set(RsDataType dt, RsDataKind dk, bool norm, uint32_t vecSize) { case RS_TYPE_BOOLEAN: mTypeBits = 8; break; + default: + rsAssert(mType != RS_TYPE_INVALID); + break; } mBitsUnpadded = mTypeBits * mVectorSize; diff --git a/scriptc/rs_graphics.rsh b/scriptc/rs_graphics.rsh index a01bc3de..64fcd23c 100644 --- a/scriptc/rs_graphics.rsh +++ b/scriptc/rs_graphics.rsh @@ -31,7 +31,9 @@ typedef enum { RS_DEPTH_FUNC_GREATER, RS_DEPTH_FUNC_GEQUAL, RS_DEPTH_FUNC_EQUAL, - RS_DEPTH_FUNC_NOTEQUAL + RS_DEPTH_FUNC_NOTEQUAL, + + RS_DEPTH_FUNC_INVALID = 100, } rs_depth_func; typedef enum { @@ -43,7 +45,9 @@ typedef enum { RS_BLEND_SRC_ONE_MINUS_SRC_ALPHA, // 5 RS_BLEND_SRC_DST_ALPHA, // 6 RS_BLEND_SRC_ONE_MINUS_DST_ALPHA, // 7 - RS_BLEND_SRC_SRC_ALPHA_SATURATE // 8 + RS_BLEND_SRC_SRC_ALPHA_SATURATE, // 8 + + RS_BLEND_SRC_INVALID = 100, } rs_blend_src_func; typedef enum { @@ -54,13 +58,17 @@ typedef enum { RS_BLEND_DST_SRC_ALPHA, // 4 RS_BLEND_DST_ONE_MINUS_SRC_ALPHA, // 5 RS_BLEND_DST_DST_ALPHA, // 6 - RS_BLEND_DST_ONE_MINUS_DST_ALPHA // 7 + RS_BLEND_DST_ONE_MINUS_DST_ALPHA, // 7 + + RS_BLEND_DST_INVALID = 100, } rs_blend_dst_func; typedef enum { RS_CULL_BACK, RS_CULL_FRONT, - RS_CULL_NONE + RS_CULL_NONE, + + RS_CULL_INVALID = 100, } rs_cull_mode; typedef enum { @@ -70,6 +78,8 @@ typedef enum { RS_SAMPLER_WRAP, RS_SAMPLER_CLAMP, RS_SAMPLER_LINEAR_MIP_NEAREST, + + RS_SAMPLER_INVALID = 100, } rs_sampler_value; #if (defined(RS_VERSION) && (RS_VERSION >= 14)) diff --git a/scriptc/rs_types.rsh b/scriptc/rs_types.rsh index e1c8650d..5345a48e 100644 --- a/scriptc/rs_types.rsh +++ b/scriptc/rs_types.rsh @@ -412,7 +412,9 @@ typedef enum { RS_PRIMITIVE_LINE_STRIP, RS_PRIMITIVE_TRIANGLE, RS_PRIMITIVE_TRIANGLE_STRIP, - RS_PRIMITIVE_TRIANGLE_FAN + RS_PRIMITIVE_TRIANGLE_FAN, + + RS_PRIMITIVE_INVALID = 100, } rs_primitive; /** @@ -467,6 +469,8 @@ typedef enum { RS_TYPE_PROGRAM_VERTEX, RS_TYPE_PROGRAM_RASTER, RS_TYPE_PROGRAM_STORE, + + RS_TYPE_INVALID = 10000, } rs_data_type; /** @@ -486,6 +490,8 @@ typedef enum { RS_KIND_PIXEL_RGB, RS_KIND_PIXEL_RGBA, RS_KIND_PIXEL_DEPTH, + + RS_KIND_INVALID = 100, } rs_data_kind; #endif |