drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "regenerate egl/gles stubs from glgen"

Browse Source
This commit is contained in:
Mathias Agopian
2013-02-23 04:13:34 +00:00
committed by Android (Google) Code Review
parent bd0dc13cb8 89be00bcda
commit 0d1ab1db22
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/jni/android_opengl_EGL14.cpp
View File

@ -1,5 +1,4 @@
/*
**
** Copyright 2012, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
@ -605,7 +604,7 @@ android_eglCreateWindowSurfaceTexture
jint _remaining;
EGLint *attrib_list = (EGLint *) 0;
android::sp<ANativeWindow> window;
android::sp<android::GLConsumer> surfaceTexture;
android::sp<android::GLConsumer> glConsumer;
if (!attrib_list_ref) {
_exception = 1;
@ -626,12 +625,12 @@ not_valid_surface:
_exceptionMessage = "Make sure the SurfaceView or associated SurfaceHolder has a valid Surface";
goto exit;
}
surfaceTexture = android::SurfaceTexture_getSurfaceTexture(_env, win);
glConsumer = android::SurfaceTexture_getSurfaceTexture(_env, win);
if (surfaceTexture == NULL)
if (glConsumer == NULL)
goto not_valid_surface;
window = new android::Surface(surfaceTexture->getBufferQueue());
window = new android::Surface(glConsumer->getBufferQueue());
if (window == NULL)
goto not_valid_surface;

8
core/jni/android_opengl_GLES20.cpp
View File

@ -2127,14 +2127,14 @@ android_glGetAttachedShaders__IILjava_nio_IntBuffer_2Ljava_nio_IntBuffer_2
}
}
/* int glGetAttribLocation ( GLuint program, const char *name ) */
/* GLint glGetAttribLocation ( GLuint program, const char *name ) */
static jint
android_glGetAttribLocation__ILjava_lang_String_2
(JNIEnv *_env, jobject _this, jint program, jstring name) {
jint _exception = 0;
const char * _exceptionType;
const char * _exceptionMessage;
int _returnValue = 0;
GLint _returnValue = 0;
const char* _nativename = 0;
if (!name) {
@ -3983,14 +3983,14 @@ android_glGetUniformiv__IILjava_nio_IntBuffer_2
}
}
/* int glGetUniformLocation ( GLuint program, const char *name ) */
/* GLint glGetUniformLocation ( GLuint program, const char *name ) */
static jint
android_glGetUniformLocation__ILjava_lang_String_2
(JNIEnv *_env, jobject _this, jint program, jstring name) {
jint _exception = 0;
const char * _exceptionType;
const char * _exceptionMessage;
int _returnValue = 0;
GLint _returnValue = 0;
const char* _nativename = 0;
if (!name) {

4
opengl/java/android/opengl/GLES20.java
View File

@ -914,7 +914,7 @@ public class GLES20 {
java.nio.IntBuffer shaders
);
// C function int glGetAttribLocation ( GLuint program, const char *name )
// C function GLint glGetAttribLocation ( GLuint program, const char *name )
public static native int glGetAttribLocation(
int program,
@ -1236,7 +1236,7 @@ public class GLES20 {
java.nio.IntBuffer params
);
// C function int glGetUniformLocation ( GLuint program, const char *name )
// C function GLint glGetUniformLocation ( GLuint program, const char *name )
public static native int glGetUniformLocation(
int program,