diff options
3 files changed, 57 insertions, 57 deletions
diff --git a/tests/RenderScriptTests/tests/src/com/android/rs/test/element.rs b/tests/RenderScriptTests/tests/src/com/android/rs/test/element.rs index 0c42d84..419ce07 100644 --- a/tests/RenderScriptTests/tests/src/com/android/rs/test/element.rs +++ b/tests/RenderScriptTests/tests/src/com/android/rs/test/element.rs @@ -101,7 +101,7 @@ static bool test_element_getters() { _RS_ASSERT(rsElementGetDataKind(complexElem) == RS_KIND_USER); _RS_ASSERT(rsElementGetDataType(complexElem) == RS_TYPE_NONE); _RS_ASSERT(rsElementGetVectorSize(complexElem) == 1); - _RS_ASSERT(rsElementGetSizeBytes(complexElem) == sizeof(*complexStruct)); + _RS_ASSERT(rsElementGetBytesSize(complexElem) == sizeof(*complexStruct)); char buffer[64]; for (uint32_t i = 0; i < subElemCount; i ++) { diff --git a/tests/RenderScriptTests/tests/src/com/android/rs/test/program_raster.rs b/tests/RenderScriptTests/tests/src/com/android/rs/test/program_raster.rs index 11b8c30..3d6b502 100644 --- a/tests/RenderScriptTests/tests/src/com/android/rs/test/program_raster.rs +++ b/tests/RenderScriptTests/tests/src/com/android/rs/test/program_raster.rs @@ -7,10 +7,10 @@ rs_program_raster cullMode; static bool test_program_raster_getters() { bool failed = false; - _RS_ASSERT(rsgProgramRasterGetPointSpriteEnabled(pointSpriteEnabled) == true); + _RS_ASSERT(rsgProgramRasterIsPointSpriteEnabled(pointSpriteEnabled) == true); _RS_ASSERT(rsgProgramRasterGetCullMode(pointSpriteEnabled) == RS_CULL_BACK); - _RS_ASSERT(rsgProgramRasterGetPointSpriteEnabled(cullMode) == false); + _RS_ASSERT(rsgProgramRasterIsPointSpriteEnabled(cullMode) == false); _RS_ASSERT(rsgProgramRasterGetCullMode(cullMode) == RS_CULL_FRONT); if (failed) { diff --git a/tests/RenderScriptTests/tests/src/com/android/rs/test/program_store.rs b/tests/RenderScriptTests/tests/src/com/android/rs/test/program_store.rs index 3cd8a20..2ae5636 100644 --- a/tests/RenderScriptTests/tests/src/com/android/rs/test/program_store.rs +++ b/tests/RenderScriptTests/tests/src/com/android/rs/test/program_store.rs @@ -15,92 +15,92 @@ static bool test_program_store_getters() { bool failed = false; _RS_ASSERT(rsgProgramStoreGetDepthFunc(depthFunc) == RS_DEPTH_FUNC_GREATER); - _RS_ASSERT(rsgProgramStoreGetDepthMask(depthFunc) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskR(depthFunc) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskG(depthFunc) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskB(depthFunc) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskA(depthFunc) == false); - _RS_ASSERT(rsgProgramStoreGetDitherEnabled(depthFunc) == false); + _RS_ASSERT(rsgProgramStoreIsDepthMaskEnabled(depthFunc) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskRedEnabled(depthFunc) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskGreenEnabled(depthFunc) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskBlueEnabled(depthFunc) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskAlphaEnabled( depthFunc) == false); + _RS_ASSERT(rsgProgramStoreIsDitherEnabled(depthFunc) == false); _RS_ASSERT(rsgProgramStoreGetBlendSrcFunc(depthFunc) == RS_BLEND_SRC_ZERO); _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(depthFunc) == RS_BLEND_DST_ZERO); _RS_ASSERT(rsgProgramStoreGetDepthFunc(depthWriteEnable) == RS_DEPTH_FUNC_ALWAYS); - _RS_ASSERT(rsgProgramStoreGetDepthMask(depthWriteEnable) == true); - _RS_ASSERT(rsgProgramStoreGetColorMaskR(depthWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskG(depthWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskB(depthWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskA(depthWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetDitherEnabled(depthWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsDepthMaskEnabled(depthWriteEnable) == true); + _RS_ASSERT(rsgProgramStoreIsColorMaskRedEnabled(depthWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskGreenEnabled(depthWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskBlueEnabled(depthWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskAlphaEnabled( depthWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsDitherEnabled(depthWriteEnable) == false); _RS_ASSERT(rsgProgramStoreGetBlendSrcFunc(depthWriteEnable) == RS_BLEND_SRC_ZERO); _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(depthWriteEnable) == RS_BLEND_DST_ZERO); _RS_ASSERT(rsgProgramStoreGetDepthFunc(colorRWriteEnable) == RS_DEPTH_FUNC_ALWAYS); - _RS_ASSERT(rsgProgramStoreGetDepthMask(colorRWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskR(colorRWriteEnable) == true); - _RS_ASSERT(rsgProgramStoreGetColorMaskG(colorRWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskB(colorRWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskA(colorRWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetDitherEnabled(colorRWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsDepthMaskEnabled(colorRWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskRedEnabled(colorRWriteEnable) == true); + _RS_ASSERT(rsgProgramStoreIsColorMaskGreenEnabled(colorRWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskBlueEnabled(colorRWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskAlphaEnabled( colorRWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsDitherEnabled(colorRWriteEnable) == false); _RS_ASSERT(rsgProgramStoreGetBlendSrcFunc(colorRWriteEnable) == RS_BLEND_SRC_ZERO); _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(colorRWriteEnable) == RS_BLEND_DST_ZERO); _RS_ASSERT(rsgProgramStoreGetDepthFunc(colorGWriteEnable) == RS_DEPTH_FUNC_ALWAYS); - _RS_ASSERT(rsgProgramStoreGetDepthMask(colorGWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskR(colorGWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskG(colorGWriteEnable) == true); - _RS_ASSERT(rsgProgramStoreGetColorMaskB(colorGWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskA(colorGWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetDitherEnabled(colorGWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsDepthMaskEnabled(colorGWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskRedEnabled(colorGWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskGreenEnabled(colorGWriteEnable) == true); + _RS_ASSERT(rsgProgramStoreIsColorMaskBlueEnabled(colorGWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskAlphaEnabled( colorGWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsDitherEnabled(colorGWriteEnable) == false); _RS_ASSERT(rsgProgramStoreGetBlendSrcFunc(colorGWriteEnable) == RS_BLEND_SRC_ZERO); _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(colorGWriteEnable) == RS_BLEND_DST_ZERO); _RS_ASSERT(rsgProgramStoreGetDepthFunc(colorBWriteEnable) == RS_DEPTH_FUNC_ALWAYS); - _RS_ASSERT(rsgProgramStoreGetDepthMask(colorBWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskR(colorBWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskG(colorBWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskB(colorBWriteEnable) == true); - _RS_ASSERT(rsgProgramStoreGetColorMaskA(colorBWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetDitherEnabled(colorBWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsDepthMaskEnabled(colorBWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskRedEnabled(colorBWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskGreenEnabled(colorBWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskBlueEnabled(colorBWriteEnable) == true); + _RS_ASSERT(rsgProgramStoreIsColorMaskAlphaEnabled( colorBWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsDitherEnabled(colorBWriteEnable) == false); _RS_ASSERT(rsgProgramStoreGetBlendSrcFunc(colorBWriteEnable) == RS_BLEND_SRC_ZERO); _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(colorBWriteEnable) == RS_BLEND_DST_ZERO); _RS_ASSERT(rsgProgramStoreGetDepthFunc(colorAWriteEnable) == RS_DEPTH_FUNC_ALWAYS); - _RS_ASSERT(rsgProgramStoreGetDepthMask(colorAWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskR(colorAWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskG(colorAWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskB(colorAWriteEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskA(colorAWriteEnable) == true); - _RS_ASSERT(rsgProgramStoreGetDitherEnabled(colorAWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsDepthMaskEnabled(colorAWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskRedEnabled(colorAWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskGreenEnabled(colorAWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskBlueEnabled(colorAWriteEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskAlphaEnabled( colorAWriteEnable) == true); + _RS_ASSERT(rsgProgramStoreIsDitherEnabled(colorAWriteEnable) == false); _RS_ASSERT(rsgProgramStoreGetBlendSrcFunc(colorAWriteEnable) == RS_BLEND_SRC_ZERO); _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(colorAWriteEnable) == RS_BLEND_DST_ZERO); _RS_ASSERT(rsgProgramStoreGetDepthFunc(ditherEnable) == RS_DEPTH_FUNC_ALWAYS); - _RS_ASSERT(rsgProgramStoreGetDepthMask(ditherEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskR(ditherEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskG(ditherEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskB(ditherEnable) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskA(ditherEnable) == false); - _RS_ASSERT(rsgProgramStoreGetDitherEnabled(ditherEnable) == true); + _RS_ASSERT(rsgProgramStoreIsDepthMaskEnabled(ditherEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskRedEnabled(ditherEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskGreenEnabled(ditherEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskBlueEnabled(ditherEnable) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskAlphaEnabled( ditherEnable) == false); + _RS_ASSERT(rsgProgramStoreIsDitherEnabled(ditherEnable) == true); _RS_ASSERT(rsgProgramStoreGetBlendSrcFunc(ditherEnable) == RS_BLEND_SRC_ZERO); _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(ditherEnable) == RS_BLEND_DST_ZERO); _RS_ASSERT(rsgProgramStoreGetDepthFunc(blendSrc) == RS_DEPTH_FUNC_ALWAYS); - _RS_ASSERT(rsgProgramStoreGetDepthMask(blendSrc) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskR(blendSrc) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskG(blendSrc) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskB(blendSrc) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskA(blendSrc) == false); - _RS_ASSERT(rsgProgramStoreGetDitherEnabled(blendSrc) == false); + _RS_ASSERT(rsgProgramStoreIsDepthMaskEnabled(blendSrc) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskRedEnabled(blendSrc) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskGreenEnabled(blendSrc) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskBlueEnabled(blendSrc) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskAlphaEnabled( blendSrc) == false); + _RS_ASSERT(rsgProgramStoreIsDitherEnabled(blendSrc) == false); _RS_ASSERT(rsgProgramStoreGetBlendSrcFunc(blendSrc) == RS_BLEND_SRC_DST_COLOR); _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(blendSrc) == RS_BLEND_DST_ZERO); _RS_ASSERT(rsgProgramStoreGetDepthFunc(blendDst) == RS_DEPTH_FUNC_ALWAYS); - _RS_ASSERT(rsgProgramStoreGetDepthMask(blendDst) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskR(blendDst) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskG(blendDst) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskB(blendDst) == false); - _RS_ASSERT(rsgProgramStoreGetColorMaskA(blendDst) == false); - _RS_ASSERT(rsgProgramStoreGetDitherEnabled(blendDst) == false); + _RS_ASSERT(rsgProgramStoreIsDepthMaskEnabled(blendDst) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskRedEnabled(blendDst) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskGreenEnabled(blendDst) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskBlueEnabled(blendDst) == false); + _RS_ASSERT(rsgProgramStoreIsColorMaskAlphaEnabled( blendDst) == false); + _RS_ASSERT(rsgProgramStoreIsDitherEnabled(blendDst) == false); _RS_ASSERT(rsgProgramStoreGetBlendSrcFunc(blendDst) == RS_BLEND_SRC_ZERO); _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(blendDst) == RS_BLEND_DST_DST_ALPHA); |