Elliott Hughes
288870ebc3
Simplify OpenGL TLS access on ARM.
...
bionic now assumes the TLS register is available, so OpenGL can too.
Change-Id: If2b56a4c08de9f887759b78f70022026a181dc47
2013-02-13 17:30:54 -08:00
Jesse Hall
873ab60e94
am 75b83e4d
: Merge "Gfx-3d: fix GetProcAddress in egl extention"
...
# By luliuhui
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '75b83e4dc7d8055a70e590f868f7307fdaf656a7':
Gfx-3d: fix GetProcAddress in egl extention
2013-02-01 12:37:25 -08:00
luliuhui
69d100762c
Gfx-3d: fix GetProcAddress in egl extention
...
This patch can fix issue when Proc address return NULL.
Glbench10, egl-ext and conformance test need this patch to run pass.
Change-Id: I275c7cb6f77cb334c3ee7fa23cd696bba1c5a458
Author: Liuhui Lu <liuhui.lu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 52622
2013-01-22 15:14:34 +08:00
Andy McFadden
db2e4f16bb
am a90173d8
: am 762a6d86
: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
...
* commit 'a90173d86dd209aee55d833c73c424d854a98c70':
DO NOT MERGE - native_fence_sync: fix an enum name
2012-11-27 11:39:20 -08:00
Andy McFadden
762a6d86de
Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
2012-11-27 07:36:50 -08:00
Jamie Gennis
378787cf62
DO NOT MERGE - native_fence_sync: fix an enum name
...
This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum
with "EGL_NO_NATIVE_FENCE_FD_ANDROID".
Bug: http://code.google.com/p/android/issues/detail?id=40295
(cherry-pick from master)
Change-Id: Ie25d4ab9721d8b69b8d4afcf18e902ef8e3ad911
2012-11-26 14:26:31 -08:00
Siva Velusamy
0e34af6284
am c859084c
: am a9a4cd48
: gltrace: Make sure device is debuggable.
...
* commit 'c859084ca303ca1ab69bdc78f864d39c9c81ab0b':
gltrace: Make sure device is debuggable.
2012-11-20 20:01:30 -08:00
Siva Velusamy
a9a4cd4806
gltrace: Make sure device is debuggable.
...
(cherry picked from commit 6482fa4db0
)
Change-Id: I205aabcab1932025c12e7ba3d1b3cf94684f6758
2012-11-20 15:55:35 -08:00
Andrew Hsieh
5e530e02bc
am a151a19d
: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
...
* commit 'a151a19db2fa07295837027fb5d84c02401cc78d':
Fix return type of glGetAttribLocation and glGetUniformLocation
2012-11-06 20:41:34 -08:00
Andrew Hsieh
300ad09822
Fix return type of glGetAttribLocation and glGetUniformLocation
...
from int to GLint.
See:
http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetAttribLocation.xml
http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniformLocation.xml
Change-Id: I4a9f8e9e34b8c3cca239ae84bfe8f3cdfd94802a
2012-11-06 14:39:08 -08:00
Romain Guy
f58475b5ae
am 60393d45
: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
...
* commit '60393d45207b6548e1f61ca104fa59aecee87d30':
Add runtime debugging capabilities to OpenGL
2012-10-18 17:37:54 -07:00
Romain Guy
16928bfeca
Add runtime debugging capabilities to OpenGL
...
The shell property debug.egl.trace can now be set to:
0
disables tracing
1
logs all GL calls
error
checks glGetError after every GL call, logs a stack trace on error
systrace
logs each GL call to systrace
Change-Id: I34a2a2d4e19c373fd9eaa1b0cd93e67c87378996
2012-10-18 16:16:10 -07:00
Romain Guy
23bcd8d298
am 825a9a2d
: Merge "Update comments to reflect what the code actually does" into jb-mr1-dev
...
* commit '825a9a2dcd1b3e139dd0677ff46f966fb23f963c':
Update comments to reflect what the code actually does
2012-10-16 09:47:38 -07:00
Romain Guy
49fe8addbf
am b96fe085
: Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev
...
* commit 'b96fe08540dcf7e90be56919ea9863f687da779c':
Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
2012-10-15 20:19:18 -07:00
Romain Guy
be3c3e4eca
Update comments to reflect what the code actually does
...
Change-Id: I2613aa32c29eddc52a00090656c1bd11f9f5732b
2012-10-15 19:25:18 -07:00
Romain Guy
1cffc80f97
Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
...
Change-Id: I53ac91a9ce07b5dd5f2ee0e3cc5b65b6402f9229
2012-10-15 18:13:05 -07:00
Chet Haase
8b75830c5c
am 8d5d2019
: Revert "Add GL Error logs (temporary)"
...
* commit '8d5d2019805df1f27cbec07eeca47dd5ab453dad':
Revert "Add GL Error logs (temporary)"
2012-10-10 13:21:39 -07:00
Chet Haase
8d5d201980
Revert "Add GL Error logs (temporary)"
...
This reverts commit 2da2c15068
.
2012-10-10 13:10:40 -07:00
Jean-Baptiste Queru
76942a4974
Merge "egl: Reintroduce eglGetRenderBufferANDROID"
2012-10-05 13:14:29 -07:00
Chet Haase
9c58d96f00
am 27b28fd9
: Merge "Add GL Error logs (temporary)" into jb-mr1-dev
...
* commit '27b28fd9960b73a1f13e22dd6655f75e2e76eef7':
Add GL Error logs (temporary)
2012-10-04 19:48:12 -07:00
Chet Haase
2da2c15068
Add GL Error logs (temporary)
...
Adding logs to tell which specific methods throw OpenGL errors.
Change-Id: I1d73c7566ed1ea6610392020411762c6255a0ede
2012-10-04 17:15:59 -07:00
Chet Haase
bba6bb8137
am 4c273277
: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev
...
* commit '4c2732779a11c92222958e7150162d4eaaab7b66':
Re-enable FAST_TLS in gl2 code
2012-09-28 12:41:24 -07:00
Chet Haase
e8b0fac720
Re-enable FAST_TLS in gl2 code
...
Temporarily changed USE_FAST_TLS_KEY ifdef during debugging. Changing it
back now.
Change-Id: I7c2fcf7265b3d545e31ff7683bd7614100fad3e5
2012-09-28 11:56:48 -07:00
Romain Guy
e1549fcb44
am cb094a78
: Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815 " into jb-mr1-dev
...
* commit 'cb094a783f14daae3378ac8aa7dc509980f037b2':
New compile-time flags to make debugging easier for us poor souls Bug #7195815
2012-09-27 16:05:31 -07:00
Romain Guy
f12fe43e8c
New compile-time flags to make debugging easier for us poor souls
...
Bug #7195815
Change-Id: I23e7ac991891b9586cb8ed20b1305c8b1b3e2b43
2012-09-27 15:47:10 -07:00
Mathias Agopian
2ac4194854
am 1e83690c
: Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev
...
* commit '1e83690c6030b33c7776fa65cb57132d5e2d0b40':
assert -eng builds when calling a GL function without a context
2012-09-26 18:50:13 -07:00
Mathias Agopian
455e360149
assert -eng builds when calling a GL function without a context
...
Bug: 7241626
Change-Id: I0f1f9361e75e9186af8cff8d98a7d2224b266765
2012-09-26 17:37:53 -07:00
Jamie Gennis
483ab74243
am 2f45d746
: Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev
...
* commit '2f45d7464a55d7a91da6fcd6f8cf1b11e395d029':
EGL: add the EGL_ANDROID_framebuffer_target enum
2012-09-24 18:23:05 -07:00
Jamie Gennis
ca5f79c2bb
am 363847d4
: Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev
...
* commit '363847d498bffe0e2d8e7b8aba693bb402513413':
EGL: expose the EXT_create_context_robustness ext
2012-09-24 18:23:04 -07:00
Jamie Gennis
2f45d7464a
Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev
2012-09-24 18:21:14 -07:00
Jamie Gennis
363847d498
Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev
2012-09-24 18:20:51 -07:00
Mathias Agopian
0d45d71197
am 500407a2
: log an error when eglCreateContext() fails in an inconsistant way
...
* commit '500407a2c07ced40c36e7356574a47bcec9c2fd9':
log an error when eglCreateContext() fails in an inconsistant way
2012-09-24 18:09:21 -07:00
Mathias Agopian
500407a2c0
log an error when eglCreateContext() fails in an inconsistant way
...
this will help debugging bug: 7216919
Change-Id: I54ac65f20c5ed55cc93a5cbc5350fadfb0fcb804
2012-09-24 17:57:48 -07:00
Mathias Agopian
81b316aa53
am 98838aa0
: am 77af25b6
: Merge "Return back-end result from eglDestroyImageKHR"
...
* commit '98838aa0836518b7397cbfe763f34305e3387a5f':
Return back-end result from eglDestroyImageKHR
2012-09-24 15:43:54 -07:00
Mathias Agopian
77af25b6dd
Merge "Return back-end result from eglDestroyImageKHR"
2012-09-24 14:56:03 -07:00
Jamie Gennis
3ff48e5e69
EGL: add the EGL_ANDROID_framebuffer_target enum
...
Change-Id: Id8b1b114e2a7a88956b857c63a0429e9b33fdb5c
2012-09-24 13:45:33 -07:00
Jamie Gennis
09b11432b6
EGL: expose the EXT_create_context_robustness ext
...
Change-Id: I1db43e96aa5e9e91a6176a4a3e5aa9d1f3ee4a7e
2012-09-24 13:45:32 -07:00
Jamie Gennis
aaf421c465
Add a spec for EGL_ANDROID_framebuffer_target.
...
This change adds a new extension for EGL implementations to indicate the
EGLConfigs that support use as a HWComposer framebuffer target layer.
Change-Id: Ia7c8fbe8da09d57b4ec8bf1d9ddb67ca21aa2885
2012-09-21 12:15:22 -07:00
Mathias Agopian
2a60824abc
am 516efc1b
: am 8a2b5423
: Merge "libagl: Transform the vertex if using eye space lighting with point lights"
...
* commit '516efc1bea1c05492c5d4636a589cfc686661842':
libagl: Transform the vertex if using eye space lighting with point lights
2012-09-19 22:05:14 -07:00
Mathias Agopian
8a2b54235a
Merge "libagl: Transform the vertex if using eye space lighting with point lights"
2012-09-19 19:31:53 -07:00
Jamie Gennis
a08cf6e3a4
EGL: fix an extension string bug
...
This change fixes a bug where initializing EGL multiple times (eglTerminate
followed by eglInitialize) would cause extensions to show up in the extension
string multiple times.
Change-Id: I707a3da62ed30ef13835087167f84a08bc6addd7
2012-09-17 17:23:29 -07:00
Steven Holte
646a5c593f
Return back-end result from eglDestroyImageKHR
...
Change-Id: I0e972b778f9802c28f52092bb9af087285833e0b
2012-09-12 15:14:55 -07:00
Jamie Gennis
f478e6d18c
EGL: make max cache key size BoardConfig-able
...
This change makes the maximum EGL blob cache key size configurable via a
BoardConfig.
Change-Id: Ic669cd25fc743662bd4f13aab62354fc3d54560c
2012-09-12 11:59:24 -07:00
Jamie Gennis
010dd4fb89
EGL: Add the EGL_ANDROID_wait_sync extension
...
Change-Id: Ie9a78e07fcaf27c5c13797141ad3c692217607fb
2012-09-09 17:52:18 -07:00
Jamie Gennis
331841b96b
EGL: add the native_fence_sync extension
...
This change adds support for the EGL_ANDROID_native_fence_sync extension to the
Android EGL layer. It also fixes a couple minor issues with the extension spec.
Change-Id: Ic8829d21f37b701f33aa9c72c3d25e88e03fa3cd
2012-09-06 16:11:37 -07:00
Jamie Gennis
8893d5bba1
EGL_ANDROID_native_fence_sync: fix the version
...
Change-Id: Ib43b8fec8f37bb847d7bcdbf7607fd56f19a0563
2012-09-05 19:46:34 -07:00
Jamie Gennis
a1d49ce1f1
EGL_ANDROID_fence_sync: make it more generic
...
This change updates the extension spec to refer to generic "native fence sync
objects" rather than "Android fence sync objects."
Change-Id: I15a79f08571586431845b54c58c8420b652f40ef
2012-09-04 19:49:51 -07:00
Bjorn Andersson
f9752cc4cf
egl: Reintroduce eglGetRenderBufferANDROID
...
eglGetRenderBufferANDROID was removed as it had no users. This commit
reintroduces this extensions as it's used by Qualcomm graphics HAL.
Change-Id: I493306830a0d4f8722a42bcc84fb49236afdabeb
2012-08-27 18:38:35 -07:00
Jean-Baptiste Queru
0adc8f2600
am 6e820eec
: am 6f89ebde
: Merge "EGL: do not use sparse files for shader"
...
* commit '6e820eec21917f8e25c40dbc8b972468535af0e8':
EGL: do not use sparse files for shader
2012-08-20 09:42:32 -07:00
Siva Velusamy
ad9693f4f0
gltrace: flush trace buffer on createContext & makeCurrent
...
Certain apps (e.g. chrome) seem to create contexts which are unused
for long periods of time. If tracing is stopped before those contexts
are used, then the debugger never gets to know that these contexts
were created. Flushing the trace after these calls ensures that
the debugger knows about all created/used contexts.
Change-Id: I01baa11aa56ac89eddce3c2851e4bf01076984d1
2012-08-16 14:41:20 -07:00