| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
glGetError() will now always return GL_INVALID_OPERATION if called from a thread
with no GL context bound.
Change-Id: I28ba458871db051bb4f5a26668a1fa123526869c
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
gingerbread
Merge commit 'd01ce1924a51539c4d47ef1f55913bdf1a018124'
* commit 'd01ce1924a51539c4d47ef1f55913bdf1a018124':
fix small bug in EGL error management
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Merge commit '9d5fac517463526450268bf6353e32c13a8cdd0c' into gingerbread-plus-aosp
* commit '9d5fac517463526450268bf6353e32c13a8cdd0c':
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
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: I38c87803e32030918f2deb06381eabce0faa870c
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: I4c2f2acf797a3a753f8a6061db3d2bcdc7d642f0
|
|\ \ \ \
| |/ / /
|/| / /
| |/ /
| | |
| | |
| | |
| | |
| | | |
/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
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Change-Id: Idd9ca85ce3ba6c92234375071b53e5365e689062
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into gingerbread
Merge commit '793b2293797ea930078640c4827d3cbdf449c227'
* commit '793b2293797ea930078640c4827d3cbdf449c227':
surfaceflinger / GL extensions cleanup
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Merge commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69' into gingerbread-plus-aosp
* commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69':
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
|
| | |
| | |
| | |
| | | |
Change-Id: Ie2771b5869c9c8dcf5ecf9318e2ee6d4d1cd5cc9
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: I82825dbe3b24a520b79f6b05d01f37e1b5008b62
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|