summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 2eb12a47 to masterDianne Hackborn2010-06-241-2/+2
|\
| * am 01e4cfc4: Some ActivityThread/ActivityManager cleanup.Dianne Hackborn2010-06-241-2/+2
| |\
| | * Some ActivityThread/ActivityManager cleanup.Dianne Hackborn2010-06-241-2/+2
* | | am 1e08cc1d: am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and g...Jack Palevich2010-06-234-2/+104
|\ \ \ | |/ /
| * | am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttrib...Jack Palevich2010-06-224-2/+104
| |\ \ | | |/
| | * Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.Jack Palevich2010-06-224-2/+104
* | | am cefb8858: am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL ta...Mathias Agopian2010-06-232-0/+20
|\ \ \ | |/ /
| * | am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gi...Mathias Agopian2010-06-212-0/+20
| |\ \ | | |/
| | * Added support for the GL_TEXTURE_EXTERNAL targetMathias Agopian2010-06-152-0/+20
| * | merge from froyo-plus-aospThe Android Open Source Project2010-06-211-2/+2
| |\ \ | | |/ | |/|
| | * merge from open-source masterThe Android Open Source Project2010-06-151-2/+2
| | |\
| | | * Use stride for source and target buffers when copybit is enabled.Mathias Palmqvist2010-06-021-2/+2
* | | | Recover a handful of commits that were reverted earlierJean-Baptiste Queru2010-06-211-2/+2
* | | | am e52d66fa: am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e...Mathias Agopian2010-06-0916-165/+1143
|\ \ \ \ | |/ / /
| * | | update EGL headers to the latestMathias Agopian2010-06-095-10/+99
| * | | update GL ES stub libraries with the new GL ES headersMathias Agopian2010-06-095-58/+268
| * | | fix OpenGL ES extension headers from khronosMathias Agopian2010-06-092-26/+26
| * | | update the OpenGL ES headers to the latestMathias Agopian2010-06-096-104/+783
* | | | am 36893612: am d6ddcb7f: fix [2677468] some 3rd party GL ES apps get a 32-bi...Mathias Agopian2010-05-241-1/+0
|\ \ \ \ | |/ / /
| * | | fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and ...Mathias Agopian2010-05-241-1/+0
* | | | am df9556f3: am 23100fd1: Merge "fix a crasher in our EGL wrapper when attrib...Mathias Agopian2010-05-172-6/+13
|\ \ \ \ | |/ / /
| * | | fix a crasher in our EGL wrapper when attrib_list is NULL in eglChooseConfigMathias Agopian2010-05-172-6/+13
* | | | 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 from open-source masterThe Android Open Source Project2010-05-122-1/+5
| | |\ \ | | | |/
| | | * Merge "Build software AGL library with correct get_tls() macro for ARMv7 base...Mathias Agopian2010-05-101-0/+4
| | | |\
| | | | * Build software AGL library with correct get_tls() macro for ARMv7 based platf...Magnus Landqvist2010-02-191-0/+4
| | | * | 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
* | | | | | am 15d484a7: am 06798769: am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_W...Jack Palevich2010-04-191-5/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 06798769: am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors"...Jack Palevich2010-04-191-5/+19
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyoJack Palevich2010-04-191-5/+19
| | |\ \ \ \
| | | * | | | Quietly handle EGL_BAD_NATIVE_WINDOW errorsJack Palevich2010-04-191-5/+19
* | | | | | | am c0fa6589: am cf2bd285: Merge "small cleanup. gEGLImpl should have been sta...Mathias Agopian2010-04-102-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | small cleanup. gEGLImpl should have been staticMathias Agopian2010-04-092-1/+2
| |/ / / / /
* | | | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | gl_code : add end of line.Jae-Hyung Ahn2010-03-241-1/+2
| | * | | am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 tex...Jack Palevich2010-01-093-0/+792
| | |\ \ \
| | | * | | DO NOT MERGE A library for encoding and decoding ETC1 textures.Jack Palevich2010-01-083-0/+792
| | * | | | am e3449553: Merge change I49c9a3a3 into eclairJack Palevich2009-12-221-0/+29
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix bug 2325244 screen turns black for a brief period of timeJack Palevich2009-12-221-0/+29
| | * | | | am 533a2803: Merge change I18ffb549 into eclairMathias Agopian2009-11-301-1/+1
| | |\ \ \ \ | | | |/ / /
| | * | | | am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich2009-11-251-2/+6
| | |\ \ \ \
| | * \ \ \ \ am 13feccf5: Merge change I39f0003e into eclairMathias Agopian2009-11-191-12/+24
| | |\ \ \ \ \
| | * \ \ \ \ \ am dc49acb0: Merge change Ica8c305a into eclairJack Palevich2009-11-161-134/+125
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am 27407208: Merge change Icf335098 into eclairMathias Agopian2009-11-122-2/+2
| | |\ \ \ \ \ \ \
generated by cgit v1.1 at 2024-12-28 04:28:08 +0000