summaryrefslogtreecommitdiffstats
path: root/opengl/java
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am 99cf71b0: am 83536cee: Merge change I1179efbb into eclair-mr2Jack Palevich2009-11-101-139/+158
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '99cf71b0856e00c1ae9631db91702349cceb9bf8' * commit '99cf71b0856e00c1ae9631db91702349cceb9bf8': Fix multi-lock ordering issues in GLSurfaceView
| * | | am 83536cee: Merge change I1179efbb into eclair-mr2Jack Palevich2009-11-101-139/+158
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '83536cee2b2b5445c5ba0b22531c23890b82da41' into eclair-mr2-plus-aosp * commit '83536cee2b2b5445c5ba0b22531c23890b82da41': Fix multi-lock ordering issues in GLSurfaceView
| | * | resolved conflicts for merge of ba56915a to eclair-mr2Jack Palevich2009-11-111-139/+158
| | |\ \ | | | |/
| | | * Fix multi-lock ordering issues in GLSurfaceViewJack Palevich2009-11-101-121/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were potential deadlocks between the per-GLThread monitors and the GLThreadManager monitor. To avoid these deadlocks we now use a single monitor for both the GLThreadManager state and the per-GLThread state. Converted GLThreadManager's semaphore into the equivalent synchronized-wait-notifyAll code. This enables us to wait for either mDone, or user events, or the EGL surface with a single "wait()". Simplified the logic used to acquire and release the EGL surface. The EGL surface is now only requested while the surfaceFlinger surface is acquired. Removed the "egl surface stealing" policy we had recently inserted. It's not needed now that we reliably quit when requested. Pulled user event processing outside of the GLThreadManager monitor so that we don't call any potentially-long-running code while inside the monitor. This should help with bug 2228262.
* | | | am 73ae27f0: am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2Jack Palevich2009-11-091-36/+54
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad' * commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad': Allow a GLThread to release and reacquire the EGL Surface as needed.
| * | | am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2Jack Palevich2009-11-091-36/+54
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '8da3ac92a6a6247ef06de4d4b684f8635d8fc003' into eclair-mr2-plus-aosp * commit '8da3ac92a6a6247ef06de4d4b684f8635d8fc003': Allow a GLThread to release and reacquire the EGL Surface as needed.
| | * | resolved conflicts for merge of 3f857b78 to eclair-mr2Jack Palevich2009-11-101-36/+54
| | |\ \ | | | |/
| | | * Allow a GLThread to release and reacquire the EGL Surface as needed.Jack Palevich2009-11-081-32/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently only allow one GLThread to have an active EGL Surface at a time.(This may be lifted in the future, when EGL and GL are reentrant.) Prior to this change we would enforce this rule by having older GLThreads quit when a new GLThread started. That had the drawback of leaving the older GLSurfaceViews in a zombie state -- their GLThreads would be gone. We now enforce this rule by just releasing and reacquiring the EGL surface context as needed. Specific changes to the code: created private helper methods - startEgl and stopEgl to help manage starting and stopping EGL. Move the calls to sGLThreadManager start and end from the outermost run method into the startEgl / stopEgl methods. Reworked the wait loop to handle starting and stopping EGL as needed. needToWait() gets simpler -- just looks at current status. sGLThreadManager.shouldQuit was replaced by shouldHaveEgl. This is another step in fixing bug 2228262.
* | | | am e54f267f: am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2Jack Palevich2009-11-061-7/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'e54f267f06e86f9c1248742fc56967355721a4e7' * commit 'e54f267f06e86f9c1248742fc56967355721a4e7': Fix stupid bug in GLThreadManager implementation.
| * | | am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2Jack Palevich2009-11-061-7/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76' into eclair-mr2-plus-aosp * commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76': Fix stupid bug in GLThreadManager implementation.
| | * | resolved conflicts for merge of 4e3fadd0 to eclair-mr2Jack Palevich2009-11-061-7/+8
| | |\ \ | | | |/
| | | * Fix stupid bug in GLThreadManager implementation.Jack Palevich2009-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code intended to copy the old value of a field, before the field was updated. However, what the code was actually doing was copying the new value of the field, after the field was updated. The fix was to move the copy to before the update. This is work towards fixing bug 2228262
* | | | am a9e47546: am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2Jack Palevich2009-11-061-24/+79
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'a9e47546a5132b30a2ed1e24d9193d4db09ef323' * commit 'a9e47546a5132b30a2ed1e24d9193d4db09ef323': Improve GLSurfaceView to avoid deadlocks and race conditions.
| * | | am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2Jack Palevich2009-11-061-24/+79
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '79447b2087c8c820d742185dda7305101f9656f0' into eclair-mr2-plus-aosp * commit '79447b2087c8c820d742185dda7305101f9656f0': Improve GLSurfaceView to avoid deadlocks and race conditions.
| | * | resolved conflicts for merge of 84872738 to eclair-mr2Jack Palevich2009-11-061-24/+79
| | |\ \ | | | |/
| | | * Improve GLSurfaceView to avoid deadlocks and race conditions.Jack Palevich2009-11-061-12/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is work towards fixing bug 2228262 Specific issues fixed by this change: + GLThread names now include the thread id, making it easier to tell one GLThread from another. + A private final static boolean LOG_THREADS can be set to true at compile time to print out thread-related trace information, helpful for debugging GLSurfaceView behavior. This static defaults to "false". + Changed calls to "notify" to "notifyAll" to make the code more robust in case more than two threads are blocked on the same monitor. + Add a GLThreadManager to help manage the transition to a new GLThread. Currently only one GLThread can be active in an address space. When the second thread starts up, the GLThreadManager helps the old GLThread to shut down, + Make sure we stop waiting for dead GLThreads. This is done by adding checks for a variable mDone being true to our monitor wait loops. And we use a "finally" clause at the end of GLThread.run() method to set mDone and notifyAll any wait loops.
* | | | am 70d12dda: am 3743559d: Merge change I28023911 into eclair-mr2Jack Palevich2009-10-131-4/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '70d12dda7c1e36850e1ed95d719bc1d6dadb6fef' * commit '70d12dda7c1e36850e1ed95d719bc1d6dadb6fef': Add additional error checking of EGL function calls.
| * | | am 3743559d: Merge change I28023911 into eclair-mr2Jack Palevich2009-10-131-4/+15
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '3743559db03645ef7d319c0344238c335a315b65' into eclair-mr2-plus-aosp * commit '3743559db03645ef7d319c0344238c335a315b65': Add additional error checking of EGL function calls.
| | * | Add additional error checking of EGL function calls.Jack Palevich2009-10-131-4/+15
| | | |
* | | | am 98a51b86: am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2Jack Palevich2009-10-131-8/+55
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '98a51b86869e9cf2a1624f8540c4c126962a3a85' * commit '98a51b86869e9cf2a1624f8540c4c126962a3a85': Allow multiple OpenGL contexts on systems that support them.
| * | | am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2Jack Palevich2009-10-131-8/+55
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '3b7a1e6d70fda4ce834034930847fe2cc75de515' into eclair-mr2-plus-aosp * commit '3b7a1e6d70fda4ce834034930847fe2cc75de515': Allow multiple OpenGL contexts on systems that support them.
| | * | Allow multiple OpenGL contexts on systems that support them.Jack Palevich2009-10-131-8/+55
| | |/ | | | | | | | | | Previously we always restricted the number of OpenGL contexts to 1.
* | | Implement GL11 and GL11Ext methods for GL Log and Error wrappers.Jack Palevich2009-10-123-526/+958
|/ / | | | | | | | | | | | | | | | | Until now we had been throwing UnsupportedOperationException when developers tried to use the GL11 or GL11Ext methods. Now we handle these methods correctly, passing their arguments through to the wrapped interface's methods. Fixes bug 2167522 GLUtils debug wrapper doesn't support GL11 features
* | am 07e0dce4: Merge change 27202 into eclairJack Palevich2009-09-251-4/+12
|\ \ | |/ | | | | | | | | | | Merge commit '07e0dce441ea056710efd76d7df18b8833de772a' into eclair-plus-aosp * commit '07e0dce441ea056710efd76d7df18b8833de772a': Check for failure to create EGL surfaces and contexts.
| * Check for failure to create EGL surfaces and contexts.Jack Palevich2009-09-251-4/+12
| |
* | am b87f24a6: Merge change 26908 into eclairJack Palevich2009-09-241-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit 'b87f24a6a88a994256ca97b69904af28824bc9ce' into eclair-plus-aosp * commit 'b87f24a6a88a994256ca97b69904af28824bc9ce': Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory.
| * Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory.Jack Palevich2009-09-241-1/+1
| |
* | am 1267b0e1: Merge change 26882 into eclairJack Palevich2009-09-241-4/+0
|\ \ | |/ | | | | | | | | | | Merge commit '1267b0e1844ac802de92b203007513573e4886fd' into eclair-plus-aosp * commit '1267b0e1844ac802de92b203007513573e4886fd': Publish minor additions to GLSurfaceView API.
| * Publish minor additions to GLSurfaceView API.Jack Palevich2009-09-241-4/+0
| | | | | | | | | | Clients can now modify the way that the EGL context and the EGL window surface are created and destroyed.
* | am 311ed019: Merge change 26679 into eclairJack Palevich2009-09-231-2/+2
|\ \ | |/ | | | | | | | | | | Merge commit '311ed0191d6423e41b1cf5137a38e53504494818' into eclair-plus-aosp * commit '311ed0191d6423e41b1cf5137a38e53504494818': Create samples showing how to call OpenGL from JNI libraries.
| * Create samples showing how to call OpenGL from JNI libraries.Jack Palevich2009-09-231-2/+2
| |
* | am 1167b43c: Merge change 26317 into eclairJack Palevich2009-09-211-94/+184
|\ \ | |/ | | | | | | | | | | Merge commit '1167b43c3d1ca232c9b4e0a75343b6b3cb90f0df' into eclair-plus-aosp * commit '1167b43c3d1ca232c9b4e0a75343b6b3cb90f0df': Allow GLSurfaceView clients to customize EGL Surfaces and Contexts.
| * Allow GLSurfaceView clients to customize EGL Surfaces and Contexts.Jack Palevich2009-09-211-94/+184
| | | | | | | | This API is hidden for now, will expose once it's been tested more.
* | am 5222a957: Merge change 26270 into eclairJack Palevich2009-09-211-1/+26
|\ \ | |/ | | | | | | | | | | Merge commit '5222a9571ea2538c989608d376ac71eabe0f09d4' into eclair-plus-aosp * commit '5222a9571ea2538c989608d376ac71eabe0f09d4': Fix GLSurfaceView to sync surfaceDestroyed with GL rendering thread
| * Fix GLSurfaceView to sync surfaceDestroyed with GL rendering threadJack Palevich2009-09-211-1/+26
| | | | | | | | | | | | Until now we had a race condition where the GL rendering thread could continue rendering a frame after we have returned from the SurfaceHolder.Callback.surfaceDestroyed notification.
* | merge from open-source masterJean-Baptiste Queru2009-09-011-1/+1
|\ \ | |/ |/|
| * Merge change 10840Android Code Review2009-08-251-1/+1
| |\ | | | | | | | | | | | | * changes: the vertex index should be "first + i".
| | * the vertex index should be "first + i".Li Wenhao2009-07-291-1/+1
| | |
| * | donut snapshotJean-Baptiste Queru2009-07-211-3/+30
| | |
| * | donut snapshotJean-Baptiste Queru2009-05-206-110/+3267
| |/
| * AI 145249: Correct misspelling of constant RENDERMODE_CONTUOUSLY --> ↵Jack Palevich2009-04-081-9/+9
| | | | | | | | | | | | | | | | RENDERMODE_CONTINUOUSLY BUG=1766678 Automated import of CL 145249
| * AI 145244: Fully document GLSurfaceView and related classes.Jack Palevich2009-04-081-51/+349
| | | | | | | | | | | | BUG=1766685 Automated import of CL 145244
| * Automated import from //branches/cupcake/...@142485,142485Jack Palevich2009-03-241-20/+194
| |
| * Automated import from //branches/cupcake/...@141857,141857Jack Palevich2009-03-241-31/+23
| |
* | fix a bug in ComponentSizeChooser where it could pick a software EGLConfig ↵Mathias Agopian2009-08-201-15/+17
| | | | | | | | | | | | instead of a better h/w one. We now just try to honor the stencil / depth buffer "at least", while doing a "shortest distance" on the colors.
* | Surface::GPU and Surface::HARDWARE are now deprecated; they will be set ↵Mathias Agopian2009-08-131-1/+0
| | | | | | | | | | | | automatically if needed. this also ripples into the window manager API by making some constant there deprecated as well.
* | Remove recently-added android.opengl.Version APIJack Palevich2009-07-221-47/+0
| | | | | | | | | | | | There's another already-existing way of obtaining this information, the ConfigurationInfo.reqGlEsVersion field returned from ActivityManager.getDeviceConfigurationInfo.
* | Add a public API that reports the supported OpenGLES API level.Jack Palevich2009-07-221-0/+47
| |
* | Allow pre-Donut apps to use indirect Buffers in GL11 Pointer methods.Jack Palevich2009-06-151-3/+30
| | | | | | | | | | | | | | | | Apps targeting Donut and newer will throw an exception. We use a heuristic to determine whether an app is pre-Donut or not: We take the address space's __progname, and use that as the application's package name. For simple applications this is correct.
* | Require native-order direct buffers for glXXXPointer APIs.Jack Palevich2009-05-072-54/+54
| | | | | | | | | | | | | | | | | | | | This was always a documented restriction, but was not enforced by the runtime until now. Until now, if you passed in some other kind of buffer, it would sometimes work, and sometimes fail. The failures happened when the Java VM moved the buffer data while OpenGL was still holding a pointer to it. Now we throw an exception rather than leaving the system in a potentially bad state.
generated by cgit v1.1 at 2025-07-06 12:14:49 +0000