ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,349 Commits 2 Branches 0 Tags 54 MiB
4811e68b2f
Commit Graph

500 Commits

Author SHA1 Message Date
Jim Shuma
257d2bbcbf Initial checkin of a framerate test app 
Measures the time to do nothing but clear the screen in an
OpenGL Java app. Spews frame time statistics to the log.

Control long frame time by setting debug.longframe_ms;
e.g., adb shell setprop debug.longframe_ms 33

Change-Id: I435a3cb170048349e00417c44db42121c68744b2
 2010-09-28 14:59:20 -07:00
Mathias Agopian
30faafb7d3 am 4eb1ad5e: am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread 
Merge commit '4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e'

* commit '4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e':
  better fix for [3028370] GL get error should return a valid error if no context is bound.
 2010-09-23 21:41:30 -07:00
Mathias Agopian
303f3eb352 am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread 
Merge commit '524a6d8e9bb4df9cec0520ac1d9733642b13e76f' into gingerbread-plus-aosp

* commit '524a6d8e9bb4df9cec0520ac1d9733642b13e76f':
  better fix for [3028370] GL get error should return a valid error if no context is bound.
 2010-09-23 18:17:08 -07:00
Mathias Agopian
6f0871222f better fix for [3028370] GL get error should return a valid error if no context is bound. 
it turns out that we cannot return INVALID_OPERATION from glGetError() because the
GL spec says that it must be called in a loop until it returns GL_NO_ERROR.

now, we always return 0 from GL functions called from a thread with no
context bound. This means that glGetError() will return NO_ERROR in this case,
which is better than returning a random value (which could trap the app in a loop).

if this happens in the main thread of a process, we LOG an error message once.

Change-Id: Id59620e675a890286ef62a257c02b06e0fdcaf69
 2010-09-23 16:44:48 -07:00
Mathias Agopian
aa22d20554 am 9c4d7d67: am 5c6c5c7a: fix [3028370] GL get error should return a valid error if no context is bound. 
Merge commit '9c4d7d677097981a349c718902e29050dad3d59f'

* commit '9c4d7d677097981a349c718902e29050dad3d59f':
  fix [3028370] GL get error should return a valid error if no context is bound.
 2010-09-23 13:28:47 -07:00
Mathias Agopian
6ee79cfa2f am 5c6c5c7a: fix [3028370] GL get error should return a valid error if no context is bound. 
Merge commit '5c6c5c7a43d44316395f5c35ab713372124b8b4c' into gingerbread-plus-aosp

* commit '5c6c5c7a43d44316395f5c35ab713372124b8b4c':
  fix [3028370] GL get error should return a valid error if no context is bound.
 2010-09-23 13:24:11 -07:00
Mathias Agopian
05c53113e0 fix [3028370] GL get error should return a valid error if no context is bound. 
glGetError() will now always return GL_INVALID_OPERATION if called from a thread
with no GL context bound.

Change-Id: I28ba458871db051bb4f5a26668a1fa123526869c
 2010-09-23 13:19:02 -07:00
Mathias Agopian
cd2c51cf45 am d01ce192: am 9d5fac51: Merge "fix small bug in EGL error management" into gingerbread 
Merge commit 'd01ce1924a51539c4d47ef1f55913bdf1a018124'

* commit 'd01ce1924a51539c4d47ef1f55913bdf1a018124':
  fix small bug in EGL error management
 2010-09-22 14:41:45 -07:00
Mathias Agopian
d7a0841a19 am 9d5fac51: Merge "fix small bug in EGL error management" into gingerbread 
Merge commit '9d5fac517463526450268bf6353e32c13a8cdd0c' into gingerbread-plus-aosp

* commit '9d5fac517463526450268bf6353e32c13a8cdd0c':
  fix small bug in EGL error management
 2010-09-22 14:21:01 -07:00
Mathias Agopian
f3c24f8703 Merge "fix typo EGL_NO_IMAGE_KHR -> EGL_NO_SYNC_KHR" 2010-09-22 14:15:15 -07:00
Jack Palevich
d7a4f91401 Add simple interactive end-to-end latency test. 
Change-Id: I4c2f2acf797a3a753f8a6061db3d2bcdc7d642f0
 2010-09-22 12:13:02 -07:00
Mathias Agopian
a93b957e8e fix typo EGL_NO_IMAGE_KHR -> EGL_NO_SYNC_KHR 
Change-Id: I38c87803e32030918f2deb06381eabce0faa870c
 2010-09-21 16:22:10 -07:00
Mathias Agopian
02dafb5068 fix small bug in EGL error management 
make sure to clear our EGL implementation's error when returning
an error from an underlying implementation

Change-Id: Ibce4726cef1f900e4c7f16002345d7a07f8cdf41
 2010-09-21 15:43:59 -07:00
Brian Swetland
04b9ff8e26 am 5c746522: am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread 
Merge commit '5c7465220d52c64c87fe4566fe109c649ec5c4f7'

* commit '5c7465220d52c64c87fe4566fe109c649ec5c4f7':
  support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
 2010-09-20 19:32:01 -07:00
Brian Swetland
d77cec91b0 am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread 
Merge commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760' into gingerbread-plus-aosp

* commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760':
  support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
 2010-09-20 14:08:46 -07:00
Brian Swetland
2b9e4f6a24 support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl 
Change-Id: Idd9ca85ce3ba6c92234375071b53e5365e689062
 2010-09-20 12:58:15 -07:00
Mathias Agopian
fe0a0af7bd am 793b2293: am 1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" into gingerbread 
Merge commit '793b2293797ea930078640c4827d3cbdf449c227'

* commit '793b2293797ea930078640c4827d3cbdf449c227':
  surfaceflinger / GL extensions cleanup
 2010-09-16 18:26:19 -07:00
