summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
* fix a dead-lock in eglMakeCurrentMathias Agopian2012-02-032-22/+54
| | | | | | | | | | this was introduced in a recent change. eglMakeCurrent can end up calling eglDestroyImageKHR via ANativewWindow::disconnect when the consumer is in the same process. we make sure we don't hold the lock while this is happening. Change-Id: Id17fe4fd76eecf5f962cefb9aa32be41fc1b042d
* gltrace: fixup Push & Insert Marker callsSiva Velusamy2012-02-011-0/+8
| | | | Change-Id: I58ced7225fac79ec636a65da4883614a5dce6dff
* fix a race condition in eglMakeCurrent()Mathias Agopian2012-01-303-35/+52
| | | | | | | | | | | | | | it would happen when a context was made non-current, in this case we would call the implementation's eglMakeCurrent() which would succeed, if we're rescheduled at that point, another eglMakeCurrent() could make that context current to another thread, however, when we came back to the original call we would overwrite egl_context_t internal state. this is fixed by moving the critical section under egl_display_t's lock. Change-Id: I743c85696e13263d3a9570824940263df0caacdc
* Merge "add all needed GL extension wrappers"Mathias Agopian2012-01-301-16/+34
|\
| * add all needed GL extension wrappersMathias Agopian2012-01-301-16/+34
| | | | | | | | | | | | | | when increasing MAX_NUMBER_OF_GL_EXTENSIONS to 256 we also needed to create all the corresponding wrappers. Change-Id: I90edaaf0885ccdfab48e7a1396bcf88e039cfb25
* | Merge "add support for GL_EXT_debug_marker"Mathias Agopian2012-01-3012-12/+118
|\ \ | |/ |/|
| * add support for GL_EXT_debug_markerMathias Agopian2012-01-2912-12/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This extension is always added to the GL_EXTENSIONS extension string for the current GL context, regardless of if it's supported by the h/w driver. The extension itself will be handled by GLES_trace (eventually), when GLES_trace is not enabled, it'll result to a no-op. If the h/w implementation has this extension, we'll call that version instead of our dummy version. Change-Id: Ie5dd3387c4d45cd5ed5f03b73bda6045620a96bc
* | Merge "gltrace: Use Unix Domain Socket rather than INET Socket"Siva Velusamy2012-01-303-19/+21
|\ \ | |/ |/|
| * gltrace: Use Unix Domain Socket rather than INET SocketSiva Velusamy2012-01-273-19/+21
| | | | | | | | | | | | | | | | Export trace information via abstract Unix Domain Socket (UDS). This allows tracing of applications without INTERNET permission, and should be faster as well. Change-Id: Iabb67fcc2bc2484afd8128af07dca723b81c52c6
* | Merge "update GLES headers and add support for corresponding new extensions."Mathias Agopian2012-01-2915-83/+3951
|\ \
| * | update GLES headers and add support for corresponding new extensions.Mathias Agopian2012-01-2815-83/+3951
| |/ | | | | | | Change-Id: I554d9659113b4721b748ee5c1a3b1ca82b11d75e
* | remove unused codeMathias Agopian2012-01-2820-10596/+0
|/ | | | Change-Id: If900fcc50f9ffc424e270cb6063b16a2d7bc04d3
* hack up frame latency measurementJamie Gennis2012-01-241-0/+20
| | | | Change-Id: I6d9a466a23285304f0e229a5649815636ab5d6af
* gltrace: fixup data for glTexSubImage2D & glDeleteBuffersSiva Velusamy2012-01-171-23/+64
| | | | Change-Id: I1c1deb8c6026ecf1fa0ed5287ccf601416eba6dc
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-0818-51/+51
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-064-7/+7
| | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
* Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"Steve Block2012-01-055-15/+15
|\
| * Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-045-15/+15
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
* | gltrace: add user settings to control data captured.Siva Velusamy2012-01-045-8/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently users do not have control over the amount of data captured during tracing. This patch adds 3 settings that users can enable/disable at runtime: - capture framebuffer on eglSwap() calls - capture framebuffer on glDraw*() calls - capture texture data passed to glTexImage*() calls Disabling these options when not needed signficantly decreases the size of the trace file, and reduces performance overhead for the running application. These settings are stored in the per process GLTraceState. A separate thread listens for commands from the host, and updates the state based on the user commands. Change-Id: Ic4518b94e8bcbc5330ac7138153721caa98b365d
* | gltrace: add start time & duration to each traced call.Siva Velusamy2012-01-049-511/+1344
| | | | | | | | Change-Id: Idfec8f715f6000594b6381cbfdee9fdf6d89f484
* | gltrace: transport buffering and context managementSiva Velusamy2012-01-0414-1218/+1077
| | | | | | | | | | | | | | | | | | | | | | This patch adds two improvements: 1. Protobuf messages are buffered and sent in chunks. 2. Multiple EGL contexts are handled properly: Corresponding to each EGLContext, a GLTraceContext with a unique ID is created. On eglMakeCurrent, the appropriate GLTraceContext is set and is used while tracing subsequent GL Calls in that thread. Change-Id: I34076376d3e5af205c87c7396ea47659844abd6e
* | Merge "gltrace: attach contents of the appropriate framebuffer"Siva Velusamy2012-01-045-13/+33
|\ \ | |/ |/|
| * gltrace: attach contents of the appropriate framebufferSiva Velusamy2011-12-075-13/+33
| | | | | | | | | | | | | | | | | | Currently, gltrace always attaches the contents of the currently bound framebuffer. This patch changes it to attach the contents of FB0 on eglSwap, and the currently bound framebuffer for the glDraw* calls. Change-Id: Ice0520d45d75638fe61cd91149df773074216510
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-0314-63/+63
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
* | Fix convert8To4, convert8To5Jack Palevich2011-12-091-2/+2
|/ | | | | | | | See b/5680952 "Compilation warnings in etc1.cpp" for discussion. Fixes b/5680952 Change-Id: I0af6ba5ed5e60f3ed7a6a28eba3b09504fee1a3f
* gltrace: Make framebuffer contents an optional message.Siva Velusamy2011-12-054-13/+495
| | | | | | | | | | | | Currently, the contents of the FrameBuffer are sent by encoding them as the last argument to the function call. As a result, it is not possible to know if a message has the framebuffer encoded in it without looking at the function type. This patch modifies the protobuf definition to include a separate optional framebuffer message. Change-Id: Ief3a6950052d927ca0743e729457435b48c25a92
* Merge "glestrace: Framework for GLES tracing library"Siva Velusamy2011-12-0233-484/+17425
|\
| * glestrace: Framework for GLES tracing librarySiva Velusamy2011-12-0233-484/+17425
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch provides a framework for tracing GLES 1.0 and 2.0 functions. It is missing a lot of features, but here are the things it accomplishes: - Stop building the glesv2dbg library, and build the glestrace library instead. - Replace the hooks for glesv2dbg with the ones for glestrace. - Add the basics for the trace library. Currently, this traces all GL functions, but not all required data is sent for all the functions. As a result, it will not be possible to reconstruct the entire GL state on the host side. The files gltrace.pb.* and gltrace_api.* are both generated using the tools/genapi.py script. Change-Id: Id60a468f7278657f008bc6ea1df01f9bdfecfdd3
* | am e2970700: am e8ba2aba: Merge "add a way to access the version string of ↵Mathias Agopian2011-11-302-1/+10
|\ \ | |/ |/| | | | | | | | | the h/w implementation of EGL" into ics-mr1 * commit 'e2970700e921da4226061988a6e8953b1fbfb5a9': add a way to access the version string of the h/w implementation of EGL
| * add a way to access the version string of the h/w implementation of EGLMathias Agopian2011-11-292-1/+10
| | | | | | | | | | | | | | we use a hidden egl extension. the version string is printed in SF's dumpsys log. Change-Id: I123eb4bde6de462bb2404c67b74d6d6219a48d6a
* | am ea54d0dc: am 723218b4: Merge "Hide ManagedEGLContext until we are sure ↵Romain Guy2011-11-211-0/+2
|\ \ | |/ | | | | | | | | | | this is the correct API." into ics-mr1 * commit 'ea54d0dc0dfeef5560fea04667804413d522025f': Hide ManagedEGLContext until we are sure this is the correct API.
| * Hide ManagedEGLContext until we are sure this is the correct API.Romain Guy2011-11-211-0/+2
| | | | | | | | Change-Id: If54942d342ca8ea348e10231b2aed3e5d3bd701b
* | am c26e4d18: am 8cd39e3a: Merge "Notify views when EGL resources are about ↵Romain Guy2011-11-211-3/+2
|\ \ | |/ | | | | | | | | | | to be destroyed Bug #5639899" into ics-mr1 * commit 'c26e4d18a20ab0b3e769fb3e547994f1c27d6713': Notify views when EGL resources are about to be destroyed Bug #5639899
| * Merge "Notify views when EGL resources are about to be destroyed Bug ↵Romain Guy2011-11-211-3/+2
| |\ | | | | | | | | | #5639899" into ics-mr1
| | * Notify views when EGL resources are about to be destroyedRomain Guy2011-11-211-3/+2
| | | | | | | | | | | | | | | | | | Bug #5639899 Change-Id: I7c5d8bebf02294426f5b3ab1358a31c38a4fd064
* | | am 8b8c321c: am b8d20d02: Merge "EGL: Use cache sizes defined in the ↵Jamie Gennis2011-11-212-3/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | BoardConfig" into ics-mr1 * commit '8b8c321c70687ace750e42b745b6e96258d739cd': EGL: Use cache sizes defined in the BoardConfig
| * | Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1Jamie Gennis2011-11-212-3/+18
| |\ \
| | * | EGL: Use cache sizes defined in the BoardConfigJamie Gennis2011-11-212-3/+18
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces two new BoardConfig variables to control the size limits of the EGL blob cache. MAX_EGL_CACHE_ENTRY_SIZE is the size limit for values inserted into the cache, and MAX_EGL_CACHE_SIZE is the size limit for all entries in the entire cache (including both keys and values). If either of these BoardConfig variables are not defined then a default size limit is used instead. Change-Id: I6703d93f966b6389c6499f23d841e42339f9c9d7
* | | am c2597295: am 53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ↵Jamie Gennis2011-11-211-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'c25972950c2ea62fb085524dbe737c2bf0f08f4a': SurfaceTexture: fix a couple tests EGL: default to swap interval 1 SurfaceTexture: clean up some tests
| * | EGL: default to swap interval 1Jamie Gennis2011-11-211-0/+5
| |/ | | | | | | | | | | | | This change explicitly sets swap interval 1 on the window when an EGLSurface is created to render to it. Change-Id: I91eb29dbee3ae4a55076b921f084d503fbe94e03
* | am e2fca63a: am c8fd6e30: Merge "EGL: fix blob cache extension detection" ↵Jamie Gennis2011-11-181-1/+1
|\ \ | |/ | | | | | | | | | | into ics-mr1 * commit 'e2fca63a18c7bd3fb0c14e1c5dc391cd699cea9f': EGL: fix blob cache extension detection
| * Merge "EGL: fix blob cache extension detection" into ics-mr1Jamie Gennis2011-11-171-1/+1
| |\
| | * EGL: fix blob cache extension detectionJamie Gennis2011-11-171-1/+1
| | | | | | | | | | | | | | | Bug: 5474671 Change-Id: I6359063ccf23f076fc84c80b8a2f6731a65eef18
* | | am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into ics-mr1Jamie Gennis2011-11-182-1/+9
|\ \ \ | |/ / | | | | | | | | | * commit '0272e60060162d2c32aec02d9cd1414dbbe14782': GLES: add image external enums
| * | Merge "GLES: add image external enums" into ics-mr1Jamie Gennis2011-11-172-1/+9
| |\ \
| | * | GLES: add image external enumsJamie Gennis2011-11-152-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds Java definitions for the enums of the GL_OES_EGL_image_external OpenGL ES extension. Bug: 3482193 Change-Id: Ib50326f8be9b9cc9021753855c3846ddcdc5eaa2
* | | | am 2030d78d: am 8fc3540f: Merge "be a bit more defensive when parsing ↵Mathias Agopian2011-11-171-9/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | extension strings" into ics-mr1 * commit '2030d78dc9c20d2f561f4b11f1a1adddb63661c6': be a bit more defensive when parsing extension strings
| * | | be a bit more defensive when parsing extension stringsMathias Agopian2011-11-161-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | hopefully this will fix a crash in the emulator. Bug: 5624674 Change-Id: I96586e29ea20efd73c4ad50870df5b7368bf3c3b
* | | | Merge "Fix potential GLThread / GLSurfaceView memory leak."Jack Palevich2011-11-171-51/+105
|\ \ \ \
| * | | | Fix potential GLThread / GLSurfaceView memory leak.Jack Palevich2011-11-151-51/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now a leak was possible under the following scenario: Create a GLSurfaceView Register a renderer (this automatically starts a GLThread). Discard the GLSurfaceView without installing it in the view system. This scenario can occur when a device is rotated rapidly from orientation A to orientation B to orientation C. In that scenario, orientation B's GLSurfaceView might be discarded without ever being attached to a window. If this issue had been identified before GLSurfaceView had clients, one possible fix would have been to delay the construction of the GLThread until the GLSurfaceView was attached to a window. Unfortunately, it's too late, and so making that change would lead to observable changes in behavior, possibly breaking some clients. Instead, fixed by making GLThread and EGLHelper static classes that hold onto a weak reference to the GLSurfaceView. This allows the GLSurfaceView to be garbage collected when it is no longer used, even if the GLThread is active. GLSurfaceView's finalize method will manually stop the GLThread if it is still running when the GLSurfaceView exits. Part of this change was to remove the Renderer reference from GLThread, because Renderer is a user-supplied class that could contain a reference chain that points back to the GLSurfaceView. Fixes b/5606613 "GLSurfaceView that's never added to a window will leak threads and views, can leak activities" Change-Id: Iafdc329eb6e9e40062358e7c119f5547ffe23d5e