summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
* am 5219a82f: am 8ecfb60a: Merge "Fix a bug that prevented the creation of ↵Mathias Agopian2010-07-021-0/+4
|\ | | | | | | | | | | | | | | | | EGL shared contexts." into gingerbread Merge commit '5219a82f9d64a7d13401dcf9a0703a0ca2cd842d' * commit '5219a82f9d64a7d13401dcf9a0703a0ca2cd842d': Fix a bug that prevented the creation of EGL shared contexts.
| * am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared ↵Mathias Agopian2010-07-021-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | contexts." into gingerbread Merge commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d' into gingerbread-plus-aosp * commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d': Fix a bug that prevented the creation of EGL shared contexts.
| | * Merge "Fix a bug that prevented the creation of EGL shared contexts." into ↵Mathias Agopian2010-07-021-0/+4
| | |\ | | | | | | | | | | | | gingerbread
| | | * Fix a bug that prevented the creation of EGL shared contexts.Jamie Gennis2010-07-021-0/+4
| | | | | | | | | | | | | | | | Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
* | | | resolved conflicts for merge of f601ce2c to masterJean-Baptiste Queru2010-07-021-1/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7
| * | | merge from open-source masterThe Android Open Source Project2010-07-021-1/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6
| | * | | Fix missing NLBruce Beare2010-06-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* | | | | am 177c405a: am c6e1d880: Merge "Introduce official public NativeWindow ↵Dianne Hackborn2010-06-302-7/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type." into gingerbread Merge commit '177c405a242e811b1010bd8382b5807ab8df31a8' * commit '177c405a242e811b1010bd8382b5807ab8df31a8': Introduce official public NativeWindow type.
| * | | | am c6e1d880: Merge "Introduce official public NativeWindow type." into ↵Dianne Hackborn2010-06-302-7/+8
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'c6e1d88022db800773401c16803e1ab27fd01a7e' into gingerbread-plus-aosp * commit 'c6e1d88022db800773401c16803e1ab27fd01a7e': Introduce official public NativeWindow type.
| | * | | Introduce official public NativeWindow type.Dianne Hackborn2010-06-302-7/+8
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Not yet hooked up to anything in the NDK, but requires renaming the existing android_native_window_t type everywhere. Change-Id: Iffee6ea39c93b8b34e20fb69e4d2c7c837e5ea2e
* | | | resolved conflicts for merge of 2eb12a47 to masterDianne Hackborn2010-06-241-2/+2
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99
| * | | am 01e4cfc4: Some ActivityThread/ActivityManager cleanup.Dianne Hackborn2010-06-241-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301' into gingerbread-plus-aosp * commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301': Some ActivityThread/ActivityManager cleanup.
| | * | Some ActivityThread/ActivityManager cleanup.Dianne Hackborn2010-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move PackageInfo out of ActivityThread, renaming to LoadedApk. - Rename some of the other PacakgeInfo inner classes to better represent what they are. - Rename HistoryRecord to ActivityRecord. - Introduce AppGlobals, to eventually let ActivityThread become package scoped. Change-Id: Ib714c54ceb3cdbb525dce3db9505f31042e88cf0
* | | | am 1e08cc1d: am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and ↵Jack Palevich2010-06-234-2/+104
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | glVertexAttribPointer. Merge commit '1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c' * commit '1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c': Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
| * | | am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and ↵Jack Palevich2010-06-224-2/+104
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | glVertexAttribPointer. Merge commit '224107a421e2611b15d1ec736df54bca9ee3e78d' into gingerbread-plus-aosp * commit '224107a421e2611b15d1ec736df54bca9ee3e78d': Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
| | * | Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.Jack Palevich2010-06-224-2/+104
| | | | | | | | | | | | | | | | Change-Id: Id0069535e97fe96eef74e4d0c1d19b010061fe3b
* | | | am cefb8858: am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL ↵Mathias Agopian2010-06-232-0/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | target" into gingerbread Merge commit 'cefb88587443323d147e687ff78eae9195eb584c' * commit 'cefb88587443323d147e687ff78eae9195eb584c': Added support for the GL_TEXTURE_EXTERNAL target
| * | | am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into ↵Mathias Agopian2010-06-212-0/+20
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '28333315c6f62b303de2ec0ac9e48158ed419f06' into gingerbread-plus-aosp * commit '28333315c6f62b303de2ec0ac9e48158ed419f06': Added support for the GL_TEXTURE_EXTERNAL target
| | * | Added support for the GL_TEXTURE_EXTERNAL targetMathias Agopian2010-06-152-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | This will allow us to support YUV surfaces. Change-Id: I2d4da75f1006a5285bdc552695d4caeecccf2183
| * | | merge from froyo-plus-aospThe Android Open Source Project2010-06-211-2/+2
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
| | * merge from open-source masterThe Android Open Source Project2010-06-151-2/+2
| | |\ | | | | | | | | | | | | Change-Id: I12af4b88c1881a6a120031459bc63d87b1dd4956
| | | * Use stride for source and target buffers when copybit is enabled.Mathias Palmqvist2010-06-021-2/+2
| | | | | | | | | | | | | | | | Change-Id: Ie651013b3522f8e004685d74190da86433086307
* | | | Recover a handful of commits that were reverted earlierJean-Baptiste Queru2010-06-211-2/+2
| | | |
* | | | am e52d66fa: am 44bea8f8: Merge changes ↵Mathias Agopian2010-06-0916-165/+1143
|\ \ \ \ | |/ / / | | | | | | | | I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
| * | | update EGL headers to the latestMathias Agopian2010-06-095-10/+99
| | | | | | | | | | | | | | | | | | | | | | | | note that this doesn't update the EGL stubs. Change-Id: I00274431a490249d93eb6b5ba13f274b7f2682ae
| * | | update GL ES stub libraries with the new GL ES headersMathias Agopian2010-06-095-58/+268
| | | | | | | | | | | | | | | | Change-Id: I83be94049ddfe3fd7f5bee71a21172ade1498dd5
| * | | fix OpenGL ES extension headers from khronosMathias Agopian2010-06-092-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the official headers have a couple typos, which this CL fixes. Change-Id: I0359531a05a4a62ddbdce70c5841ec1c355feb3b
| * | | update the OpenGL ES headers to the latestMathias Agopian2010-06-096-104/+783
| | | | | | | | | | | | | | | | Change-Id: Iceef1e95504897a5e3759b0401cf7031c9e74547
* | | | am 36893612: am d6ddcb7f: fix [2677468] some 3rd party GL ES apps get a ↵Mathias Agopian2010-05-241-1/+0
|\ \ \ \ | |/ / / | | | | | | | | 32-bits surface by default and fail
| * | | fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and ↵Mathias Agopian2010-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fail force all SurfaceView to 565 Change-Id: I8ebfa1239d8e4fa097c2e544677fb92fa20b39bd
* | | | am df9556f3: am 23100fd1: Merge "fix a crasher in our EGL wrapper when ↵Mathias Agopian2010-05-172-6/+13
|\ \ \ \ | |/ / / | | | | | | | | attrib_list is NULL in eglChooseConfig" into kraken
| * | | fix a crasher in our EGL wrapper when attrib_list is NULL in eglChooseConfigMathias Agopian2010-05-172-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the EGL specification states that this should be treated as though it was an empty list terminated with EGL_NONE. Change-Id: I294104370a86b5e5c34c7bcf15c5459eab464631
* | | | am 1b7e3ef4: am 55bef14f: am fb234bbe: merge from open-source masterThe Android Open Source Project2010-05-122-1/+5
|\ \ \ \ | |/ / /
| * | | am fb234bbe: merge from open-source masterThe Android Open Source Project2010-05-122-1/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | merge from open-source masterThe Android Open Source Project2010-05-122-1/+5
| | |\ \ | | | |/ | | | | | | | | Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
| | | * Merge "Build software AGL library with correct get_tls() macro for ARMv7 ↵Mathias Agopian2010-05-101-0/+4
| | | |\ | | | | | | | | | | | | | | | based platforms"
| | | | * Build software AGL library with correct get_tls() macro for ARMv7 based ↵Magnus Landqvist2010-02-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platforms This prevents crashes on snapdragon processors.
| | | * | Merge "Fix glReadPixels() to verify that both x and y are non-negative."Mathias Agopian2010-05-101-1/+1
| | | |\ \
| | | | * | Fix glReadPixels() to verify that both x and y are non-negative.Mike Playle2010-01-291-1/+1
| | | | |/
| | | | * merge from eclairJean-Baptiste Queru2009-11-1579-2255/+8451
| | | | |\
| | | | | * eclair snapshotJean-Baptiste Queru2009-11-1381-2259/+8462
| | | | | |
* | | | | | Declare that testViewport targets Froyo APIsJack Palevich2010-04-292-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | (So that it can be built in Master, but run in Froyo.)
* | | | | | am 15d484a7: am 06798769: am 7305f416: Merge "Quietly handle ↵Jack Palevich2010-04-191-5/+19
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | EGL_BAD_NATIVE_WINDOW errors" into froyo
| * | | | | am 06798769: am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW ↵Jack Palevich2010-04-191-5/+19
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | errors" into froyo Merge commit '0679876997a5523a7539b8fe2c74a39434b17820' into kraken * commit '0679876997a5523a7539b8fe2c74a39434b17820': Quietly handle EGL_BAD_NATIVE_WINDOW errors
| | * | | | am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyoJack Palevich2010-04-191-5/+19
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7305f4166306dac08fc63056f2c85e91015df879' into froyo-plus-aosp * commit '7305f4166306dac08fc63056f2c85e91015df879': Quietly handle EGL_BAD_NATIVE_WINDOW errors
| | | * | | | Quietly handle EGL_BAD_NATIVE_WINDOW errorsJack Palevich2010-04-191-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We believe these errors happen when the window manager has told surface flinger to close the native window. If this error happens while we are creating the EGL surface we exit the render loop (and therefore exit the render thread.) If the error happens while swapping the surface we ignore it. In either situation, we expect that the application is about to be shut down by the window manager, so it should not be necessary to try and recover from the error.
* | | | | | | am c0fa6589: am cf2bd285: Merge "small cleanup. gEGLImpl should have been ↵Mathias Agopian2010-04-102-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | static" into kraken
| * | | | | | small cleanup. gEGLImpl should have been staticMathias Agopian2010-04-092-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also added a ctor to initialized it in case we use it ont he stack one day. Change-Id: I2736b9bce3d8ba3b74fd029de4c18cca2cdbbf60
* | | | | | am 4790259c: am 8de2cf4c: merge from open-source masterThe Android Open Source Project2010-03-311-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge from open-source masterThe Android Open Source Project2010-03-311-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4