diff options
author | Andreas Gampe | 2014-11-12 12:40:21 -0600 |
---|---|---|
committer | Android Git Automerger | 2014-11-12 12:40:21 -0600 |
commit | c5657b0c344b39d794c4c8241004d4e19341c096 (patch) | |
tree | e4130924ad68ad2ae3254f63ce6274ef2d94e918 /opengl | |
parent | 3b93c2b9d0bd4495b6d0fa5f834214f6665873ab (diff) | |
parent | fecc0bf4f1d8d1939807123d0f01ca1fe377bda4 (diff) | |
download | frameworks-native-c5657b0c344b39d794c4c8241004d4e19341c096.tar.gz frameworks-native-c5657b0c344b39d794c4c8241004d4e19341c096.tar.xz frameworks-native-c5657b0c344b39d794c4c8241004d4e19341c096.zip |
am fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"
* commit 'fecc0bf4f1d8d1939807123d0f01ca1fe377bda4':
Frameworks/native: Add pragmas to glgen headers
Diffstat (limited to 'opengl')
13 files changed, 46 insertions, 2 deletions
diff --git a/opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp b/opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp index a372362f6..f6813fdc0 100644 --- a/opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp +++ b/opengl/tools/glgen/stubs/egl/EGL14cHeader.cpp | |||
@@ -16,6 +16,10 @@ | |||
16 | 16 | ||
17 | // This source file is automatically generated | 17 | // This source file is automatically generated |
18 | 18 | ||
19 | #pragma GCC diagnostic ignored "-Wunused-variable" | ||
20 | #pragma GCC diagnostic ignored "-Wunused-but-set-variable" | ||
21 | #pragma GCC diagnostic ignored "-Wunused-function" | ||
22 | |||
19 | #include "jni.h" | 23 | #include "jni.h" |
20 | #include "JNIHelp.h" | 24 | #include "JNIHelp.h" |
21 | #include <android_runtime/AndroidRuntime.h> | 25 | #include <android_runtime/AndroidRuntime.h> |
diff --git a/opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp b/opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp index b5c19df78..9bd2ca4c7 100644 --- a/opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp +++ b/opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp | |||
@@ -16,6 +16,10 @@ | |||
16 | 16 | ||
17 | // This source file is automatically generated | 17 | // This source file is automatically generated |
18 | 18 | ||
19 | #pragma GCC diagnostic ignored "-Wunused-variable" | ||
20 | #pragma GCC diagnostic ignored "-Wunused-but-set-variable" | ||
21 | #pragma GCC diagnostic ignored "-Wunused-function" | ||
22 | |||
19 | #include "jni.h" | 23 | #include "jni.h" |
20 | #include "JNIHelp.h" | 24 | #include "JNIHelp.h" |
21 | #include <android_runtime/AndroidRuntime.h> | 25 | #include <android_runtime/AndroidRuntime.h> |
diff --git a/opengl/tools/glgen/stubs/gles11/GLES10ExtcHeader.cpp b/opengl/tools/glgen/stubs/gles11/GLES10ExtcHeader.cpp index 8a1d5edb0..1fa92758a 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES10ExtcHeader.cpp +++ b/opengl/tools/glgen/stubs/gles11/GLES10ExtcHeader.cpp | |||
@@ -17,6 +17,10 @@ | |||
17 | 17 | ||
18 | // This source file is automatically generated | 18 | // This source file is automatically generated |
19 | 19 | ||
20 | #pragma GCC diagnostic ignored "-Wunused-variable" | ||
21 | #pragma GCC diagnostic ignored "-Wunused-but-set-variable" | ||
22 | #pragma GCC diagnostic ignored "-Wunused-function" | ||
23 | |||
20 | #include <GLES/gl.h> | 24 | #include <GLES/gl.h> |
21 | #include <GLES/glext.h> | 25 | #include <GLES/glext.h> |
22 | 26 | ||
diff --git a/opengl/tools/glgen/stubs/gles11/GLES10cHeader.cpp b/opengl/tools/glgen/stubs/gles11/GLES10cHeader.cpp index 8a1d5edb0..1fa92758a 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES10cHeader.cpp +++ b/opengl/tools/glgen/stubs/gles11/GLES10cHeader.cpp | |||
@@ -17,6 +17,10 @@ | |||
17 | 17 | ||
18 | // This source file is automatically generated | 18 | // This source file is automatically generated |
19 | 19 | ||
20 | #pragma GCC diagnostic ignored "-Wunused-variable" | ||
21 | #pragma GCC diagnostic ignored "-Wunused-but-set-variable" | ||
22 | #pragma GCC diagnostic ignored "-Wunused-function" | ||
23 | |||
20 | #include <GLES/gl.h> | 24 | #include <GLES/gl.h> |
21 | #include <GLES/glext.h> | 25 | #include <GLES/glext.h> |
22 | 26 | ||
diff --git a/opengl/tools/glgen/stubs/gles11/GLES11ExtcHeader.cpp b/opengl/tools/glgen/stubs/gles11/GLES11ExtcHeader.cpp index 8a1d5edb0..1fa92758a 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES11ExtcHeader.cpp +++ b/opengl/tools/glgen/stubs/gles11/GLES11ExtcHeader.cpp | |||
@@ -17,6 +17,10 @@ | |||
17 | 17 | ||
18 | // This source file is automatically generated | 18 | // This source file is automatically generated |
19 | 19 | ||
20 | #pragma GCC diagnostic ignored "-Wunused-variable" | ||
21 | #pragma GCC diagnostic ignored "-Wunused-but-set-variable" | ||
22 | #pragma GCC diagnostic ignored "-Wunused-function" | ||
23 | |||
20 | #include <GLES/gl.h> | 24 | #include <GLES/gl.h> |
21 | #include <GLES/glext.h> | 25 | #include <GLES/glext.h> |
22 | 26 | ||
diff --git a/opengl/tools/glgen/stubs/gles11/GLES11cHeader.cpp b/opengl/tools/glgen/stubs/gles11/GLES11cHeader.cpp index 8a1d5edb0..1fa92758a 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES11cHeader.cpp +++ b/opengl/tools/glgen/stubs/gles11/GLES11cHeader.cpp | |||
@@ -17,6 +17,10 @@ | |||
17 | 17 | ||
18 | // This source file is automatically generated | 18 | // This source file is automatically generated |
19 | 19 | ||
20 | #pragma GCC diagnostic ignored "-Wunused-variable" | ||
21 | #pragma GCC diagnostic ignored "-Wunused-but-set-variable" | ||
22 | #pragma GCC diagnostic ignored "-Wunused-function" | ||
23 | |||
20 | #include <GLES/gl.h> | 24 | #include <GLES/gl.h> |
21 | #include <GLES/glext.h> | 25 | #include <GLES/glext.h> |
22 | 26 | ||
diff --git a/opengl/tools/glgen/stubs/gles11/GLES20cHeader.cpp b/opengl/tools/glgen/stubs/gles11/GLES20cHeader.cpp index 2389563f9..4004a7dfc 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES20cHeader.cpp +++ b/opengl/tools/glgen/stubs/gles11/GLES20cHeader.cpp | |||
@@ -17,6 +17,10 @@ | |||
17 | 17 | ||
18 | // This source file is automatically generated | 18 | // This source file is automatically generated |
19 | 19 | ||
20 | #pragma GCC diagnostic ignored "-Wunused-variable" | ||
21 | #pragma GCC diagnostic ignored "-Wunused-but-set-variable" | ||
22 | #pragma GCC diagnostic ignored "-Wunused-function" | ||
23 | |||
20 | #include <GLES2/gl2.h> | 24 | #include <GLES2/gl2.h> |
21 | #include <GLES2/gl2ext.h> | 25 | #include <GLES2/gl2ext.h> |
22 | 26 | ||
diff --git a/opengl/tools/glgen/stubs/gles11/GLES30cHeader.cpp b/opengl/tools/glgen/stubs/gles11/GLES30cHeader.cpp index f5ec455a9..c5bdf323f 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES30cHeader.cpp +++ b/opengl/tools/glgen/stubs/gles11/GLES30cHeader.cpp | |||
@@ -17,6 +17,10 @@ | |||
17 | 17 | ||
18 | // This source file is automatically generated | 18 | // This source file is automatically generated |
19 | 19 | ||
20 | #pragma GCC diagnostic ignored "-Wunused-variable" | ||
21 | #pragma GCC diagnostic ignored "-Wunused-but-set-variable" | ||
22 | #pragma GCC diagnostic ignored "-Wunused-function" | ||
23 | |||
20 | #include <GLES3/gl3.h> | 24 | #include <GLES3/gl3.h> |
21 | #include <GLES3/gl3ext.h> | 25 | #include <GLES3/gl3ext.h> |
22 | 26 | ||
diff --git a/opengl/tools/glgen/stubs/gles11/GLES31ExtcHeader.cpp b/opengl/tools/glgen/stubs/gles11/GLES31ExtcHeader.cpp index e7e356116..2260a80bb 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES31ExtcHeader.cpp +++ b/opengl/tools/glgen/stubs/gles11/GLES31ExtcHeader.cpp | |||
@@ -16,6 +16,10 @@ | |||
16 | 16 | ||
17 | // This source file is automatically generated | 17 | // This source file is automatically generated |
18 | 18 | ||
19 | #pragma GCC diagnostic ignored "-Wunused-variable" | ||
20 | #pragma GCC diagnostic ignored "-Wunused-but-set-variable" | ||
21 | #pragma GCC diagnostic ignored "-Wunused-function" | ||
22 | |||
19 | #include <GLES3/gl31.h> | 23 | #include <GLES3/gl31.h> |
20 | #include <GLES2/gl2ext.h> | 24 | #include <GLES2/gl2ext.h> |
21 | 25 | ||
diff --git a/opengl/tools/glgen/stubs/gles11/GLES31cHeader.cpp b/opengl/tools/glgen/stubs/gles11/GLES31cHeader.cpp index c48ec7c4d..130612d7c 100644 --- a/opengl/tools/glgen/stubs/gles11/GLES31cHeader.cpp +++ b/opengl/tools/glgen/stubs/gles11/GLES31cHeader.cpp | |||
@@ -16,5 +16,9 @@ | |||
16 | 16 | ||
17 | // This source file is automatically generated | 17 | // This source file is automatically generated |
18 | 18 | ||
19 | #pragma GCC diagnostic ignored "-Wunused-variable" | ||
20 | #pragma GCC diagnostic ignored "-Wunused-but-set-variable" | ||
21 | #pragma GCC diagnostic ignored "-Wunused-function" | ||
22 | |||
19 | #include <stdint.h> | 23 | #include <stdint.h> |
20 | #include <GLES3/gl31.h> | 24 | #include <GLES3/gl31.h> |
diff --git a/opengl/tools/glgen/stubs/gles11/glDrawArraysIndirect.cpp b/opengl/tools/glgen/stubs/gles11/glDrawArraysIndirect.cpp index ce3bc8fac..eda2e46d7 100644 --- a/opengl/tools/glgen/stubs/gles11/glDrawArraysIndirect.cpp +++ b/opengl/tools/glgen/stubs/gles11/glDrawArraysIndirect.cpp | |||
@@ -3,7 +3,7 @@ static void android_glDrawArraysIndirect(JNIEnv *_env, jobject, int mode, jlong | |||
3 | // In OpenGL ES, 'indirect' is a byte offset into a buffer, not a raw pointer. | 3 | // In OpenGL ES, 'indirect' is a byte offset into a buffer, not a raw pointer. |
4 | // GL checks for too-large values. Here we only need to check for successful signed 64-bit | 4 | // GL checks for too-large values. Here we only need to check for successful signed 64-bit |
5 | // to unsigned 32-bit conversion. | 5 | // to unsigned 32-bit conversion. |
6 | if (sizeof(void*) != sizeof(jlong) && indirect > UINTPTR_MAX) { | 6 | if (sizeof(void*) != sizeof(jlong) && indirect > static_cast<jlong>(UINT32_MAX)) { |
7 | jniThrowException(_env, "java/lang/IllegalArgumentException", "indirect offset too large"); | 7 | jniThrowException(_env, "java/lang/IllegalArgumentException", "indirect offset too large"); |
8 | return; | 8 | return; |
9 | } | 9 | } |
diff --git a/opengl/tools/glgen/stubs/gles11/glDrawElementsIndirect.cpp b/opengl/tools/glgen/stubs/gles11/glDrawElementsIndirect.cpp index 1833ee9b9..a091dc994 100644 --- a/opengl/tools/glgen/stubs/gles11/glDrawElementsIndirect.cpp +++ b/opengl/tools/glgen/stubs/gles11/glDrawElementsIndirect.cpp | |||
@@ -3,7 +3,7 @@ static void android_glDrawElementsIndirect(JNIEnv *_env, jobject, jint mode, jin | |||
3 | // In OpenGL ES, 'indirect' is a byte offset into a buffer, not a raw pointer. | 3 | // In OpenGL ES, 'indirect' is a byte offset into a buffer, not a raw pointer. |
4 | // GL checks for too-large values. Here we only need to check for successful signed 64-bit | 4 | // GL checks for too-large values. Here we only need to check for successful signed 64-bit |
5 | // to unsigned 32-bit conversion. | 5 | // to unsigned 32-bit conversion. |
6 | if (sizeof(void*) != sizeof(jlong) && indirect > UINTPTR_MAX) { | 6 | if (sizeof(void*) != sizeof(jlong) && indirect > static_cast<jlong>(UINT32_MAX)) { |
7 | jniThrowException(_env, "java/lang/IllegalArgumentException", "indirect offset too large"); | 7 | jniThrowException(_env, "java/lang/IllegalArgumentException", "indirect offset too large"); |
8 | return; | 8 | return; |
9 | } | 9 | } |
diff --git a/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp b/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp index df11c5342..f5506baf9 100644 --- a/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp +++ b/opengl/tools/glgen/stubs/jsr239/GLCHeader.cpp | |||
@@ -16,6 +16,10 @@ | |||
16 | 16 | ||
17 | // This source file is automatically generated | 17 | // This source file is automatically generated |
18 | 18 | ||
19 | #pragma GCC diagnostic ignored "-Wunused-variable" | ||
20 | #pragma GCC diagnostic ignored "-Wunused-but-set-variable" | ||
21 | #pragma GCC diagnostic ignored "-Wunused-function" | ||
22 | |||
19 | #include "jni.h" | 23 | #include "jni.h" |
20 | #include "JNIHelp.h" | 24 | #include "JNIHelp.h" |
21 | #include <android_runtime/AndroidRuntime.h> | 25 | #include <android_runtime/AndroidRuntime.h> |