Mathias Agopian
c05246ae34 am 1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" into gingerbread 
Merge commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69' into gingerbread-plus-aosp

* commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69':
  surfaceflinger / GL extensions cleanup
 2010-09-16 17:57:34 -07:00
Michael I. Gold
7f198b6bff surfaceflinger / GL extensions cleanup 
Add correct enumerants for OES_EGL_image_external to glext.h.
SurfaceFlinger now checks for the correct extension name.

Change-Id: I2ba2728a01fa2260bd086d2df4316c68f694a9b1
 2010-09-15 17:15:31 -07:00
Mathias Agopian
c291f58585 Add support for KHR_fence_sync 
Change-Id: Ie2771b5869c9c8dcf5ecf9318e2ee6d4d1cd5cc9
 2010-09-10 14:01:45 -07:00
Jason Sams
9e14a3404b Merge "Rework gl perf test to focus on important use cases." 2010-09-09 14:51:56 -07:00
Mathias Agopian
0b30bf5782 am 45bd9946: am fec5d38b: Merge "option to enable multisampling" into gingerbread 
Merge commit '45bd99466ce9962778eacaefff1c0a44bb268f0c'

* commit '45bd99466ce9962778eacaefff1c0a44bb268f0c':
  option to enable multisampling
 2010-09-09 14:23:09 -07:00
Mathias Agopian
acd8fd0493 am a9ff29b5: am 6808e6a8: Merge "Fix a few typos in EGL wrapper" into gingerbread 
Merge commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0'

* commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0':
  Fix a few typos in EGL wrapper
 2010-09-09 14:21:55 -07:00
Mathias Agopian
bae7b39496 am fec5d38b: Merge "option to enable multisampling" into gingerbread 
Merge commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2' into gingerbread-plus-aosp

* commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2':
  option to enable multisampling
 2010-09-09 11:58:14 -07:00
Mathias Agopian
8296221138 option to enable multisampling 
multisampling can be enabled by specifying the number of
samples desired on the command line.

Change-Id: I5f93c93ae7ada54bcd646c1065e07890d0cb9808
 2010-09-09 11:53:17 -07:00
Mathias Agopian
358fea99da am 6808e6a8: Merge "Fix a few typos in EGL wrapper" into gingerbread 
Merge commit '6808e6a867ba0b32f8bd97163e134c2866423f01' into gingerbread-plus-aosp

* commit '6808e6a867ba0b32f8bd97163e134c2866423f01':
  Fix a few typos in EGL wrapper
 2010-09-09 11:23:16 -07:00
Mathias Agopian
e7bca18f79 Merge "Fix a few typos in EGL wrapper" into gingerbread 2010-09-09 11:20:02 -07:00
Mathias Agopian
77fbf8ddd9 Fix a few typos in EGL wrapper 
Change-Id: I3b815ca6ec334ca12088f9721eece33df42b2e46
 2010-09-09 11:12:54 -07:00
Mathias Agopian
e3372bd6f0 am 099aa9a1: am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread 
Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24'

* commit '099aa9a1b4eaf6536decbcafac43476c4908ef24':
  add a fps counter to sanangeles demo
 2010-09-08 19:04:07 -07:00
Mathias Agopian
7d1588e4e3 am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread 
Merge commit 'edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp

* commit 'edbb8083a815e9d911f8e659fc5c293543fdf502':
  add a fps counter to sanangeles demo
 2010-09-08 19:01:37 -07:00
Mathias Agopian
879ba138fc add a fps counter to sanangeles demo 
Change-Id: I9a9473ce213301cc7661fddfb1ef5a6ffcb346d4
 2010-09-08 18:55:42 -07:00
Jason Sams
74b28e45c3 Rework gl perf test to focus on important use cases. 
Change-Id: I82825dbe3b24a520b79f6b05d01f37e1b5008b62
 2010-09-08 15:48:53 -07:00
Mathias Agopian
8e4b5a3e6a Add KHR_gl_texture_2D_image extension string. 2010-08-27 16:08:03 -07:00
Mathias Agopian
27e2fac337 cleanup EGL a bit. remove unused extension. 
Change-Id: I7758bc7d6dc2e70fc3590fe939ebf71fbcde7059
 2010-08-27 15:30:16 -07:00
Mathias Agopian
1bd3674343 am ff3dcf27: Merge "cleanup EGL a bit. remove unused extension." into gingerbread 
Merge commit 'ff3dcf27be2bbb259b7605396d36e50ade35266f' into gingerbread-plus-aosp

* commit 'ff3dcf27be2bbb259b7605396d36e50ade35266f':
  cleanup EGL a bit. remove unused extension.
 2010-08-27 14:17:00 -07:00
Mathias Agopian
10cab190ba cleanup EGL a bit. remove unused extension. 
Change-Id: Ia87120b076ab1bf7b28f06087878d8161fb46c88
 2010-08-27 13:17:32 -07:00
Mathias Agopian
d56f54b269 am b3aaf3ba: am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread 
Merge commit 'b3aaf3baa7fd811af19835bbc8837a88984c160a'

* commit 'b3aaf3baa7fd811af19835bbc8837a88984c160a':
  fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
 2010-08-21 09:42:53 -07:00
Mathias Agopian
c3fb41b1db am 43647129: am 17da0663: Merge "fix [2931161] crash in labyritnth when completing a level" into gingerbread 
Merge commit '43647129d676e8c802850ca493f2ebc6064a4a1a'

* commit '43647129d676e8c802850ca493f2ebc6064a4a1a':
  fix [2931161] crash in labyritnth when completing a level
 2010-08-21 09:34:22 -07:00
Mathias Agopian
8807ecb3c1 am bccfcd95: Merge "fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used." into gingerbread 
Merge commit 'bccfcd95d3cc4029c1ed8514d31436a857283873' into gingerbread-plus-aosp

