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

Commit fbae0fd1 authored by Mike Stroyan's avatar Mike Stroyan Committed by android-build-merger
Browse files

Merge "Preserve parameters to getProcAddress functions" into nyc-dev am: accafc69 

am: 722d6d71

* commit '722d6d71':
  Preserve parameters to getProcAddress functions

Change-Id: I7da8b13869e5cc87c57665f5527516e58e53e14b
parents e88a886d 722d6d71

opengl/libs/EGL/getProcAddress.cpp

+4 −3
Original line number Diff line number Diff line
@@ -46,14 +46,15 @@ namespace android { 
            "ldr   r12, [r12, %[tls]] \n"                       \

            "cmp   r12, #0            \n"                       \

            "addne r12, %[api]        \n"                       \

            "ldrne r12, [r12]         \n"                       \

            "ldrne r12, [r12, %[ext]] \n"                       \

            "cmpne r12, #0            \n"                       \

            "bxne  r12                \n"                       \

            "bx    lr                 \n"                       \

            :                                                   \

            : [tls] "J"(TLS_SLOT_OPENGL_API*4),                 \

              [api] "r"(__builtin_offsetof(gl_hooks_t,          \

                                      ext.extensions[_api]))    \

              [ext] "J"(__builtin_offsetof(gl_hooks_t,          \

                                      ext.extensions[0])),      \

              [api] "J"(_api*sizeof(void*))                     \

            : "r12"                                             \

            );