Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f0044947: Merge "Frameworks/base: New GL bindings"

Browse Source 
* commit 'f0044947a7199278d529c9b0b53cde089851ce23':
  Frameworks/base: New GL bindings
This commit is contained in:
Andreas Gampe
2014-11-13 17:51:41 +00:00
committed by Android Git Automerger
parent 922807a39c f0044947a7
commit f8eac973af
11 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_opengl_EGL14.cpp
View File

@@ -16,6 +16,10 @@
// This source file is automatically generated
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#include "jni.h"
#include "JNIHelp.h"
#include <android_runtime/AndroidRuntime.h>

4
core/jni/android_opengl_EGLExt.cpp
View File

@@ -16,6 +16,10 @@
// This source file is automatically generated
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#include "jni.h"
#include "JNIHelp.h"
#include <android_runtime/AndroidRuntime.h>

4
core/jni/android_opengl_GLES10.cpp
View File

@@ -17,6 +17,10 @@
// This source file is automatically generated
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#include <GLES/gl.h>
#include <GLES/glext.h>

4
core/jni/android_opengl_GLES10Ext.cpp
View File

@@ -17,6 +17,10 @@
// This source file is automatically generated
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#include <GLES/gl.h>
#include <GLES/glext.h>

4
core/jni/android_opengl_GLES11.cpp
View File

@@ -17,6 +17,10 @@
// This source file is automatically generated
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#include <GLES/gl.h>
#include <GLES/glext.h>

4
core/jni/android_opengl_GLES11Ext.cpp
View File

@@ -17,6 +17,10 @@
// This source file is automatically generated
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#include <GLES/gl.h>
#include <GLES/glext.h>

4
core/jni/android_opengl_GLES20.cpp
View File

@@ -17,6 +17,10 @@
// This source file is automatically generated
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>

4
core/jni/android_opengl_GLES30.cpp
View File

@@ -17,6 +17,10 @@
// This source file is automatically generated
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#include <GLES3/gl3.h>
#include <GLES3/gl3ext.h>

8
core/jni/android_opengl_GLES31.cpp
View File

@@ -16,6 +16,10 @@
// This source file is automatically generated
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#include <stdint.h>
#include <GLES3/gl31.h>
#include <jni.h>
@@ -351,7 +355,7 @@ static void android_glDrawArraysIndirect(JNIEnv *_env, jobject, int mode, jlong
// In OpenGL ES, 'indirect' is a byte offset into a buffer, not a raw pointer.
// GL checks for too-large values. Here we only need to check for successful signed 64-bit
// to unsigned 32-bit conversion.
if (sizeof(void*) != sizeof(jlong) && indirect > UINTPTR_MAX) {
if (sizeof(void*) != sizeof(jlong) && indirect > static_cast<jlong>(UINT32_MAX)) {
jniThrowException(_env, "java/lang/IllegalArgumentException", "indirect offset too large");
return;
}
@@ -363,7 +367,7 @@ static void android_glDrawElementsIndirect(JNIEnv *_env, jobject, jint mode, jin
// In OpenGL ES, 'indirect' is a byte offset into a buffer, not a raw pointer.
// GL checks for too-large values. Here we only need to check for successful signed 64-bit
// to unsigned 32-bit conversion.
if (sizeof(void*) != sizeof(jlong) && indirect > UINTPTR_MAX) {
if (sizeof(void*) != sizeof(jlong) && indirect > static_cast<jlong>(UINT32_MAX)) {
jniThrowException(_env, "java/lang/IllegalArgumentException", "indirect offset too large");
return;
}

4
core/jni/android_opengl_GLES31Ext.cpp
View File

@@ -16,6 +16,10 @@
// This source file is automatically generated
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#include <GLES3/gl31.h>
#include <GLES2/gl2ext.h>

4
core/jni/com_google_android_gles_jni_GLImpl.cpp
View File

@@ -17,6 +17,10 @@
// This source file is automatically generated
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#include "jni.h"
#include "JNIHelp.h"
#include <android_runtime/AndroidRuntime.h>