* commit 'bccfcd95d3cc4029c1ed8514d31436a857283873':
  fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
 2010-08-19 11:46:43 -07:00
Mathias Agopian
e3586182ec fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used. 
a typo prevented the last 2 vertices of a batch to be copied to the front of
the next batch. Instead, the 2 very first vertices were used.

Change-Id: I3c344784dac1cef64df2fb6f6efb2f901cc788db
 2010-08-18 20:07:25 -07:00
Mathias Agopian
1071c20143 am 17da0663: Merge "fix [2931161] crash in labyritnth when completing a level" into gingerbread 
Merge commit '17da06631041f9f2237738fb673a74a85b1d9cf4' into gingerbread-plus-aosp

* commit '17da06631041f9f2237738fb673a74a85b1d9cf4':
  fix [2931161] crash in labyritnth when completing a level
 2010-08-18 16:34:40 -07:00
Mathias Agopian
031213e5b3 fix [2931161] crash in labyritnth when completing a level 
Change-Id: I821d67effaf73d7008b2828d06f5489d1f976a1e
 2010-08-18 16:07:34 -07:00
Romain Guy
62d59ed785 am a4ed1c67: am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread 
Merge commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac'

* commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac':
  fix [2912927] Can't get NV_draw_path extension to work
 2010-08-16 07:49:24 -07:00
Romain Guy
5e1bf8d4fa am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread 
Merge commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661' into gingerbread-plus-aosp

* commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661':
  fix [2912927] Can't get NV_draw_path extension to work
 2010-08-13 14:27:36 -07:00
Mathias Agopian
4a88b52235 fix [2912927] Can't get NV_draw_path extension to work 
there was a problem with eglGetProcAddress() which would only work with
GLES 1.x contexts.

Change-Id: I4747671cbf7ed469bb471a377f1d6f36550d24df
 2010-08-13 14:17:58 -07:00
Mathias Agopian
5d708a5916 am 553a333d: am 603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread 
Merge commit '553a333d4446bb34330da92f02daa515dc597939'

* commit '553a333d4446bb34330da92f02daa515dc597939':
  improve a bit the implementation of eglGetProcAddress
 2010-08-10 13:55:34 -07:00
Mathias Agopian
14a4443344 am 603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread 
Merge commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf' into gingerbread-plus-aosp

* commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf':
  improve a bit the implementation of eglGetProcAddress
 2010-08-10 13:52:58 -07:00
Romain Guy
761eaed2ff Fix tons of bugs and add new text rendering support. 
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
 2010-08-10 12:22:01 -07:00
Mathias Agopian
7f781d1552 improve a bit the implementation of eglGetProcAddress 
Change-Id: Ie07f33ae2162830df1e4f3d3b5e00fcfb8c350d6
 2010-08-09 18:35:43 -07:00
Mathias Agopian
ff1448b53f am d12a98e2: am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread 
Merge commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb'

* commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb':
  fix [2421247] implement eglGetProcAddress(), needed in the ndk
 2010-08-04 11:12:25 -07:00
Mathias Agopian
574a26fa52 am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread 
Merge commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f' into gingerbread-plus-aosp

* commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f':
  fix [2421247] implement eglGetProcAddress(), needed in the ndk
 2010-08-03 11:30:42 -07:00
Mathias Agopian
24035338ed fix [2421247] implement eglGetProcAddress(), needed in the ndk 
Change-Id: I5027a27b43c0dd449a404024087853ca05bb8e4e
 2010-08-02 18:23:36 -07:00
Mathias Agopian
90f7672a6f am 67e4ff76: am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread 
Merge commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec'

* commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec':
  remove copybit hack from software opengl (libagl)
 2010-07-31 12:19:26 -07:00
Mathias Agopian
d7beac601a am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread 
Merge commit '4d7fc3651bd93d588d2b8580010414b59bc67729' into gingerbread-plus-aosp

* commit '4d7fc3651bd93d588d2b8580010414b59bc67729':
  remove copybit hack from software opengl (libagl)
 2010-07-30 18:03:17 -07:00
Mathias Agopian
bb0628d9de remove copybit hack from software opengl (libagl) 
h/w acceleration is not supported through software gl + copybit anylonger,
instead, h/w opengl must be used. in the system compositor, a new h/w
composition api will be introduced to allow h/w accelerated composition with
overlays and/or 2D blocks.

Change-Id: I04949cb074ba8c4d637319ace23497c16a58d5bf
 2010-07-29 23:28:03 -07:00
Mathias Agopian
bcfcddf94a am eb248a58: am 55a76dd8: Merge "fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread 
Merge commit 'eb248a58fabac31873982e4f389ba81981f4041f'

* commit 'eb248a58fabac31873982e4f389ba81981f4041f':
  fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
 2010-07-29 22:25:15 -07:00
Mathias Agopian
31fc9fd037 am 55a76dd8: Merge "fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread 
Merge commit '55a76dd8d9996c1e93762d7611789aea696d536c' into gingerbread-plus-aosp

* commit '55a76dd8d9996c1e93762d7611789aea696d536c':
  fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
 2010-07-29 20:54:12 -07:00
Mathias Agopian
cee79391c8 fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface(). 
rework how our EGL wrapper manages EGLConfig:

- we now store the EGLConfig with the EGLSurface and EGLContext
  so that we can have easy access to it from eglQueryContext
  and eglQuerySurface.

- EGLConfig now are an index into a sorted table of egl_config_t,
  we use a binary search to retrieve our EGLConfig (the index) from
  the implementation's EGLConfig.

- egl_config_t keeps track of the implementation's index,
  EGLConfig and CONFIG_ID as well as our CONFIG_ID.

