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

Commit 5e0cfd48 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

* commit 'accafc69':
  Preserve parameters to getProcAddress functions

Change-Id: I1610c9053c3c710be0914d74b8a5e22c5218f525
parents 19e51855 accafc69

opengl/libs/EGL/getProcAddress.cpp

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

            "ldr   r12, [r12, %[tls]] \n"                       \

            "cmp   r12, #0            \n"                       \

            "cmp   r12, #0            \n"                       \

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

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

            "ldrne r12, [r12]         \n"                       \

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

            "cmpne r12, #0            \n"                       \

            "cmpne r12, #0            \n"                       \

            "bxne  r12                \n"                       \

            "bxne  r12                \n"                       \

            "bx    lr                 \n"                       \

            "bx    lr                 \n"                       \

            :                                                   \

            :                                                   \

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

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

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

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

                                      ext.extensions[_api]))    \

                                      ext.extensions[0])),      \

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

            : "r12"                                             \

            : "r12"                                             \

            );

            );