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

am fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"

Browse Source 
* commit 'fecc0bf4f1d8d1939807123d0f01ca1fe377bda4':
  Frameworks/native: Add pragmas to glgen headers
This commit is contained in:
Andreas Gampe 2014-11-12 18:40:21 +00:00 committed by Android Git Automerger
commit c5657b0c34
13 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opengl/tools/glgen/stubs/egl/EGL14cHeader.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
opengl/tools/glgen/stubs/egl/EGLExtcHeader.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
opengl/tools/glgen/stubs/gles11/GLES10ExtcHeader.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
opengl/tools/glgen/stubs/gles11/GLES10cHeader.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
opengl/tools/glgen/stubs/gles11/GLES11ExtcHeader.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
opengl/tools/glgen/stubs/gles11/GLES11cHeader.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
opengl/tools/glgen/stubs/gles11/GLES20cHeader.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
opengl/tools/glgen/stubs/gles11/GLES30cHeader.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>

4
opengl/tools/glgen/stubs/gles11/GLES31ExtcHeader.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
opengl/tools/glgen/stubs/gles11/GLES31cHeader.cpp
View File

@ -16,5 +16,9 @@
// 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>

2
opengl/tools/glgen/stubs/gles11/glDrawArraysIndirect.cpp
View File

@ -3,7 +3,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;
}

2
opengl/tools/glgen/stubs/gles11/glDrawElementsIndirect.cpp
View File

@ -3,7 +3,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
opengl/tools/glgen/stubs/jsr239/GLCHeader.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>