In many ways, this implementation is simpler and more robust, as it doesn't
assume anything about the number of implementations nor what EGLConfig is
made of (the previous code assumed EGLConfig didn't usem more than 24-bits).

Change-Id: Id5abe923aacb6e1fd2b63bd8c15d7b04ae824922
 2010-07-26 21:14:59 -07:00
Jason Sams
7920987182 Update filltest. 
Change-Id: I37f2bde9898046eafb6431519dae78bf6f368f05
 2010-07-21 15:24:02 -07:00
Jack Palevich
3e9eb868b3 Fix extraMath state variable. 
Change-Id: Iba76d3e4e3bab0b993d176755f588201c8a967cd
 2010-07-19 18:01:39 -07:00
Jack Palevich
92a9ae4a02 Try to handle end-of-application better. 
Handle rotation from portrait to landscape by restarting test if not
finished.

Don't write blank line to csv file.

Change-Id: I154443138817bcec9530123c8388fcf659632336
 2010-07-19 17:52:12 -07:00
Jack Palevich
63bcb5f8e2 Write test timings to /sdcard/glperf.csv 
Change-Id: If09e209a9d8049f03320dbd7df257137bf06949e
 2010-07-19 17:39:52 -07:00
Jack Palevich
965b95468d Keep screen on for whole test. 
Print only one set of timings per test.

Draw blank black screen when done.

Change-Id: I963bcbca99ff5975683b15e60437978eb1a8beb8
 2010-07-19 17:01:25 -07:00
Jack Palevich
eb69d2ae19 An application version of the GL test. 
Change-Id: Ibcccdf2560eb24d3037c02c4740f0048b60d070c
 2010-07-19 16:27:54 -07:00
Jason Sams
e0f1cff1fa gl perf test cleanup. 
Change-Id: Ic486774e25421bd2f412f0ba2bbac4660e3982b8
 2010-07-12 11:59:34 -07:00
Andy McFadden
a5c381fd51 Fix build. 
Added missing #include <string.h>.

Change-Id: Idf151876851110098fe538a042f896784821919b
 2010-07-12 09:17:13 -07:00
Jason Sams
e448dd1a4f Remove points from fixed function. 
Add basic GL performance test.

Change-Id: I421a41b6683b2c5f70045cdd0f610a6939105fee
 2010-07-09 15:34:32 -07:00
Mathias Agopian
c64622bcb0 am 5219a82f: am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread 
Merge commit '5219a82f9d64a7d13401dcf9a0703a0ca2cd842d'

* commit '5219a82f9d64a7d13401dcf9a0703a0ca2cd842d':
  Fix a bug that prevented the creation of EGL shared contexts.
 2010-07-02 13:39:38 -07:00
Mathias Agopian
7c1c974d79 am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread 
Merge commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d' into gingerbread-plus-aosp

* commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d':
  Fix a bug that prevented the creation of EGL shared contexts.
 2010-07-02 12:34:22 -07:00
Mathias Agopian
bf83375c73 Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread 2010-07-02 12:32:33 -07:00
Jamie Gennis
4c39f8f9e2 Fix a bug that prevented the creation of EGL shared contexts. 
Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
 2010-07-02 12:05:07 -07:00
Jean-Baptiste Queru
d26e345f29 resolved conflicts for merge of f601ce2c to master 
Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7
 2010-07-02 07:46:21 -07:00
The Android Open Source Project
3541b20f6f merge from open-source master 
Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6
 2010-07-02 07:38:30 -07:00
Dianne Hackborn
ed2b843c91 am 177c405a: am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread 
Merge commit '177c405a242e811b1010bd8382b5807ab8df31a8'

* commit '177c405a242e811b1010bd8382b5807ab8df31a8':
  Introduce official public NativeWindow type.
 2010-06-30 16:11:21 -07:00
Dianne Hackborn
d729836ff8 am c6e1d880: Merge "Introduce official public NativeWindow type." into gingerbread 
Merge commit 'c6e1d88022db800773401c16803e1ab27fd01a7e' into gingerbread-plus-aosp

* commit 'c6e1d88022db800773401c16803e1ab27fd01a7e':
  Introduce official public NativeWindow type.
 2010-06-30 16:08:24 -07:00
Dianne Hackborn
4b5e91e482 Introduce official public NativeWindow type. 
Not yet hooked up to anything in the NDK, but requires renaming
the existing android_native_window_t type everywhere.

Change-Id: Iffee6ea39c93b8b34e20fb69e4d2c7c837e5ea2e
 2010-06-30 15:32:04 -07:00
Bruce Beare
a1a79197c0 Fix missing NL 
Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
 2010-06-25 09:08:12 -07:00
Jack Palevich
037256be7e am 1e08cc1d: am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer. 
Merge commit '1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c'

* commit '1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c':
  Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
 2010-06-23 10:30:34 -07:00
Mathias Agopian
243ce507c4 am cefb8858: am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread 
Merge commit 'cefb88587443323d147e687ff78eae9195eb584c'

* commit 'cefb88587443323d147e687ff78eae9195eb584c':
  Added support for the GL_TEXTURE_EXTERNAL target
 2010-06-23 10:17:56 -07:00
Jack Palevich
0a51628683 am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer. 
Merge commit '224107a421e2611b15d1ec736df54bca9ee3e78d' into gingerbread-plus-aosp

* commit '224107a421e2611b15d1ec736df54bca9ee3e78d':
  Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
 2010-06-22 05:16:24 -07:00
Jack Palevich
b3ffef9dfe Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer. 
Change-Id: Id0069535e97fe96eef74e4d0c1d19b010061fe3b
 2010-06-22 20:08:40 +08:00
Mathias Agopian
38c371361b am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread 
Merge commit '28333315c6f62b303de2ec0ac9e48158ed419f06' into gingerbread-plus-aosp

* commit '28333315c6f62b303de2ec0ac9e48158ed419f06':
  Added support for the GL_TEXTURE_EXTERNAL target
 2010-06-21 15:14:29 -07:00
Jean-Baptiste Queru
ff5f34f3c9 Recover a handful of commits that were reverted earlier 2010-06-21 13:46:59 -07:00
The Android Open Source Project
ecfae4c86a merge from froyo-plus-aosp 
Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
 2010-06-21 11:23:45 -07:00
Mathias Agopian
0a91775c4d Added support for the GL_TEXTURE_EXTERNAL target 
This will allow us to support YUV surfaces.

Change-Id: I2d4da75f1006a5285bdc552695d4caeecccf2183
 2010-06-15 17:31:17 -07:00
The Android Open Source Project
0acbc14307 merge from open-source master 
Change-Id: I12af4b88c1881a6a120031459bc63d87b1dd4956
 2010-06-15 11:34:57 -07:00
Mathias Agopian
21f82d43d6 am e52d66fa: am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken 2010-06-09 19:57:01 -07:00
Mathias Agopian
e81a3cb2bd update EGL headers to the latest 
note that this doesn't update the EGL stubs.

Change-Id: I00274431a490249d93eb6b5ba13f274b7f2682ae
 2010-06-09 18:56:05 -07:00
Mathias Agopian
11cca925b2 update GL ES stub libraries with the new GL ES headers 
Change-Id: I83be94049ddfe3fd7f5bee71a21172ade1498dd5
 2010-06-09 18:20:21 -07:00
Mathias Agopian
05bb9c973b fix OpenGL ES extension headers from khronos 
the official headers have a couple typos, which
this CL fixes.

Change-Id: I0359531a05a4a62ddbdce70c5841ec1c355feb3b
 2010-06-09 18:19:11 -07:00
Mathias Agopian
8f62c3031e update the OpenGL ES headers to the latest 
Change-Id: Iceef1e95504897a5e3759b0401cf7031c9e74547
 2010-06-09 18:08:15 -07:00
Mathias Palmqvist
a409e195fe Use stride for source and target buffers when copybit is enabled. 
Change-Id: Ie651013b3522f8e004685d74190da86433086307
 2010-06-02 16:03:04 +02:00
Mathias Agopian
fa5ec24a58 am df9556f3: am 23100fd1: Merge "fix a crasher in our EGL wrapper when attrib_list is NULL in eglChooseConfig" into kraken 2010-05-17 14:59:13 -07:00
Mathias Agopian
04aed2149d fix a crasher in our EGL wrapper when attrib_list is NULL in eglChooseConfig 
the EGL specification states that this should be treated as though it was
an empty list terminated with EGL_NONE.

Change-Id: I294104370a86b5e5c34c7bcf15c5459eab464631
 2010-05-17 14:45:43 -07:00
The Android Open Source Project
92677d978d am 1b7e3ef4: am 55bef14f: am fb234bbe: merge from open-source master 2010-05-12 12:16:45 -07:00
The Android Open Source Project
e4582835f0 am fb234bbe: merge from open-source master 
Merge commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2' into kraken

* commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2':
  Notify user regarding invalid number during MO call.
  Build software AGL library with correct get_tls() macro for ARMv7 based platforms
  Fix glReadPixels() to verify that both x and y are non-negative.
 2010-05-12 12:13:18 -07:00
The Android Open Source Project
c77a20a9d6 merge from open-source master 
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
 2010-05-12 11:58:14 -07:00
Mathias Agopian
b0eed511a2 Merge "Build software AGL library with correct get_tls() macro for ARMv7 based platforms" 2010-05-10 20:28:02 -07:00
Mathias Agopian
32a220aa6e Merge "Fix glReadPixels() to verify that both x and y are non-negative." 2010-05-10 20:26:24 -07:00
Jack Palevich
9d665b9fc9 Declare that testViewport targets Froyo APIs 
(So that it can be built in Master, but run in
Froyo.)
 2010-04-29 18:45:11 +08:00
Mathias Agopian
b282219d5e am c0fa6589: am cf2bd285: Merge "small cleanup. gEGLImpl should have been static" into kraken 2010-04-10 11:43:17 -07:00
Mathias Agopian
bf41b11ef8 small cleanup. gEGLImpl should have been static 
also added a ctor to initialized it in case we use it ont he stack
one day.

Change-Id: I2736b9bce3d8ba3b74fd029de4c18cca2cdbbf60
 2010-04-09 14:26:07 -07:00
The Android Open Source Project
f22092a1eb am 4790259c: am 8de2cf4c: merge from open-source master 2010-03-31 14:23:19 -07:00
The Android Open Source Project
45ef27a260 merge from open-source master 
Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4
 2010-03-31 14:01:45 -07:00
Jack Palevich
80505806c4 Merge "Add a test program for Sapphire viewport rotation issue." 2010-03-29 16:12:11 -07:00
Jack Palevich
fbbbb7c855 Add a test program for Sapphire viewport 
rotation issue.
 2010-03-29 16:04:21 -07:00
Mathias Agopian
8fb47ec10e Fix Android's glEGLImageTargetRenderbufferOES() wrapper 
glEGLImageTargetRenderbufferOES() pass the wrapped EGLImage
to the implementation, rather than the unwrapped one.

Change-Id: I149f9ed73e6ab9089110600e1db4311ba7a8c83a
 2010-03-29 15:12:19 -07:00
Jack Palevich
4b1409812a Add a test of EGL pausing and resuming. 2010-03-29 12:16:55 -07:00
Jack Palevich
4fb265e877 Add a test of EGL pausing and resuming. 2010-03-29 12:09:57 -07:00
Mathias Agopian
988fce5ee5 fix [2236865] STOPSHIP: bump soft gl and egl minor version number 
this is to allow developpers to deal with potiential differences
between the softgl versions.

Change-Id: I7ec2451d6af1be29818d66215b22977405d403e8
 2010-03-25 20:21:12 -07:00
Jae-Hyung Ahn
7efc2fc955 gl_code : add end of line. 
Signed-off-by: Jae-Hyung Ahn <jerry.ahn@windriver.com>
 2010-03-24 10:15:41 -07:00
Jack Palevich
81cd084485 Implement eglInitialize / eglTerminate reference counting 
Previously we imlpemented the standard semantics for
eglInitialize / eglTerminate, which are that
eglInitialize may be called any number of times,
but the first call to eglTerminate will terminate
the display.

Now we follow reference-countins semantics, which
means that eglTerminate will only terminate the
display when the reference count returns to zero.

This change allows EGL to be used by multiple
independently written modules in the same process.

(Otherwise there is no way for the independent
modules to coordinate their use of the display.)
 2010-03-15 21:21:51 -07:00
Jack Palevich
7c5fe4c4f6 Fix glCopyTexSubImage2D inverted texture bug. 
This bug only affects the software OpenGL ES
driver.
 2010-03-12 17:32:26 -08:00
Kenny Root
bd393b7f39 Add correct copyright headers to multiple files 
Format for the list of changes shows the origin commit reference followed
by the file name.

33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java
33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java
133776-p9 core/java/android/app/IntentService.java
127013-p9 core/java/android/appwidget/AppWidgetHost.java
27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java
60765-p9 core/java/android/content/SyncResult.java
43920-p9 core/java/android/content/pm/ActivityInfo.java
43920-p9 core/java/android/content/pm/ApplicationInfo.java
43920-p9 core/java/android/content/pm/InstrumentationInfo.java
43920-p9 core/java/android/content/pm/PackageInfo.java
44103-p9 core/java/android/content/pm/PackageItemInfo.java
68960-p9 core/java/android/content/pm/PackageStats.java
43920-p9 core/java/android/content/pm/ResolveInfo.java
43920-p9 core/java/android/content/pm/ServiceInfo.java
60641-p9 core/java/android/content/res/Configuration.java
60734-p9 core/java/android/content/res/TypedArray.java
137672-p9 core/java/android/inputmethodservice/ExtractButton.java
123112-p9 core/java/android/inputmethodservice/ExtractEditText.java
119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java
115078-p9 core/java/android/os/BatteryStats.java
124790-p9 core/java/android/text/style/UpdateAppearance.java
45083-p9 core/java/android/view/RawInputEvent.java
101491-p9 core/java/android/view/inputmethod/EditorInfo.java
114701-p9 core/java/android/view/inputmethod/ExtractedText.java
123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java
119291-p9 core/java/com/android/internal/os/HandlerCaller.java
129279-p9 core/java/com/android/internal/os/PkgUsageStats.java
114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java
114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java
84364-p9 opengl/java/android/opengl/EGLLogWrapper.java
11355-p9 opengl/tools/glgen/src/CFunc.java
11355-p9 opengl/tools/glgen/src/CType.java
11355-p9 opengl/tools/glgen/src/CodeEmitter.java
11355-p9 opengl/tools/glgen/src/GenerateGL.java
11355-p9 opengl/tools/glgen/src/JFunc.java
11355-p9 opengl/tools/glgen/src/JType.java
11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java
11355-p9 opengl/tools/glgen/src/ParameterChecker.java
57236-p9 services/java/com/android/server/status/AnimatedImageView.java
66754-p9 services/java/com/android/server/status/CloseDragHandle.java
57188-p9 services/java/com/android/server/status/DateView.java
46928-p9 services/java/com/android/server/status/ExpandedView.java
70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java
45968-p9 services/java/com/android/server/status/IconData.java
57470-p9 services/java/com/android/server/status/IconMerger.java
82719-p9 services/java/com/android/server/status/LatestItemView.java
45968-p9 services/java/com/android/server/status/NotificationData.java
66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java
57458-p9 services/java/com/android/server/status/NotificationViewList.java
45968-p9 services/java/com/android/server/status/StatusBarException.java
45968-p9 services/java/com/android/server/status/StatusBarIcon.java
46130-p9 services/java/com/android/server/status/StatusBarNotification.java
45968-p9 services/java/com/android/server/status/StatusBarView.java
46199-p9 services/java/com/android/server/status/Ticker.java
62286-p9 services/java/com/android/server/status/TickerView.java
57188-p9 services/java/com/android/server/status/TrackingView.java
86041-p9 telephony/java/android/telephony/PhoneStateListener.java
87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java
136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java
34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java
55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java
127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java
129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java
25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java
46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java
77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java
9788976b1465ce982b5ae7c741345edd0ecd9322 core/java/android/accounts/AuthenticatorDescription.java
53332883543868fb83e111a07306368b7772b340 core/java/android/app/UiModeManager.java
93e7e22ec91dbc641d10ca6d70423e1357a95bba core/java/android/app/FullBackupAgent.java
328c0e7986aa6bb7752ec6de3da9c999920bb55f core/java/android/content/CursorEntityIterator.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncQueue.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncOperation.java
eb034652c2037a47ebfd99779e8383bb8bb528af core/java/android/content/pm/LabeledIntent.java
49237345d83e62fdb9eb8d50b13ad086636a04fa core/java/android/content/pm/FeatureInfo.java
a2b6c3775ed6b8924232d6a01bae4a19740a15f8 core/java/android/content/pm/PackageInfoLite.java
3ecd5f437580e49d80beecd29489d5fb1f7a7db0 core/java/android/content/pm/RegisteredServicesCacheListener.java
5ebbb4a6b3e16f711735ae0615b9a9ea64faad38 core/java/android/content/pm/XmlSerializerAndParser.java
c4516a7b62de525e3d6d5e76851bdfaf12c11f05 core/java/android/database/sqlite/SQLiteTransactionListener.java
9bbc21a773cbdfbef2876a75c32bda5839647751 core/java/com/android/internal/backup/LocalTransport.java
21f1bd17b2dfe361acbb28453b3f3b1a110932fa core/java/com/android/internal/content/PackageMonitor.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseSurfaceHolder.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseIWindow.java
e540833fdff4d58e37c9ba859388e24e2945ed45 core/java/com/android/internal/os/SamplingProfilerIntegration.java
192ab903887bbb8e7c7b6da5c581573850e30f46 core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java
1619367ab823150fa8856d419abe02ceb75886f1 media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
27f8002e591b5c579f75b2580183b5d1c4219cd4 opengl/tools/glgen/stubs/gles11/glGetString.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glShaderSource.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GenerateGLES.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/Jsr239CodeEmitter.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GLESCodeEmitter.java
69e21f5f6e0d04539cd92848ea009dd615d88c2c opengl/tests/gldual/src/com/android/gldual/TriangleRenderer.java
c028be4f3b8c7476b46859f66c3f33d528adf181 packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.java
df8a3f31d871db25e952972c2eb346a71186e9e3 tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java

Copyright header moved to top in following file:

core/tests/coretests/src/android/widget/ListViewTest.java

Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
 2010-03-11 18:22:10 -08:00
Magnus Landqvist
d08583b05c Build software AGL library with correct get_tls() macro for ARMv7 based platforms 
This prevents crashes on snapdragon processors.
 2010-02-19 12:06:59 +01:00
Mathias Agopian
54ed4f6282 get rid off the YUV formats at the libui layer 2010-02-16 17:33:37 -08:00
Mathias Agopian
82c19b101e Merge "fix [2189862] Race condition in eglIntialize and eglDestroy" 2010-02-05 18:37:17 -08:00
Mathias Agopian
75bc27803e fix [2189862] Race condition in eglIntialize and eglDestroy 
there is now a lock protext a perticular display. it's held during
initialization and destruction.
 2010-02-05 16:17:01 -08:00
Mathias Agopian
8dccb26901 Proper EGLImageKHR error handling 
Validate EGLImageKHR format and return an error for unsupported ones.
Also make sure to return an error when binding EGL_NO_IMAGE_KHR to a texture
 2010-02-04 17:04:53 -08:00
Mathias Agopian
04a3f57d19 fix [2133133] Software OpenGL ES Lighting is buggy (GL Gears washed out bug) 
A typo caused GL_AMBIENT_AND_DIFFUSE to only set the the ambient color.

Fix another typo which caused the viewer position to be wrong for
specular highlights.

Switch back to eye-space lighting, since there are still some issues
with some demos (San Angeles in particular).
 2010-02-03 12:13:15 -08:00
Jack Palevich
0673586371 Fix ETC1 texture decoding. 
etc1_decode_image requires the stride argument to be in bytes, but the
surface->stride field is in pixels. Convert by multiplying by pixel size.
 2010-02-02 22:50:39 -08:00
Mathias Agopian
18b915a102 implement [2396050] Add ETC1 texture support to AGL 2010-02-02 20:19:54 -08:00
Mathias Agopian
fda42f318a fix [2397853] glCopyTexImage2D crashes emulator 
Fixed a typo which would cause a buffer overflow
 2010-02-01 13:45:08 -08:00
Mike Playle
a48c654e82 Fix glReadPixels() to verify that both x and y are non-negative. 2010-01-29 09:52:22 +00:00
Jack Palevich
e44e45c454 Implement the GL11ExtensionPack APIs. 2010-01-28 20:28:32 +08:00
Mathias Agopian
45351bcae5 fix [2341222] AGL version of glDrawTexxOES doesn't handle "Z" value correctly 2010-01-25 11:49:52 -08:00
Mathias Agopian
8063c3ab04 fix [2303866] eglMakeCurrent doesn't return all error messages described in the spec 2010-01-25 11:30:11 -08:00
Gary King
9166f7bfa7 Use correct TLS codepath in graphics libraries 
Duplicate ARCH_ARM_HAVE_TLS_REGISTER BoardConfig to proprocessor
HAVE_ARM_TLS_REGISTER define from Bionic's libc Android.mk to ensure that
OpenGL libraries (libEGL, libGLESv1_CM, libGLESv2, libGLES_android) use the
correct codepath in bionic_tls.h for accessing the TLS address
 2010-01-12 17:35:35 -08:00
Jack Palevich
91ea437c47 am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair 
Merge commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp

* commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5':
  DO NOT MERGE A library for encoding and decoding ETC1 textures.
 2010-01-09 21:54:28 -08:00
Romain Guy
e8b6618c4c Deprecate fill_parent and introduce match_parent. 
Bug: #2361749.
 2010-01-08 15:11:38 -08:00
Jack Palevich
618c755192 DO NOT MERGE A library for encoding and decoding ETC1 textures. 
The ETC1 compressed texture format is commonly
supported by OpenGL ES 2.0-capable devices.

This change adds a host-only version of the library. It is used by
the etc1tool.
 2010-01-08 16:00:21 +08:00
Jean-Baptiste Queru
837edec5e3 Do not use a user tag on apps, as it is ignored. 
The build system does not honor user tags on apps,
and setting it is misleading.

This removes the confusion by making the makefiles
behave like they read.

Change-Id: I7c5feba1c7d07f915b97dd098584f29938a4c885
 2010-01-06 08:53:44 -08:00
Jack Palevich
01cc538b29 A library for encoding and decoding ETC1 textures. 
The ETC1 compressed texture format is commonly
supported by OpenGL ES 2.0-capable devices.
 2009-12-31 13:31:04 +08:00
Jack Palevich
909486a7cb Print OpenGL version and extension information. 
Something happened to the line endings, adding
a blank line after most lines of text. I
repaired the damage, but in the process some
blank lines have been added / removed.
 2009-12-24 11:09:56 +08:00
Android (Google) Code Review
5233a4e1b7 Merge change I5ddc721d 
* changes:
  Add misssing symbol type directives.
 2009-12-09 16:07:57 -08:00
Doug Kwan
9054ddfcd7 Add misssing symbol type directives. 2009-12-08 11:22:38 -08:00
Jack Palevich
66089a33ea Implement Matrix Palette extension. 
Adds support for formerly-unimplemented methods:

glCurrentPaletteMatrixOES
glLoadPaletteFromModelViewMatrixOES
glMatrixIndexPointerOES
glWeightPointerOES

The bulk of the changes are related to implementing the two PointerOES
methods, which are implemented pretty much the same way as the existing
Pointer methods were implemented.

This change also changes the way glPointSizePointerOES is implemented,
making it act like all the other Pointer methods. (Previously it was
not handling non-direct-buffer arguments correctly.)

Fixes bug 2308625 "Support matrix palette skinning
in JSR239 and related APIs"

Also updated GLLogWraper to fix two bugs in GLLogWrapper that were
discovered while testing matrix palette skinning support:

a) Handle trying to print the contents of null-but-enabled buffers.
(It's not legal to draw with null-but-enabled buffers, and
in fact some OpenGL drivers will crash if you try to render in this
state, but there's no reason the GLLogWrapper should crash while trying
to debug this situation.

b) Don't read off the end of a vertex buffer with non-zero position when
printing the entire contents of the vertex buffer. Now we only print from
the current position to the end of the buffer.
 2009-12-08 15:43:51 +08:00
