ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Special-case glGetUniformIndices 

Bug: 8566953
Change-Id: Ic8bcd03e8d41a81f48d603f67ce2046a4afa1561
This commit is contained in:
Jesse Hall 2013-04-10 09:26:48 -07:00
parent 31f6edc21b
commit 27c86b9623
4 changed files with 174 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opengl/tools/glgen/specs/gles11/GLES30.spec
View File

@ -221,7 +221,7 @@ void glClearBufferfv ( GLenum buffer, GLint drawbuffer, const GLfloat *value )
void glClearBufferfi ( GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil )
// const GLubyte * glGetStringi ( GLenum name, GLuint index )
void glCopyBufferSubData ( GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size )
// void glGetUniformIndices ( GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices )
void glGetUniformIndices ( GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices )
void glGetActiveUniformsiv ( GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params )
GLuint glGetUniformBlockIndex ( GLuint program, const GLchar *uniformBlockName )
void glGetActiveUniformBlockiv ( GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params )

154
opengl/tools/glgen/stubs/gles11/glGetUniformIndices.cpp Normal file
View File

@ -0,0 +1,154 @@
/* void glGetUniformIndices ( GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices ) */
static
void
android_glGetUniformIndices_array
(JNIEnv *_env, jobject _this, jint program, jobjectArray uniformNames_ref, jintArray uniformIndices_ref, jint uniformIndicesOffset) {
jint _exception = 0;
const char* _exceptionType = NULL;
const char* _exceptionMessage = NULL;
jint _count = 0;
jint _i;
const char** _names = NULL;
GLuint* _indices_base = NULL;
GLuint* _indices = NULL;
if (!uniformNames_ref) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "uniformNames == null";
goto exit;
}
_count = _env->GetArrayLength(uniformNames_ref);
_names = (const char**)calloc(_count, sizeof(const char*));
for (_i = 0; _i < _count; _i++) {
jstring _name = (jstring)_env->GetObjectArrayElement(uniformNames_ref, _i);
if (!_name) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "null uniformNames element";
goto exit;
}
_names[_i] = _env->GetStringUTFChars(_name, 0);
}
if (!uniformIndices_ref) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "uniformIndices == null";
goto exit;
}
if (uniformIndicesOffset < 0) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "uniformIndicesOffset < 0";
goto exit;
}
if (_env->GetArrayLength(uniformIndices_ref) - uniformIndicesOffset < _count) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "not enough space in uniformIndices";
goto exit;
}
_indices_base = (GLuint*)_env->GetPrimitiveArrayCritical(
uniformIndices_ref, 0);
_indices = _indices_base + uniformIndicesOffset;
glGetUniformIndices(program, _count, _names, _indices);
exit:
if (_indices_base) {
_env->ReleasePrimitiveArrayCritical(uniformIndices_ref, _indices_base,
_exception ? JNI_ABORT : 0);
}
for (_i = _count - 1; _i >= 0; _i--) {
if (_names[_i]) {
jstring _name = (jstring)_env->GetObjectArrayElement(uniformNames_ref, _i);
if (_name) {
_env->ReleaseStringUTFChars(_name, _names[_i]);
}
}
}
free(_names);
if (_exception) {
jniThrowException(_env, _exceptionType, _exceptionMessage);
}
}
/* void glGetUniformIndices ( GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices ) */
static
void
android_glGetUniformIndices_buffer
(JNIEnv *_env, jobject _this, jint program, jobjectArray uniformNames_ref, jobject uniformIndices_buf) {
jint _exception = 0;
const char* _exceptionType = NULL;
const char* _exceptionMessage = NULL;
jint _count = 0;
jint _i;
const char** _names = NULL;
jarray _uniformIndicesArray = (jarray)0;
jint _uniformIndicesRemaining;
jint _uniformIndicesOffset = 0;
GLuint* _indices = NULL;
char* _indicesBase = NULL;
if (!uniformNames_ref) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "uniformNames == null";
goto exit;
}
if (!uniformIndices_buf) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "uniformIndices == null";
goto exit;
}
_count = _env->GetArrayLength(uniformNames_ref);
_names = (const char**)calloc(_count, sizeof(const char*));
for (_i = 0; _i < _count; _i++) {
jstring _name = (jstring)_env->GetObjectArrayElement(uniformNames_ref, _i);
if (!_name) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "null uniformNames element";
goto exit;
}
_names[_i] = _env->GetStringUTFChars(_name, 0);
}
_indices = (GLuint*)getPointer(_env, uniformIndices_buf,
&_uniformIndicesArray, &_uniformIndicesRemaining,
&_uniformIndicesOffset);
if (!_indices) {
_indicesBase = (char*)_env->GetPrimitiveArrayCritical(
_uniformIndicesArray, 0);
_indices = (GLuint*)(_indicesBase + _uniformIndicesOffset);
}
if (_uniformIndicesRemaining < _count) {
_exception = 1;
_exceptionType = "java/lang/IllegalArgumentException";
_exceptionMessage = "not enough space in uniformIndices";
goto exit;
}
glGetUniformIndices(program, _count, _names, _indices);
exit:
if (_uniformIndicesArray) {
releasePointer(_env, _uniformIndicesArray, _indicesBase, JNI_TRUE);
}
for (_i = _count - 1; _i >= 0; _i--) {
if (_names[_i]) {
jstring _name = (jstring)_env->GetObjectArrayElement(uniformNames_ref, _i);
if (_name) {
_env->ReleaseStringUTFChars(_name, _names[_i]);
}
}
}
free(_names);
if (_exception) {
jniThrowException(_env, _exceptionType, _exceptionMessage);
}
}

17
opengl/tools/glgen/stubs/gles11/glGetUniformIndices.java Normal file
View File

@ -0,0 +1,17 @@
// C function void glGetUniformIndices ( GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices )
public static native void glGetUniformIndices(
int program,
String[] uniformNames,
int[] uniformIndices,
int uniformIndicesOffset
);
// C function void glGetUniformIndices ( GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices )
public static native void glGetUniformIndices(
int program,
String[] uniformNames,
java.nio.IntBuffer uniformIndices
);

2
opengl/tools/glgen/stubs/gles11/glGetUniformIndices.nativeReg Normal file
View File

@ -0,0 +1,2 @@
{"glGetUniformIndices", "(I[Ljava/lang/String;[II)V", (void *) android_glGetUniformIndices_array },
{"glGetUniformIndices", "(I[Ljava/lang/String;[Ljava/nio/IntBuffer)V", (void *) android_glGetUniformIndices_buffer },