Ben Cheng
20b9749959
Disable ld --fatal-warnings because of using mktemp.
...
Change-Id: Id18b1e38672294b025bc26adb38aed0ac3e0fb45
2012-11-06 23:11:35 -08:00
Andrew Hsieh
16ac25b73a
am 168dfe71
: am 5e530e02
: am a151a19d
: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
...
* commit '168dfe71bfafebaa26b6f75df553f5fad7607669':
Fix return type of glGetAttribLocation and glGetUniformLocation
2012-11-06 20:46:17 -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
d991b40739
am f58475b5
: am 60393d45
: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
...
* commit 'f58475b5ae4ccb3a31c05c79da8b2914c62a3510':
Add runtime debugging capabilities to OpenGL
2012-10-18 17:39:13 -07: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
4d0aec67c4
am 23bcd8d2
: am 825a9a2d
: Merge "Update comments to reflect what the code actually does" into jb-mr1-dev
...
* commit '23bcd8d298597659622919027c9ea921d5eed513':
Update comments to reflect what the code actually does
2012-10-16 09:50:35 -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
1ba2f61d75
am 49fe8add
: am b96fe085
: Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev
...
* commit '49fe8addbfe52bf9a3e69e6250e462a70332235c':
Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
2012-10-15 20:26:14 -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
Siva Velusamy
c6e8452320
Merge "gltrace: Do not start gltrace from early_egl_init."
2012-10-10 14:02:55 -07:00
Chet Haase
8420c5fbe8
am 8b75830c
: am 8d5d2019
: Revert "Add GL Error logs (temporary)"
...
* commit '8b75830c5ce5e0097909c11c559d50d7f6f7303b':
Revert "Add GL Error logs (temporary)"
2012-10-10 13:22:55 -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
Siva Velusamy
2e080904ab
gltrace: Do not start gltrace from early_egl_init.
...
The debugging and tracing levels are initialized both during
early_egl_init and egl_display_t::initialize(). For apps this has
no effect since early_egl_init is called in the context of zygote.
This CL removes the unnecessary call from early_egl_init.
Change-Id: Ibc55c26228cd197f2e2623fbfb2d1a63d0722401
2012-10-10 10:35:41 -07:00
Jean-Baptiste Queru
76942a4974
Merge "egl: Reintroduce eglGetRenderBufferANDROID"
2012-10-05 13:14:29 -07:00
Chet Haase
b39844e251
am 9c58d96f
: am 27b28fd9
: Merge "Add GL Error logs (temporary)" into jb-mr1-dev
...
* commit '9c58d96f0079e627004c606436df27fa97ff4c8e':
Add GL Error logs (temporary)
2012-10-04 20:34:36 -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
Siva Velusamy
090503a01c
gltrace: Fix NPE
...
Change-Id: Id7af9cd388f3508201f96a0624966c2ce01b4da5
2012-10-01 14:30:48 -07:00
Chet Haase
4cb9e0062e
am bba6bb81
: am 4c273277
: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev
...
* commit 'bba6bb81373b285b456bb851d37f7f2ecfc742ad':
Re-enable FAST_TLS in gl2 code
2012-09-28 12:42:21 -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
f51c798c03
am e1549fcb
: am cb094a78
: Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815 " into jb-mr1-dev
...
* commit 'e1549fcb4493fe84deb488d85fc626d635153eb8':
New compile-time flags to make debugging easier for us poor souls Bug #7195815
2012-09-28 00:35:10 -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
b428bf60a3
am 2ac41948
: am 1e83690c
: Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev
...
* commit '2ac4194854a70c6e319b1b3b647344e595082b38':
assert -eng builds when calling a GL function without a context
2012-09-26 18:51:49 -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
651d23e6f7
am 483ab742
: am 2f45d746
: Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev
...
* commit '483ab74243870e6af4b8a947873556ff86d076c0':
EGL: add the EGL_ANDROID_framebuffer_target enum
2012-09-24 18:25:05 -07:00
Jamie Gennis
f48bec48ea
am ca5f79c2
: am 363847d4
: Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev
...
* commit 'ca5f79c2bb6c2e3995d9e2427f2600d1b03a84c4':
EGL: expose the EXT_create_context_robustness ext
2012-09-24 18:25:04 -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
73d2a39400
am 0d45d711
: am 500407a2
: log an error when eglCreateContext() fails in an inconsistant way
...
* commit '0d45d711976bdca1165536b8948680680d38eb6a':
log an error when eglCreateContext() fails in an inconsistant way
2012-09-24 18:11:07 -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
68872cac38
am 81b316aa
: am 98838aa0
: am 77af25b6
: Merge "Return back-end result from eglDestroyImageKHR"
...
* commit '81b316aa5395b6318ad4a10e1ed27d0b9b0df07f':
Return back-end result from eglDestroyImageKHR
2012-09-24 15:45:56 -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
6a2f058458
am 849df8cd
: am e0606e29
: Merge "Add a spec for EGL_ANDROID_framebuffer_target." into jb-mr1-dev
...
* commit '849df8cd6baa26ef431404d1b1eea1e141eb5030':
Add a spec for EGL_ANDROID_framebuffer_target.
2012-09-24 00:48:43 -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
991c18586a
am 278b3016
: am 2a60824a
: am 516efc1b
: am 8a2b5423
: Merge "libagl: Transform the vertex if using eye space lighting with point lights"
...
* commit '278b301690d5428e4ec97ac8cf2d9bfb8f901f0b':
libagl: Transform the vertex if using eye space lighting with point lights
2012-09-20 09:29:13 -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