Mathias Agopian
87d295375b am 7671c088: am 77f17095: am 533a2803: Merge change I18ffb549 into eclair 
Merge commit '7671c088cd5e6ce938c89939f55ead6629bd6516'

* commit '7671c088cd5e6ce938c89939f55ead6629bd6516':
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
 2009-12-01 18:51:49 -08:00
Mathias Agopian
69fec4726b am 77f17095: am 533a2803: Merge change I18ffb549 into eclair 
Merge commit '77f17095ed17a6ccc7fc1f1b3ddb31c63bbf66a2' into eclair-mr2-plus-aosp

* commit '77f17095ed17a6ccc7fc1f1b3ddb31c63bbf66a2':
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
 2009-12-01 18:41:42 -08:00
Mathias Agopian
ea5b203790 am 533a2803: Merge change I18ffb549 into eclair 
Merge commit '533a2803506cc4f196403fdfafd948bd4f8e60d9' into eclair-mr2

* commit '533a2803506cc4f196403fdfafd948bd4f8e60d9':
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
 2009-12-01 17:13:50 -08:00
Mathias Agopian
f9f36b5ecd am 533a2803: Merge change I18ffb549 into eclair 
Merge commit '533a2803506cc4f196403fdfafd948bd4f8e60d9' into eclair-plus-aosp

