Continue es2 shader dev
Conflicts:
graphics/java/android/renderscript/Program.java
graphics/java/android/renderscript/ProgramVertex.java
diff --git a/rs.spec b/rs.spec
index 6ce6b35..5de76b2 100644
--- a/rs.spec
+++ b/rs.spec
@@ -406,6 +406,14 @@
ret RsProgramFragment
}
+ProgramFragmentCreate2 {
+ param const char * shaderText
+ param uint32_t shaderLength
+ param const uint32_t * params
+ param uint32_t paramLength
+ ret RsProgramFragment
+ }
+
ProgramVertexCreate {
param bool texMat
ret RsProgramVertex
@@ -416,7 +424,7 @@
param uint32_t shaderLength
param const uint32_t * params
param uint32_t paramLength
- ret RsProgramFragment
+ ret RsProgramVertex
}
LightBegin {