summaryrefslogtreecommitdiffstats
path: root/opengl/java
Commit message (Collapse)AuthorAgeFilesLines
* am e3449553: Merge change I49c9a3a3 into eclairJack Palevich2009-12-221-0/+29
|\ | | | | | | | | | | | | Merge commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e' into eclair-plus-aosp * commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e': Fix bug 2325244 screen turns black for a brief period of time
| * Fix bug 2325244 screen turns black for a brief period of timeJack Palevich2009-12-221-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was a black first frame when creating a surface, or a garbage frame when the surface was resized. The cause was lack of synchronization between the render thread and the UI thread. The UI thread would typically return before the render thread had a chance to draw its first frame. The fix was to make the UI thread wait until at least one frame had been rendered by the rendering thread. The waiting is done in the surfaceChanged method because we know that surfaceChanged will be called in both the surface created and surface changed cases.
* | am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich2009-11-251-2/+6
|\ \ | |/ | | | | | | | | | | Merge commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-plus-aosp * commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5': Improve the exception message text by including eglGetError().
| * Improve the exception message text by including eglGetError().Jack Palevich2009-11-251-2/+6
| | | | | | | | Should help us track down the cause of bug 2285187
* | am dc49acb0: Merge change Ica8c305a into eclairJack Palevich2009-11-161-134/+125
|\ \ | |/ | | | | | | | | | | Merge commit 'dc49acb0289cab2a6e0d73e66b69516605893e28' into eclair-plus-aosp * commit 'dc49acb0289cab2a6e0d73e66b69516605893e28': More GLSurfaceView cleanup.
| * More GLSurfaceView cleanup.Jack Palevich2009-11-161-134/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + The mDone flag is now a pair of flags: mShouldExit and mExited. The problem with mDone was that it meant "had been asked to exit", but was being used by some observers as "had exited". Using two variables means that observers can observe either "had been asked to exit" or "had exited", as they prefer. + Simplyify where we check for mShouldExit. We now check for it at the top of our innermost guardedRun while loop. + requestExitAndWait now waits for mExited to be set to true to know that a thread has exited, rather than using join(). This means we can use wait() for the check, which releases the sGLThreadManager monitor, avoiding a potential deadlock. + move the event queue into the sGLThreadManager monitor. This avoids having to acquire two locks in order to enque/deque events, which also avoids the potential for lock ordering deadlocks. + Simplify the event dequeueing code. We now deque one event each time through the main GLSurfaceView loop. Events still have priority over rendering, so there isn't any semantic change, it just cleans up the code. + Avoid trying to acquire an egl Surface if we're paused. + To simplify reasoning about the code, call sGLThreadManager.notifyAll() in every case where we modify one of the variables that's protected by the sGLThreadManager monitor. It would be slightly more efficient to only notify when we change variables that could cause a thread to wait(), but then we would have to redo our analysis every time we change any code. + Clean up the logic for creating the EGL surface and then calling the renderer's onSurfaceCreated / onSurfaceChanged methods. + Implement work-around for bug 2263168 "Need to draw twice after screen rotation..."
* | am ba56915a: Merge change Ie806ae6f into eclairJack Palevich2009-11-101-121/+144
|\ \ | |/ | | | | | | | | | | Merge commit 'ba56915a71cad672baff5594dbb7c9331bf01283' into eclair-plus-aosp * commit 'ba56915a71cad672baff5594dbb7c9331bf01283': Fix multi-lock ordering issues in GLSurfaceView
| * 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 3f857b78: Merge change I32d41651 into eclairJack Palevich2009-11-091-32/+46
|\ \ | |/ | | | | | | | | | | Merge commit '3f857b78fc68e5d700139bdc6078c5333b62a9bc' into eclair-plus-aosp * commit '3f857b78fc68e5d700139bdc6078c5333b62a9bc': Allow a GLThread to release and reacquire the EGL Surface as needed.
| * 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 4e3fadd0: Merge change Ia4424950 into eclairJack Palevich2009-11-061-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '4e3fadd0c99d2774709a067e017d8fd622440f0e' into eclair-plus-aosp * commit '4e3fadd0c99d2774709a067e017d8fd622440f0e': Fix stupid bug in GLThreadManager implementation.
| * 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 84872738: Merge change I971f6fd3 into eclairJack Palevich2009-11-051-12/+74
|\ \ | |/ | | | | | | | | | | Merge commit '84872738f291faf25ae07235cde382d38c796567' into eclair-plus-aosp * commit '84872738f291faf25ae07235cde382d38c796567': Improve GLSurfaceView to avoid deadlocks and race conditions.
| * 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 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.
* | 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-0335-0/+12549
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0335-12547/+0
|