Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b93c2b9 authored by Jesse Hall's avatar Jesse Hall Committed by Android Git Automerger
Browse files

am 7b3fd290: Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag" 

* commit '7b3fd290':
  EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag
parents ba2e1a33 7b3fd290

opengl/libs/EGL/getProcAddress.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;                                    \

opengl/libs/GLES2/gl2.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;                                        \

opengl/libs/GLES_CM/gl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;                                        \