| Commit message (Collapse) | Author | Age | Files | Lines |
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
gingerbread
Merge commit '45bd99466ce9962778eacaefff1c0a44bb268f0c'
* commit '45bd99466ce9962778eacaefff1c0a44bb268f0c':
option to enable multisampling
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2' into gingerbread-plus-aosp
* commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2':
option to enable multisampling
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
multisampling can be enabled by specifying the number of
samples desired on the command line.
Change-Id: I5f93c93ae7ada54bcd646c1065e07890d0cb9808
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
gingerbread
Merge commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0'
* commit 'a9ff29b59cf33e552285a0bff3caf7a44f93f1c0':
Fix a few typos in EGL wrapper
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Merge commit '6808e6a867ba0b32f8bd97163e134c2866423f01' into gingerbread-plus-aosp
* commit '6808e6a867ba0b32f8bd97163e134c2866423f01':
Fix a few typos in EGL wrapper
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: I3b815ca6ec334ca12088f9721eece33df42b2e46
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
gingerbread
Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24'
* commit '099aa9a1b4eaf6536decbcafac43476c4908ef24':
add a fps counter to sanangeles demo
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit 'edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp
* commit 'edbb8083a815e9d911f8e659fc5c293543fdf502':
add a fps counter to sanangeles demo
|
| | | |/
| | |
| | |
| | | |
Change-Id: I9a9473ce213301cc7661fddfb1ef5a6ffcb346d4
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
gingerbread
Merge commit 'ff3dcf27be2bbb259b7605396d36e50ade35266f' into gingerbread-plus-aosp
* commit 'ff3dcf27be2bbb259b7605396d36e50ade35266f':
cleanup EGL a bit. remove unused extension.
|
| | | |
| | |
| | |
| | | |
Change-Id: Ia87120b076ab1bf7b28f06087878d8161fb46c88
|
| | | | |
|
| | | |
| | |
| | |
| | | |
Change-Id: I7758bc7d6dc2e70fc3590fe939ebf71fbcde7059
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
name for future use" into gingerbread
Merge commit 'd72c1172f669d0a50a5164672c354ec7fb4ac9aa'
* commit 'd72c1172f669d0a50a5164672c354ec7fb4ac9aa':
reserve android.opengl.GLWallpaperService name for future use
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
future use" into gingerbread
Merge commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb' into gingerbread-plus-aosp
* commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb':
reserve android.opengl.GLWallpaperService name for future use
|
| | | |
| | |
| | |
| | | |
Change-Id: I7a217593a1ca39214dda26ddb3af3ddc30a8a95a
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
completing a level" into gingerbread
Merge commit '43647129d676e8c802850ca493f2ebc6064a4a1a'
* commit '43647129d676e8c802850ca493f2ebc6064a4a1a':
fix [2931161] crash in labyritnth when completing a level
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
level" into gingerbread
Merge commit '17da06631041f9f2237738fb673a74a85b1d9cf4' into gingerbread-plus-aosp
* commit '17da06631041f9f2237738fb673a74a85b1d9cf4':
fix [2931161] crash in labyritnth when completing a level
|
| | | |
| | |
| | |
| | | |
Change-Id: I821d67effaf73d7008b2828d06f5489d1f976a1e
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
extension to work" into gingerbread
Merge commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac'
* commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac':
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
there was a problem with eglGetProcAddress() which would only work with
GLES 1.x contexts.
Change-Id: I4747671cbf7ed469bb471a377f1d6f36550d24df
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
eglGetProcAddress" into gingerbread
Merge commit '553a333d4446bb34330da92f02daa515dc597939'
* commit '553a333d4446bb34330da92f02daa515dc597939':
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
|
| | | |
| | |
| | |
| | | |
Change-Id: Ie07f33ae2162830df1e4f3d3b5e00fcfb8c350d6
|
| | | |
| | |
| | |
| | | |
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
eglGetProcAddress(), needed in the ndk" into gingerbread
Merge commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb'
* commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb':
fix [2421247] implement eglGetProcAddress(), needed in the ndk
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
the ndk" into gingerbread
Merge commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f' into gingerbread-plus-aosp
* commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f':
fix [2421247] implement eglGetProcAddress(), needed in the ndk
|
| | | |
| | |
| | |
| | | |
Change-Id: I5027a27b43c0dd449a404024087853ca05bb8e4e
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
(libagl)" into gingerbread
Merge commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec'
* commit '67e4ff768d71088a64fbac3b8e398e2e16dd84ec':
remove copybit hack from software opengl (libagl)
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
gingerbread
Merge commit '4d7fc3651bd93d588d2b8580010414b59bc67729' into gingerbread-plus-aosp
* commit '4d7fc3651bd93d588d2b8580010414b59bc67729':
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
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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().
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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().
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | | |
Change-Id: I37f2bde9898046eafb6431519dae78bf6f368f05
|
| | | |
| | |
| | |
| | | |
Change-Id: Iba76d3e4e3bab0b993d176755f588201c8a967cd
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Handle rotation from portrait to landscape by restarting test if not
finished.
Don't write blank line to csv file.
Change-Id: I154443138817bcec9530123c8388fcf659632336
|
| | | |
| | |
| | |
| | | |
Change-Id: If09e209a9d8049f03320dbd7df257137bf06949e
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Print only one set of timings per test.
Draw blank black screen when done.
Change-Id: I963bcbca99ff5975683b15e60437978eb1a8beb8
|
| | | |
| | |
| | |
| | | |
Change-Id: Ibcccdf2560eb24d3037c02c4740f0048b60d070c
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
GLSurfaceViews" into gingerbread
Merge commit '43429036f5885063e522603e51c5f59f8b9e697a'
* commit '43429036f5885063e522603e51c5f59f8b9e697a':
Fix deadlock when switching between two GLSurfaceViews
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into gingerbread
Merge commit '91216a7e7406ef02d833e461d0db93ece7b2140d' into gingerbread-plus-aosp
* commit '91216a7e7406ef02d833e461d0db93ece7b2140d':
Fix deadlock when switching between two GLSurfaceViews
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Some devices only support a single active EGL context.
On those devices, when a second activity that uses a GLSurfaceView
is started in the same process, the second activity can potentially
hang in GLSurfaceView.onWindowResize waiting for its GLSurfaceView
render thread to draw a frame. The second activity's render thread
is waiting to acquire an EGL context, but the first activity's render
thread doesn't know it should release the EGL context.
The fix is to detect the potential hang, and ask the first activity's
render thread to release the EGL context.
Change-Id: Ibb342c68772297744c973bcf5010581cd132db67
|
| | | |
| | |
| | |
| | | |
Change-Id: Ic486774e25421bd2f412f0ba2bbac4660e3982b8
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Added missing #include <string.h>.
Change-Id: Idf151876851110098fe538a042f896784821919b
|