diff options
author | Jesse Hall <jessehall@google.com> | 2014-11-12 17:21:26 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-12 17:21:27 +0000 |
commit | 7b3fd29037bc12c2691e06334bf51171853aa8f3 (patch) | |
tree | ef2492e9cff39c907a808db7e8d7d9c1010ad6a5 /opengl | |
parent | c6f93a43d636b0ad16b75adf664c6a33d30b39dd (diff) | |
parent | 701048cbe8d35fcd7e00c875e128fae022b27607 (diff) | |
download | frameworks_native-7b3fd29037bc12c2691e06334bf51171853aa8f3.zip frameworks_native-7b3fd29037bc12c2691e06334bf51171853aa8f3.tar.gz frameworks_native-7b3fd29037bc12c2691e06334bf51171853aa8f3.tar.bz2 |
Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag"
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/libs/EGL/getProcAddress.cpp | 4 | ||||
-rw-r--r-- | opengl/libs/GLES2/gl2.cpp | 4 | ||||
-rw-r--r-- | opengl/libs/GLES_CM/gl.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/opengl/libs/EGL/getProcAddress.cpp b/opengl/libs/EGL/getProcAddress.cpp index fc61134..dcac2b2 100644 --- a/opengl/libs/EGL/getProcAddress.cpp +++ b/opengl/libs/EGL/getProcAddress.cpp @@ -78,7 +78,7 @@ namespace android { #elif defined(__i386__) - #define API_ENTRY(_api) __attribute__((noinline)) _api + #define API_ENTRY(_api) __attribute__((noinline,optimize("omit-frame-pointer"))) _api #define CALL_GL_EXTENSION_API(_api) \ register void** fn; \ @@ -100,7 +100,7 @@ namespace android { #elif defined(__x86_64__) - #define API_ENTRY(_api) __attribute__((noinline)) _api + #define API_ENTRY(_api) __attribute__((noinline,optimize("omit-frame-pointer"))) _api #define CALL_GL_EXTENSION_API(_api) \ register void** fn; \ diff --git a/opengl/libs/GLES2/gl2.cpp b/opengl/libs/GLES2/gl2.cpp index 0157bfe..0fb8965 100644 --- a/opengl/libs/GLES2/gl2.cpp +++ b/opengl/libs/GLES2/gl2.cpp @@ -82,7 +82,7 @@ using namespace android; #elif defined(__i386__) - #define API_ENTRY(_api) __attribute__((noinline)) _api + #define API_ENTRY(_api) __attribute__((noinline,optimize("omit-frame-pointer"))) _api #define CALL_GL_API(_api, ...) \ register void** fn; \ @@ -101,7 +101,7 @@ using namespace android; #elif defined(__x86_64__) - #define API_ENTRY(_api) __attribute__((noinline)) _api + #define API_ENTRY(_api) __attribute__((noinline,optimize("omit-frame-pointer"))) _api #define CALL_GL_API(_api, ...) \ register void** fn; \ diff --git a/opengl/libs/GLES_CM/gl.cpp b/opengl/libs/GLES_CM/gl.cpp index f05983c..7896a6f 100644 --- a/opengl/libs/GLES_CM/gl.cpp +++ b/opengl/libs/GLES_CM/gl.cpp @@ -138,7 +138,7 @@ GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type, #elif defined(__i386__) - #define API_ENTRY(_api) __attribute__((noinline)) _api + #define API_ENTRY(_api) __attribute__((noinline,optimize("omit-frame-pointer"))) _api #define CALL_GL_API(_api, ...) \ register void* fn; \ @@ -157,7 +157,7 @@ GL_API void GL_APIENTRY glWeightPointerOESBounds(GLint size, GLenum type, #elif defined(__x86_64__) - #define API_ENTRY(_api) __attribute__((noinline)) _api + #define API_ENTRY(_api) __attribute__((noinline,optimize("omit-frame-pointer"))) _api #define CALL_GL_API(_api, ...) \ register void** fn; \ |