summaryrefslogtreecommitdiffstats
path: root/opengl/java/android
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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-05-205-83/+3240
| |/
| * 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
| |
* | Require native-order direct buffers for glXXXPointer APIs.Jack Palevich2009-05-071-27/+27
| | | | | | | | | | | | | | | | | | | | 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.
* | Enable static Java APIs for OpenGL ES 1.1 extensions.Jack Palevich2009-04-241-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is just plumbing. The Java APIs existed already, but there were no C APIs to hook the Java APIs up to. Now there are C APIs, so we can call them. Of course, whether or not the C APIs actually work when you call them depend upon the capabilities of the active OpenGL driver, which must be checked at run time. Also, while we're here, make the glGetString method static. It was always supposed to be static, but was accidentally implemented as non-static, because the code was copied from the non-static OpenGL ES classes.
* | Add an Android-specific static OpenGL ES 1.1 Java API.Jack Palevich2009-04-164-0/+3163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds four new public classes that expose a static OpenGL ES 1.1 API: android.opengl.GLES10 android.opengl.GLES10Ext android.opengl.GLES11 android.opengl.GLES11Ext Benefits: + The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API. + The static API is similar to the C API, which should make it easier to import C-based example code. + The static API provides a clear path for adding new OpenGL ES 1.1 extensions and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard. Example: import static android.opengl.GLES10.*; ... glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); Note that it is possible to mix-and-match calls to both the static and JSR239 APIs. This works because neither API maintains state. They both call through to the same underlying C OpenGL ES APIs. Implementation details: This change enhances the "glgen" "gen" script to generate both the original JSR239 and new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before, so there is no need to check in new versions of the generated JSR239 classes. As part of this work the gen script was updated to be somewhat more robust, and to work with git instead of perforce. The script prints out commands to git add the generated files, but leaves it up to the script runner to actually execute those commands.
* | AI 145526: am: CL 145249 Correct misspelling of constant ↵Jack Palevich2009-04-091-9/+9
| | | | | | | | | | | | | | | | | | RENDERMODE_CONTUOUSLY --> RENDERMODE_CONTINUOUSLY Original author: jackpal Merged from: //branches/cupcake/... Automated import of CL 145526
* | AI 145523: am: CL 145244 Fully document GLSurfaceView and related classes.Jack Palevich2009-04-091-51/+349
| | | | | | | | | | | | | | Original author: jackpal Merged from: //branches/cupcake/... Automated import of CL 145523
* | Automated import from //branches/donutburger/...@142687,142687Jack Palevich2009-03-251-83/+88
| |
* | Automated import from //branches/donutburger/...@142486,142486Jack Palevich2009-03-241-20/+194
| |
* | Automated import from //branches/donutburger/...@141859,141859Jack Palevich2009-03-241-31/+23
|/
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0316-0/+7759
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0316-7757/+0
|
* auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-032-30/+28
|
* auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-022-28/+30
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-173-9/+669
|
* Initial ContributionThe Android Open Source Project2008-10-2115-0/+7097