commit 722d6d7193cc013c48e3e38b990f9515b7e92a0e
author Mike Stroyan <stroyan@google.com> Wed May 18 18:18:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 18 18:18:29 2016 +0000
tree 79ec8600fd04a1851f632491e0d4514e913658e8
parent d3e7cc010b361958a14f007d7ea23a892fd05df2
parent accafc69f50aeeb57615e14ff0b787ea322a0627

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

* commit 'accafc69f50aeeb57615e14ff0b787ea322a0627':
  Preserve parameters to getProcAddress functions

Change-Id: I7a7cbf4bcdef8d11cac0269600ff1e59076b26fe

opengl/libs/EGL/getProcAddress.cpp

diff --git a/opengl/libs/EGL/getProcAddress.cpp b/opengl/libs/EGL/getProcAddress.cpp
index bdfd21c..336c264 100644
--- a/opengl/libs/EGL/getProcAddress.cpp
+++ b/opengl/libs/EGL/getProcAddress.cpp
@@ -46,14 +46,15 @@
             "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"                                             \
             );