summaryrefslogtreecommitdiffstats
path: root/opengl/java
Commit message (Collapse)AuthorAgeFilesLines
...
* am 74befcc7: am 981ccfbb: Implement Matrix Palette extension.Jack Palevich2009-12-101-14/+13
|\ | | | | | | | | | | | | Merge commit '74befcc7fd721ca34f60bf75e18ce6faaab37aef' * commit '74befcc7fd721ca34f60bf75e18ce6faaab37aef': Implement Matrix Palette extension.
| * Implement Matrix Palette extension.Jack Palevich2009-12-095-47/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for formerly-unimplemented methods: glCurrentPaletteMatrixOES glLoadPaletteFromModelViewMatrixOES glMatrixIndexPointerOES glWeightPointerOES The bulk of the changes are related to implementing the two PointerOES methods, which are implemented pretty much the same way as the existing Pointer methods were implemented. This change also changes the way glPointSizePointerOES is implemented, making it act like all the other Pointer methods. (Previously it was not handling non-direct-buffer arguments correctly.) Fixes bug 2308625 "Support matrix palette skinning in JSR239 and related APIs" Also updated GLLogWraper to fix two bugs in GLLogWrapper that were discovered while testing matrix palette skinning support: a) Handle trying to print the contents of null-but-enabled buffers. (It's not legal to draw with null-but-enabled buffers, and in fact some OpenGL drivers will crash if you try to render in this state, but there's no reason the GLLogWrapper should crash while trying to debug this situation. b) Don't read off the end of a vertex buffer with non-zero position when printing the entire contents of the vertex buffer. Now we only print from the current position to the end of the buffer.
* | resolved conflicts for merge of fac57636 to masterJack Palevich2009-12-101-13/+14
|\ \ | |/
| * Unhide the Android OpenGL ES 2.0 APIJack Palevich2009-12-094-65/+91
| | | | | | | | | | | | Add a Matrix.setLookAtM method for computing a look-at viewing transform. Change GLU.lookAt to use Matrix.setLook.
| * Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 contextJack Palevich2009-12-091-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a new method, GLSurfaceView.setEGLContextClientVersion. Clients call this method to define which level of OpenGL ES support they want. This method only affects the default behavior of GLSurfaceView. If clients have supplied their own EGLContextFactory or EGLConfigChooser then they are on their own if they want to create an OpenGL ES 2.0 context. This API is currently hidden. Update the gl2_java test to use this new API. Update the gl2_java test's AndroidManifest.xml file to indicate that it requires OpenGL ES 2.0.
| * Add a Java API for OpenGL ES 2.0.Jack Palevich2009-12-091-0/+1858
| | | | | | | | | | | | Currently this API is hidden. Add a test program.
* | Merge change Ibe6eac82Android (Google) Code Review2009-12-085-47/+183
|\ \ | | | | | | | | | | | | * changes: Implement Matrix Palette extension.
| * | Implement Matrix Palette extension.Jack Palevich2009-12-085-47/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for formerly-unimplemented methods: glCurrentPaletteMatrixOES glLoadPaletteFromModelViewMatrixOES glMatrixIndexPointerOES glWeightPointerOES The bulk of the changes are related to implementing the two PointerOES methods, which are implemented pretty much the same way as the existing Pointer methods were implemented. This change also changes the way glPointSizePointerOES is implemented, making it act like all the other Pointer methods. (Previously it was not handling non-direct-buffer arguments correctly.) Fixes bug 2308625 "Support matrix palette skinning in JSR239 and related APIs" Also updated GLLogWraper to fix two bugs in GLLogWrapper that were discovered while testing matrix palette skinning support: a) Handle trying to print the contents of null-but-enabled buffers. (It's not legal to draw with null-but-enabled buffers, and in fact some OpenGL drivers will crash if you try to render in this state, but there's no reason the GLLogWrapper should crash while trying to debug this situation. b) Don't read off the end of a vertex buffer with non-zero position when printing the entire contents of the vertex buffer. Now we only print from the current position to the end of the buffer.
* | | am 9196034b: am 30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2Jack Palevich2009-12-072-18/+45
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Merge commit '9196034b84c48844799a2904ef3ce31f18ee748e' * commit '9196034b84c48844799a2904ef3ce31f18ee748e': Improve error message thrown when eglCreateContext fails. Improve error reporting by always returning the public
| * Improve error message thrown when eglCreateContext fails.Jack Palevich2009-12-041-1/+1
| |
| * Improve error reporting by always returning the publicJack Palevich2009-12-041-17/+44
| | | | | | | | | | | | | | | | | | | | EGL10.EGL_NO_XXX objects for displays, surfaces, and contexts. This allows clients to compare the returned object against the public EGL10.EGL_NO_XXX object using a simple == operation. This fixes bug 2303947 "Java layer EGL API makes it difficult to tell when certain methods have failed"
| * the vertex index should be "first + i".Li Wenhao2009-12-021-1/+1
| |
* | Unhide the Android OpenGL ES 2.0 APIJack Palevich2009-11-274-65/+91
| | | | | | | | | | | | Add a Matrix.setLookAtM method for computing a look-at viewing transform. Change GLU.lookAt to use Matrix.setLook.
* | am 85a9498a: am 9c0b39c4: am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich2009-11-251-2/+6
|\ \ | | | | | | | | | | | | | | | | | | Merge commit '85a9498a2f33d62a4313a3561b5468456974696e' * commit '85a9498a2f33d62a4313a3561b5468456974696e': Improve the exception message text by including eglGetError().
| * \ am 9c0b39c4: am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich2009-11-251-2/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '9c0b39c47efade5ee2303a8f8ffbd9cf87c2c841' into eclair-mr2-plus-aosp * commit '9c0b39c47efade5ee2303a8f8ffbd9cf87c2c841': Improve the exception message text by including eglGetError().
| | * am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich2009-11-251-2/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-mr2 * 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
* | | | Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 contextJack Palevich2009-11-191-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a new method, GLSurfaceView.setEGLContextClientVersion. Clients call this method to define which level of OpenGL ES support they want. This method only affects the default behavior of GLSurfaceView. If clients have supplied their own EGLContextFactory or EGLConfigChooser then they are on their own if they want to create an OpenGL ES 2.0 context. This API is currently hidden. Update the gl2_java test to use this new API. Update the gl2_java test's AndroidManifest.xml file to indicate that it requires OpenGL ES 2.0.
* | | | Add a Java API for OpenGL ES 2.0.Jack Palevich2009-11-191-0/+1858
| | | | | | | | | | | | | | | | | | | | | | | | Currently this API is hidden. Add a test program.
* | | | am 8d0e1472: am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2Jack Palevich2009-11-171-133/+129
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '8d0e14723312a9f8286ba95cc559ee000eab1b82' * commit '8d0e14723312a9f8286ba95cc559ee000eab1b82': More GLSurfaceView cleanup.
| * | | am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2Jack Palevich2009-11-161-133/+129
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'a822f02bb9c7f5bf2e3fa3cb63effc391be158c5' into eclair-mr2-plus-aosp * commit 'a822f02bb9c7f5bf2e3fa3cb63effc391be158c5': More GLSurfaceView cleanup.
| | * | resolved conflicts for merge of dc49acb0 to eclair-mr2Jack Palevich2009-11-171-133/+129
| | |\ \ | | | |/
| | | * 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 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
| |
generated by cgit v1.1 at 2025-08-04 00:50:51 +0000