* commit '533a2803506cc4f196403fdfafd948bd4f8e60d9':
  fix [2069023] STOPSHIP: disable DEBUG_COPYBIT
 2009-11-30 12:17:52 -08:00
Mathias Agopian
f74573486d fix [2069023] STOPSHIP: disable DEBUG_COPYBIT 2009-11-30 12:10:53 -08:00
Mathias Agopian
87d0958b9e am 8e9af2bd: am b439f561: am 13feccf5: Merge change I39f0003e into eclair 
Merge commit '8e9af2bd1d600cd2c69c88c7d60c7d455921677e'

* commit '8e9af2bd1d600cd2c69c88c7d60c7d455921677e':
  fix [2235414] libagl glDeleteBuffers() crashes
 2009-11-19 19:16:58 -08:00
Mathias Agopian
1850ea3a03 am b439f561: am 13feccf5: Merge change I39f0003e into eclair 
Merge commit 'b439f561a6aa3900f1850e71a4aa60618af13f90' into eclair-mr2-plus-aosp

* commit 'b439f561a6aa3900f1850e71a4aa60618af13f90':
  fix [2235414] libagl glDeleteBuffers() crashes
 2009-11-19 19:12:01 -08:00
Mathias Agopian
8386ce0d5b am 13feccf5: Merge change I39f0003e into eclair 
Merge commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae' into eclair-mr2

* commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae':
  fix [2235414] libagl glDeleteBuffers() crashes
 2009-11-19 19:07:36 -08:00
Mathias Agopian
935b3deec9 am 13feccf5: Merge change I39f0003e into eclair 
Merge commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae' into eclair-plus-aosp

* commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae':
  fix [2235414] libagl glDeleteBuffers() crashes
 2009-11-19 19:07:17 -08:00
Mathias Agopian
a750fc0bf8 fix [2235414] libagl glDeleteBuffers() crashes 
don't dereference null pointers, would happen if one of the array wasn't bound.
 2009-11-19 17:32:05 -08:00
Jack Palevich
378112ebed Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 context 
Provide a new method, GLSurfaceView.setEGLContextClientVersion. Clients
call this method to define which level of OpenGL ES support they want.

This method only affects the default behavior of GLSurfaceView. If clients
have supplied their own EGLContextFactory or EGLConfigChooser then they
are on their own if they want to create an OpenGL ES 2.0 context.

This API is currently hidden.

Update the gl2_java test to use this new API.

Update the gl2_java test's AndroidManifest.xml file to indicate that
it requires OpenGL ES 2.0.
 2009-11-19 19:08:52 +08:00
Jack Palevich
50d0b14689 Add a Java API for OpenGL ES 2.0. 
Currently this API is hidden.

Add a test program.
 2009-11-19 16:34:55 +08:00
Jean-Baptiste Queru
daeaa536fa merge from eclair 2009-11-15 12:06:23 -08:00