Merge "Fix the file mimetype reported by the mpeg4 extractor."
diff --git a/libs/rs/scriptc/rs_allocation.rsh b/libs/rs/scriptc/rs_allocation.rsh
index 392a3ef..b0840a0 100644
--- a/libs/rs/scriptc/rs_allocation.rsh
+++ b/libs/rs/scriptc/rs_allocation.rsh
@@ -14,31 +14,6 @@
* limitations under the License.
*/
-/*! \mainpage notitle
- *
- * Renderscript is a high-performance runtime that provides graphics rendering and
- * compute operations at the native level. Renderscript code is compiled on devices
- * at runtime to allow platform-independence as well.
- * This reference documentation describes the Renderscript runtime APIs, which you
- * can utilize to write Renderscript code in C99. The Renderscript header
- * files are automatically included for you, except for the rs_graphics.rsh header. If
- * you are doing graphics rendering, include the graphics header file like this:
- *
- * <code>#include "rs_graphics.rsh"</code>
- *
- * To use Renderscript, you need to utilize the Renderscript runtime APIs documented here
- * as well as the Android framework APIs for Renderscript.
- * For documentation on the Android framework APIs, see the <a target="_parent" href=
- * "http://developer.android.com/reference/android/renderscript/package-summary.html">
- * android.renderscript</a> package reference.
- * For more information on how to develop with Renderscript and how the runtime and
- * Android framework APIs interact, see the <a target="_parent" href=
- * "http://developer.android.com/guide/topics/renderscript/index.html">Renderscript
- * developer guide</a> and the <a target="_parent" href=
- * "http://developer.android.com/resources/samples/RenderScript/index.html">
- * Renderscript samples</a>.
- */
-
/** @file rs_allocation.rsh
* \brief Allocation routines
*
@@ -168,6 +143,8 @@
extern const void * __attribute__((overloadable))
rsGetElementAt(rs_allocation, uint32_t x, uint32_t y, uint32_t z);
+#if (defined(RS_VERSION) && (RS_VERSION >= 16))
+
/**
* @param a allocation to get data from
* @return element describing allocation layout
@@ -216,26 +193,7 @@
extern const float4 __attribute__((overloadable))
rsSample(rs_allocation a, rs_sampler s, float2 location, float lod);
-/**
- * Fetch allocation in a way described by the sampler
- * @param a 3D allocation to sample from
- * @param s sampler state
- * @param location to sample from
- */
-extern const float4 __attribute__((overloadable))
- rsSample(rs_allocation a, rs_sampler s, float3 location);
-
-/**
- * Fetch allocation in a way described by the sampler
- * @param a 3D allocation to sample from
- * @param s sampler state
- * @param location to sample from
- * @param lod mip level to sample from, for fractional values
- * mip levels will be interpolated if
- * RS_SAMPLER_LINEAR_MIP_LINEAR is used
- */
-extern const float4 __attribute__((overloadable))
- rsSample(rs_allocation a, rs_sampler s, float3 location, float lod);
+#endif // (defined(RS_VERSION) && (RS_VERSION >= 16))
#endif
diff --git a/libs/rs/scriptc/rs_core.rsh b/libs/rs/scriptc/rs_core.rsh
index 5b99976..1b0f9db 100644
--- a/libs/rs/scriptc/rs_core.rsh
+++ b/libs/rs/scriptc/rs_core.rsh
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2011-2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,6 +14,31 @@
* limitations under the License.
*/
+ /*! \mainpage notitle
+ *
+ * Renderscript is a high-performance runtime that provides graphics rendering and
+ * compute operations at the native level. Renderscript code is compiled on devices
+ * at runtime to allow platform-independence as well.
+ * This reference documentation describes the Renderscript runtime APIs, which you
+ * can utilize to write Renderscript code in C99. The Renderscript header
+ * files are automatically included for you, except for the rs_graphics.rsh header. If
+ * you are doing graphics rendering, include the graphics header file like this:
+ *
+ * <code>#include "rs_graphics.rsh"</code>
+ *
+ * To use Renderscript, you need to utilize the Renderscript runtime APIs documented here
+ * as well as the Android framework APIs for Renderscript.
+ * For documentation on the Android framework APIs, see the <a target="_parent" href=
+ * "http://developer.android.com/reference/android/renderscript/package-summary.html">
+ * android.renderscript</a> package reference.
+ * For more information on how to develop with Renderscript and how the runtime and
+ * Android framework APIs interact, see the <a target="_parent" href=
+ * "http://developer.android.com/guide/topics/renderscript/index.html">Renderscript
+ * developer guide</a> and the <a target="_parent" href=
+ * "http://developer.android.com/resources/samples/RenderScript/index.html">
+ * Renderscript samples</a>.
+ */
+
/** @file rs_core.rsh
* \brief todo-jsams
*
@@ -33,16 +58,12 @@
#include "rs_debug.rsh"
#include "rs_element.rsh"
#include "rs_math.rsh"
-#include "rs_mesh.rsh"
#include "rs_matrix.rsh"
#include "rs_object.rsh"
-#include "rs_program.rsh"
#include "rs_quaternion.rsh"
#include "rs_sampler.rsh"
#include "rs_time.rsh"
-
-
/**
* Send a message back to the client. Will not block and returns true
* if the message was sendable and false if the fifo was full.
diff --git a/libs/rs/scriptc/rs_element.rsh b/libs/rs/scriptc/rs_element.rsh
index 72cb51c..1a4cdb75 100644
--- a/libs/rs/scriptc/rs_element.rsh
+++ b/libs/rs/scriptc/rs_element.rsh
@@ -14,31 +14,6 @@
* limitations under the License.
*/
-/*! \mainpage notitle
- *
- * Renderscript is a high-performance runtime that provides graphics rendering and
- * compute operations at the native level. Renderscript code is compiled on devices
- * at runtime to allow platform-independence as well.
- * This reference documentation describes the Renderscript runtime APIs, which you
- * can utilize to write Renderscript code in C99. The Renderscript header
- * files are automatically included for you, except for the rs_graphics.rsh header. If
- * you are doing graphics rendering, include the graphics header file like this:
- *
- * <code>#include "rs_graphics.rsh"</code>
- *
- * To use Renderscript, you need to utilize the Renderscript runtime APIs documented here
- * as well as the Android framework APIs for Renderscript.
- * For documentation on the Android framework APIs, see the <a target="_parent" href=
- * "http://developer.android.com/reference/android/renderscript/package-summary.html">
- * android.renderscript</a> package reference.
- * For more information on how to develop with Renderscript and how the runtime and
- * Android framework APIs interact, see the <a target="_parent" href=
- * "http://developer.android.com/guide/topics/renderscript/index.html">Renderscript
- * developer guide</a> and the <a target="_parent" href=
- * "http://developer.android.com/resources/samples/RenderScript/index.html">
- * Renderscript samples</a>.
- */
-
/** @file rs_element.rsh
* \brief Element routines
*
@@ -48,6 +23,8 @@
#ifndef __RS_ELEMENT_RSH__
#define __RS_ELEMENT_RSH__
+#if (defined(RS_VERSION) && (RS_VERSION >= 16))
+
/**
* @param e element to get data from
* @return number of sub-elements in this element
@@ -130,5 +107,7 @@
extern uint32_t __attribute__((overloadable))
rsElementGetVectorSize(rs_element e);
+#endif // (defined(RS_VERSION) && (RS_VERSION >= 16))
+
#endif // __RS_ELEMENT_RSH__
diff --git a/libs/rs/scriptc/rs_graphics.rsh b/libs/rs/scriptc/rs_graphics.rsh
index 80491ee..44ee99f 100644
--- a/libs/rs/scriptc/rs_graphics.rsh
+++ b/libs/rs/scriptc/rs_graphics.rsh
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2011-2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,9 @@
#ifndef __RS_GRAPHICS_RSH__
#define __RS_GRAPHICS_RSH__
+#include "rs_mesh.rsh"
+#include "rs_program.rsh"
+
#if (defined(RS_VERSION) && (RS_VERSION >= 14))
/**
* Set the color target used for all subsequent rendering calls
diff --git a/libs/rs/scriptc/rs_mesh.rsh b/libs/rs/scriptc/rs_mesh.rsh
index 88f229b..87ffd33 100644
--- a/libs/rs/scriptc/rs_mesh.rsh
+++ b/libs/rs/scriptc/rs_mesh.rsh
@@ -14,31 +14,6 @@
* limitations under the License.
*/
-/*! \mainpage notitle
- *
- * Renderscript is a high-performance runtime that provides graphics rendering and
- * compute operations at the native level. Renderscript code is compiled on devices
- * at runtime to allow platform-independence as well.
- * This reference documentation describes the Renderscript runtime APIs, which you
- * can utilize to write Renderscript code in C99. The Renderscript header
- * files are automatically included for you, except for the rs_graphics.rsh header. If
- * you are doing graphics rendering, include the graphics header file like this:
- *
- * <code>#include "rs_graphics.rsh"</code>
- *
- * To use Renderscript, you need to utilize the Renderscript runtime APIs documented here
- * as well as the Android framework APIs for Renderscript.
- * For documentation on the Android framework APIs, see the <a target="_parent" href=
- * "http://developer.android.com/reference/android/renderscript/package-summary.html">
- * android.renderscript</a> package reference.
- * For more information on how to develop with Renderscript and how the runtime and
- * Android framework APIs interact, see the <a target="_parent" href=
- * "http://developer.android.com/guide/topics/renderscript/index.html">Renderscript
- * developer guide</a> and the <a target="_parent" href=
- * "http://developer.android.com/resources/samples/RenderScript/index.html">
- * Renderscript samples</a>.
- */
-
/** @file rs_mesh.rsh
* \brief Mesh routines
*
@@ -48,13 +23,15 @@
#ifndef __RS_MESH_RSH__
#define __RS_MESH_RSH__
+#if (defined(RS_VERSION) && (RS_VERSION >= 16))
+
/**
* @param m mesh to get data from
* @return number of allocations in the mesh that contain vertex
* data
*/
extern uint32_t __attribute__((overloadable))
- rsMeshGetVertexAllocationCount(rs_mesh m);
+ rsgMeshGetVertexAllocationCount(rs_mesh m);
/**
* @param m mesh to get data from
@@ -63,7 +40,7 @@
* containing index data
*/
extern uint32_t __attribute__((overloadable))
- rsMeshGetPrimitiveCount(rs_mesh m);
+ rsgMeshGetPrimitiveCount(rs_mesh m);
/**
* @param m mesh to get data from
@@ -71,7 +48,7 @@
* @return allocation containing vertex data
*/
extern rs_allocation __attribute__((overloadable))
- rsMeshGetVertexAllocation(rs_mesh m, uint32_t index);
+ rsgMeshGetVertexAllocation(rs_mesh m, uint32_t index);
/**
* @param m mesh to get data from
@@ -79,7 +56,7 @@
* @return allocation containing index data
*/
extern rs_allocation __attribute__((overloadable))
- rsMeshGetIndexAllocation(rs_mesh m, uint32_t index);
+ rsgMeshGetIndexAllocation(rs_mesh m, uint32_t index);
/**
* @param m mesh to get data from
@@ -87,7 +64,9 @@
* @return primitive describing how the mesh is rendered
*/
extern rs_primitive __attribute__((overloadable))
- rsMeshGetPrimitive(rs_mesh m, uint32_t index);
+ rsgMeshGetPrimitive(rs_mesh m, uint32_t index);
+
+#endif // (defined(RS_VERSION) && (RS_VERSION >= 16))
#endif // __RS_MESH_RSH__
diff --git a/libs/rs/scriptc/rs_program.rsh b/libs/rs/scriptc/rs_program.rsh
index 8c52680..6a9929e 100644
--- a/libs/rs/scriptc/rs_program.rsh
+++ b/libs/rs/scriptc/rs_program.rsh
@@ -14,31 +14,6 @@
* limitations under the License.
*/
-/*! \mainpage notitle
- *
- * Renderscript is a high-performance runtime that provides graphics rendering and
- * compute operations at the native level. Renderscript code is compiled on devices
- * at runtime to allow platform-independence as well.
- * This reference documentation describes the Renderscript runtime APIs, which you
- * can utilize to write Renderscript code in C99. The Renderscript header
- * files are automatically included for you, except for the rs_graphics.rsh header. If
- * you are doing graphics rendering, include the graphics header file like this:
- *
- * <code>#include "rs_graphics.rsh"</code>
- *
- * To use Renderscript, you need to utilize the Renderscript runtime APIs documented here
- * as well as the Android framework APIs for Renderscript.
- * For documentation on the Android framework APIs, see the <a target="_parent" href=
- * "http://developer.android.com/reference/android/renderscript/package-summary.html">
- * android.renderscript</a> package reference.
- * For more information on how to develop with Renderscript and how the runtime and
- * Android framework APIs interact, see the <a target="_parent" href=
- * "http://developer.android.com/guide/topics/renderscript/index.html">Renderscript
- * developer guide</a> and the <a target="_parent" href=
- * "http://developer.android.com/resources/samples/RenderScript/index.html">
- * Renderscript samples</a>.
- */
-
/** @file rs_program.rsh
* \brief Program object routines
*
@@ -48,6 +23,8 @@
#ifndef __RS_PROGRAM_RSH__
#define __RS_PROGRAM_RSH__
+#if (defined(RS_VERSION) && (RS_VERSION >= 16))
+
/**
* @hide
* Get program store depth function
@@ -55,7 +32,7 @@
* @param ps
*/
extern rs_depth_func __attribute__((overloadable))
- rsProgramStoreGetDepthFunc(rs_program_store ps);
+ rsgProgramStoreGetDepthFunc(rs_program_store ps);
/**
* @hide
@@ -64,7 +41,7 @@
* @param ps
*/
extern bool __attribute__((overloadable))
- rsProgramStoreGetDepthMask(rs_program_store ps);
+ rsgProgramStoreGetDepthMask(rs_program_store ps);
/**
* @hide
* Get program store red component color mask
@@ -72,7 +49,7 @@
* @param ps
*/
extern bool __attribute__((overloadable))
- rsProgramStoreGetColorMaskR(rs_program_store ps);
+ rsgProgramStoreGetColorMaskR(rs_program_store ps);
/**
* @hide
@@ -81,7 +58,7 @@
* @param ps
*/
extern bool __attribute__((overloadable))
- rsProgramStoreGetColorMaskG(rs_program_store ps);
+ rsgProgramStoreGetColorMaskG(rs_program_store ps);
/**
* @hide
@@ -90,7 +67,7 @@
* @param ps
*/
extern bool __attribute__((overloadable))
- rsProgramStoreGetColorMaskB(rs_program_store ps);
+ rsgProgramStoreGetColorMaskB(rs_program_store ps);
/**
* @hide
@@ -99,7 +76,7 @@
* @param ps
*/
extern bool __attribute__((overloadable))
- rsProgramStoreGetColorMaskA(rs_program_store ps);
+ rsgProgramStoreGetColorMaskA(rs_program_store ps);
/**
* @hide
@@ -108,7 +85,7 @@
* @param ps
*/
extern rs_blend_src_func __attribute__((overloadable))
- rsProgramStoreGetBlendSrcFunc(rs_program_store ps);
+ rsgProgramStoreGetBlendSrcFunc(rs_program_store ps);
/**
* @hide
@@ -117,7 +94,7 @@
* @param ps
*/
extern rs_blend_dst_func __attribute__((overloadable))
- rsProgramStoreGetBlendDstFunc(rs_program_store ps);
+ rsgProgramStoreGetBlendDstFunc(rs_program_store ps);
/**
* @hide
@@ -126,7 +103,7 @@
* @param ps
*/
extern bool __attribute__((overloadable))
- rsProgramStoreGetDitherEnabled(rs_program_store ps);
+ rsgProgramStoreGetDitherEnabled(rs_program_store ps);
/**
* @hide
@@ -135,7 +112,7 @@
* @param pr
*/
extern bool __attribute__((overloadable))
- rsProgramRasterGetPointSpriteEnabled(rs_program_raster pr);
+ rsgProgramRasterGetPointSpriteEnabled(rs_program_raster pr);
/**
* @hide
@@ -144,9 +121,9 @@
* @param pr
*/
extern rs_cull_mode __attribute__((overloadable))
- rsProgramRasterGetCullMode(rs_program_raster pr);
+ rsgProgramRasterGetCullMode(rs_program_raster pr);
-
+#endif // (defined(RS_VERSION) && (RS_VERSION >= 16))
#endif // __RS_PROGRAM_RSH__
diff --git a/libs/rs/scriptc/rs_sampler.rsh b/libs/rs/scriptc/rs_sampler.rsh
index 130eca0..c8948c7 100644
--- a/libs/rs/scriptc/rs_sampler.rsh
+++ b/libs/rs/scriptc/rs_sampler.rsh
@@ -14,31 +14,6 @@
* limitations under the License.
*/
-/*! \mainpage notitle
- *
- * Renderscript is a high-performance runtime that provides graphics rendering and
- * compute operations at the native level. Renderscript code is compiled on devices
- * at runtime to allow platform-independence as well.
- * This reference documentation describes the Renderscript runtime APIs, which you
- * can utilize to write Renderscript code in C99. The Renderscript header
- * files are automatically included for you, except for the rs_graphics.rsh header. If
- * you are doing graphics rendering, include the graphics header file like this:
- *
- * <code>#include "rs_graphics.rsh"</code>
- *
- * To use Renderscript, you need to utilize the Renderscript runtime APIs documented here
- * as well as the Android framework APIs for Renderscript.
- * For documentation on the Android framework APIs, see the <a target="_parent" href=
- * "http://developer.android.com/reference/android/renderscript/package-summary.html">
- * android.renderscript</a> package reference.
- * For more information on how to develop with Renderscript and how the runtime and
- * Android framework APIs interact, see the <a target="_parent" href=
- * "http://developer.android.com/guide/topics/renderscript/index.html">Renderscript
- * developer guide</a> and the <a target="_parent" href=
- * "http://developer.android.com/resources/samples/RenderScript/index.html">
- * Renderscript samples</a>.
- */
-
/** @file rs_sampler.rsh
* \brief Sampler routines
*
@@ -48,6 +23,8 @@
#ifndef __RS_SAMPLER_RSH__
#define __RS_SAMPLER_RSH__
+#if (defined(RS_VERSION) && (RS_VERSION >= 16))
+
/**
* @hide
* Get sampler minification value
@@ -93,5 +70,7 @@
extern float __attribute__((overloadable))
rsSamplerGetAnisotropy(rs_sampler s);
+#endif // (defined(RS_VERSION) && (RS_VERSION >= 16))
+
#endif // __RS_SAMPLER_RSH__
diff --git a/libs/rs/scriptc/rs_types.rsh b/libs/rs/scriptc/rs_types.rsh
index f8c2657..10617d8 100644
--- a/libs/rs/scriptc/rs_types.rsh
+++ b/libs/rs/scriptc/rs_types.rsh
@@ -402,6 +402,8 @@
#endif //defined(RS_VERSION) && (RS_VERSION >= 14)
+#if (defined(RS_VERSION) && (RS_VERSION >= 16))
+
/**
* Describes the way mesh vertex data is interpreted when rendering
*
@@ -552,4 +554,6 @@
RS_SAMPLER_INVALID = 100,
} rs_sampler_value;
-#endif
+#endif // (defined(RS_VERSION) && (RS_VERSION >= 16))
+
+#endif // __RS_TYPES_RSH__
diff --git a/tests/RenderScriptTests/tests/src/com/android/rs/test/mesh.rs b/tests/RenderScriptTests/tests/src/com/android/rs/test/mesh.rs
index 627ab99..1354897 100644
--- a/tests/RenderScriptTests/tests/src/com/android/rs/test/mesh.rs
+++ b/tests/RenderScriptTests/tests/src/com/android/rs/test/mesh.rs
@@ -11,29 +11,29 @@
static bool test_mesh_getters() {
bool failed = false;
- _RS_ASSERT(rsMeshGetVertexAllocationCount(mesh) == 2);
- _RS_ASSERT(rsMeshGetPrimitiveCount(mesh) == 3);
+ _RS_ASSERT(rsgMeshGetVertexAllocationCount(mesh) == 2);
+ _RS_ASSERT(rsgMeshGetPrimitiveCount(mesh) == 3);
- rs_allocation meshV0 = rsMeshGetVertexAllocation(mesh, 0);
- rs_allocation meshV1 = rsMeshGetVertexAllocation(mesh, 1);
- rs_allocation meshV2 = rsMeshGetVertexAllocation(mesh, 2);
+ rs_allocation meshV0 = rsgMeshGetVertexAllocation(mesh, 0);
+ rs_allocation meshV1 = rsgMeshGetVertexAllocation(mesh, 1);
+ rs_allocation meshV2 = rsgMeshGetVertexAllocation(mesh, 2);
_RS_ASSERT(meshV0.p == vertexAlloc0.p);
_RS_ASSERT(meshV1.p == vertexAlloc1.p);
_RS_ASSERT(!rsIsObject(meshV2));
- rs_allocation meshI0 = rsMeshGetIndexAllocation(mesh, 0);
- rs_allocation meshI1 = rsMeshGetIndexAllocation(mesh, 1);
- rs_allocation meshI2 = rsMeshGetIndexAllocation(mesh, 2);
- rs_allocation meshI3 = rsMeshGetIndexAllocation(mesh, 3);
+ rs_allocation meshI0 = rsgMeshGetIndexAllocation(mesh, 0);
+ rs_allocation meshI1 = rsgMeshGetIndexAllocation(mesh, 1);
+ rs_allocation meshI2 = rsgMeshGetIndexAllocation(mesh, 2);
+ rs_allocation meshI3 = rsgMeshGetIndexAllocation(mesh, 3);
_RS_ASSERT(meshI0.p == indexAlloc0.p);
_RS_ASSERT(!rsIsObject(meshI1));
_RS_ASSERT(meshI2.p == indexAlloc2.p);
_RS_ASSERT(!rsIsObject(meshI3));
- rs_primitive p0 = rsMeshGetPrimitive(mesh, 0);
- rs_primitive p1 = rsMeshGetPrimitive(mesh, 1);
- rs_primitive p2 = rsMeshGetPrimitive(mesh, 2);
- rs_primitive p3 = rsMeshGetPrimitive(mesh, 3);
+ rs_primitive p0 = rsgMeshGetPrimitive(mesh, 0);
+ rs_primitive p1 = rsgMeshGetPrimitive(mesh, 1);
+ rs_primitive p2 = rsgMeshGetPrimitive(mesh, 2);
+ rs_primitive p3 = rsgMeshGetPrimitive(mesh, 3);
_RS_ASSERT(p0 == RS_PRIMITIVE_POINT);
_RS_ASSERT(p1 == RS_PRIMITIVE_LINE);
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 0eaca4a..11b8c30 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,11 +7,11 @@
static bool test_program_raster_getters() {
bool failed = false;
- _RS_ASSERT(rsProgramRasterGetPointSpriteEnabled(pointSpriteEnabled) == true);
- _RS_ASSERT(rsProgramRasterGetCullMode(pointSpriteEnabled) == RS_CULL_BACK);
+ _RS_ASSERT(rsgProgramRasterGetPointSpriteEnabled(pointSpriteEnabled) == true);
+ _RS_ASSERT(rsgProgramRasterGetCullMode(pointSpriteEnabled) == RS_CULL_BACK);
- _RS_ASSERT(rsProgramRasterGetPointSpriteEnabled(cullMode) == false);
- _RS_ASSERT(rsProgramRasterGetCullMode(cullMode) == RS_CULL_FRONT);
+ _RS_ASSERT(rsgProgramRasterGetPointSpriteEnabled(cullMode) == false);
+ _RS_ASSERT(rsgProgramRasterGetCullMode(cullMode) == RS_CULL_FRONT);
if (failed) {
rsDebug("test_program_raster_getters FAILED", 0);
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 7b47408..3cd8a20 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
@@ -14,95 +14,95 @@
static bool test_program_store_getters() {
bool failed = false;
- _RS_ASSERT(rsProgramStoreGetDepthFunc(depthFunc) == RS_DEPTH_FUNC_GREATER);
- _RS_ASSERT(rsProgramStoreGetDepthMask(depthFunc) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskR(depthFunc) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskG(depthFunc) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskB(depthFunc) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskA(depthFunc) == false);
- _RS_ASSERT(rsProgramStoreGetDitherEnabled(depthFunc) == false);
- _RS_ASSERT(rsProgramStoreGetBlendSrcFunc(depthFunc) == RS_BLEND_SRC_ZERO);
- _RS_ASSERT(rsProgramStoreGetBlendDstFunc(depthFunc) == RS_BLEND_DST_ZERO);
+ _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(rsgProgramStoreGetBlendSrcFunc(depthFunc) == RS_BLEND_SRC_ZERO);
+ _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(depthFunc) == RS_BLEND_DST_ZERO);
- _RS_ASSERT(rsProgramStoreGetDepthFunc(depthWriteEnable) == RS_DEPTH_FUNC_ALWAYS);
- _RS_ASSERT(rsProgramStoreGetDepthMask(depthWriteEnable) == true);
- _RS_ASSERT(rsProgramStoreGetColorMaskR(depthWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskG(depthWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskB(depthWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskA(depthWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetDitherEnabled(depthWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetBlendSrcFunc(depthWriteEnable) == RS_BLEND_SRC_ZERO);
- _RS_ASSERT(rsProgramStoreGetBlendDstFunc(depthWriteEnable) == 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(rsgProgramStoreGetBlendSrcFunc(depthWriteEnable) == RS_BLEND_SRC_ZERO);
+ _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(depthWriteEnable) == RS_BLEND_DST_ZERO);
- _RS_ASSERT(rsProgramStoreGetDepthFunc(colorRWriteEnable) == RS_DEPTH_FUNC_ALWAYS);
- _RS_ASSERT(rsProgramStoreGetDepthMask(colorRWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskR(colorRWriteEnable) == true);
- _RS_ASSERT(rsProgramStoreGetColorMaskG(colorRWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskB(colorRWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskA(colorRWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetDitherEnabled(colorRWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetBlendSrcFunc(colorRWriteEnable) == RS_BLEND_SRC_ZERO);
- _RS_ASSERT(rsProgramStoreGetBlendDstFunc(colorRWriteEnable) == 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(rsgProgramStoreGetBlendSrcFunc(colorRWriteEnable) == RS_BLEND_SRC_ZERO);
+ _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(colorRWriteEnable) == RS_BLEND_DST_ZERO);
- _RS_ASSERT(rsProgramStoreGetDepthFunc(colorGWriteEnable) == RS_DEPTH_FUNC_ALWAYS);
- _RS_ASSERT(rsProgramStoreGetDepthMask(colorGWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskR(colorGWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskG(colorGWriteEnable) == true);
- _RS_ASSERT(rsProgramStoreGetColorMaskB(colorGWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskA(colorGWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetDitherEnabled(colorGWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetBlendSrcFunc(colorGWriteEnable) == RS_BLEND_SRC_ZERO);
- _RS_ASSERT(rsProgramStoreGetBlendDstFunc(colorGWriteEnable) == 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(rsgProgramStoreGetBlendSrcFunc(colorGWriteEnable) == RS_BLEND_SRC_ZERO);
+ _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(colorGWriteEnable) == RS_BLEND_DST_ZERO);
- _RS_ASSERT(rsProgramStoreGetDepthFunc(colorBWriteEnable) == RS_DEPTH_FUNC_ALWAYS);
- _RS_ASSERT(rsProgramStoreGetDepthMask(colorBWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskR(colorBWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskG(colorBWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskB(colorBWriteEnable) == true);
- _RS_ASSERT(rsProgramStoreGetColorMaskA(colorBWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetDitherEnabled(colorBWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetBlendSrcFunc(colorBWriteEnable) == RS_BLEND_SRC_ZERO);
- _RS_ASSERT(rsProgramStoreGetBlendDstFunc(colorBWriteEnable) == 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(rsgProgramStoreGetBlendSrcFunc(colorBWriteEnable) == RS_BLEND_SRC_ZERO);
+ _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(colorBWriteEnable) == RS_BLEND_DST_ZERO);
- _RS_ASSERT(rsProgramStoreGetDepthFunc(colorAWriteEnable) == RS_DEPTH_FUNC_ALWAYS);
- _RS_ASSERT(rsProgramStoreGetDepthMask(colorAWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskR(colorAWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskG(colorAWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskB(colorAWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskA(colorAWriteEnable) == true);
- _RS_ASSERT(rsProgramStoreGetDitherEnabled(colorAWriteEnable) == false);
- _RS_ASSERT(rsProgramStoreGetBlendSrcFunc(colorAWriteEnable) == RS_BLEND_SRC_ZERO);
- _RS_ASSERT(rsProgramStoreGetBlendDstFunc(colorAWriteEnable) == 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(rsgProgramStoreGetBlendSrcFunc(colorAWriteEnable) == RS_BLEND_SRC_ZERO);
+ _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(colorAWriteEnable) == RS_BLEND_DST_ZERO);
- _RS_ASSERT(rsProgramStoreGetDepthFunc(ditherEnable) == RS_DEPTH_FUNC_ALWAYS);
- _RS_ASSERT(rsProgramStoreGetDepthMask(ditherEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskR(ditherEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskG(ditherEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskB(ditherEnable) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskA(ditherEnable) == false);
- _RS_ASSERT(rsProgramStoreGetDitherEnabled(ditherEnable) == true);
- _RS_ASSERT(rsProgramStoreGetBlendSrcFunc(ditherEnable) == RS_BLEND_SRC_ZERO);
- _RS_ASSERT(rsProgramStoreGetBlendDstFunc(ditherEnable) == 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(rsgProgramStoreGetBlendSrcFunc(ditherEnable) == RS_BLEND_SRC_ZERO);
+ _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(ditherEnable) == RS_BLEND_DST_ZERO);
- _RS_ASSERT(rsProgramStoreGetDepthFunc(blendSrc) == RS_DEPTH_FUNC_ALWAYS);
- _RS_ASSERT(rsProgramStoreGetDepthMask(blendSrc) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskR(blendSrc) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskG(blendSrc) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskB(blendSrc) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskA(blendSrc) == false);
- _RS_ASSERT(rsProgramStoreGetDitherEnabled(blendSrc) == false);
- _RS_ASSERT(rsProgramStoreGetBlendSrcFunc(blendSrc) == RS_BLEND_SRC_DST_COLOR);
- _RS_ASSERT(rsProgramStoreGetBlendDstFunc(blendSrc) == 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(rsgProgramStoreGetBlendSrcFunc(blendSrc) == RS_BLEND_SRC_DST_COLOR);
+ _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(blendSrc) == RS_BLEND_DST_ZERO);
- _RS_ASSERT(rsProgramStoreGetDepthFunc(blendDst) == RS_DEPTH_FUNC_ALWAYS);
- _RS_ASSERT(rsProgramStoreGetDepthMask(blendDst) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskR(blendDst) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskG(blendDst) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskB(blendDst) == false);
- _RS_ASSERT(rsProgramStoreGetColorMaskA(blendDst) == false);
- _RS_ASSERT(rsProgramStoreGetDitherEnabled(blendDst) == false);
- _RS_ASSERT(rsProgramStoreGetBlendSrcFunc(blendDst) == RS_BLEND_SRC_ZERO);
- _RS_ASSERT(rsProgramStoreGetBlendDstFunc(blendDst) == RS_BLEND_DST_DST_ALPHA);
+ _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(rsgProgramStoreGetBlendSrcFunc(blendDst) == RS_BLEND_SRC_ZERO);
+ _RS_ASSERT(rsgProgramStoreGetBlendDstFunc(blendDst) == RS_BLEND_DST_DST_ALPHA);
if (failed) {
rsDebug("test_program_store_getters FAILED", 0);