summaryrefslogtreecommitdiff
path: root/opengl/java/android
AgeCommit message (Collapse)Author
2010-03-23GLSurfaceView: Log egl failuresJack Palevich
Decode the EGL error code when throwing exceptions.
2010-03-15Improve eglSwapBuffers error handling.Jack Palevich
We now distinguish EGL_CONTEXT_LOST errors from other kinds of errors. We return "true" if the swap completes successfully, "false" if the swap fails due to EGL_CONTEXT_LOST, and throw a RuntimeException if the swap fails due to any other cause. If eglSwapBuffers succeeds, we now avoid calling eglGetError at all, which means we avoid clearing any EGL errors that might already have been pending before eglSwapBuffers is called.
2010-03-11Add correct copyright headers to multiple filesKenny Root
Format for the list of changes shows the origin commit reference followed by the file name. 33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java 33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java 133776-p9 core/java/android/app/IntentService.java 127013-p9 core/java/android/appwidget/AppWidgetHost.java 27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java 60765-p9 core/java/android/content/SyncResult.java 43920-p9 core/java/android/content/pm/ActivityInfo.java 43920-p9 core/java/android/content/pm/ApplicationInfo.java 43920-p9 core/java/android/content/pm/InstrumentationInfo.java 43920-p9 core/java/android/content/pm/PackageInfo.java 44103-p9 core/java/android/content/pm/PackageItemInfo.java 68960-p9 core/java/android/content/pm/PackageStats.java 43920-p9 core/java/android/content/pm/ResolveInfo.java 43920-p9 core/java/android/content/pm/ServiceInfo.java 60641-p9 core/java/android/content/res/Configuration.java 60734-p9 core/java/android/content/res/TypedArray.java 137672-p9 core/java/android/inputmethodservice/ExtractButton.java 123112-p9 core/java/android/inputmethodservice/ExtractEditText.java 119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java 112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java 115078-p9 core/java/android/os/BatteryStats.java 124790-p9 core/java/android/text/style/UpdateAppearance.java 45083-p9 core/java/android/view/RawInputEvent.java 101491-p9 core/java/android/view/inputmethod/EditorInfo.java 114701-p9 core/java/android/view/inputmethod/ExtractedText.java 123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java 119291-p9 core/java/com/android/internal/os/HandlerCaller.java 129279-p9 core/java/com/android/internal/os/PkgUsageStats.java 114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java 114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java 84364-p9 opengl/java/android/opengl/EGLLogWrapper.java 11355-p9 opengl/tools/glgen/src/CFunc.java 11355-p9 opengl/tools/glgen/src/CType.java 11355-p9 opengl/tools/glgen/src/CodeEmitter.java 11355-p9 opengl/tools/glgen/src/GenerateGL.java 11355-p9 opengl/tools/glgen/src/JFunc.java 11355-p9 opengl/tools/glgen/src/JType.java 11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java 11355-p9 opengl/tools/glgen/src/ParameterChecker.java 57236-p9 services/java/com/android/server/status/AnimatedImageView.java 66754-p9 services/java/com/android/server/status/CloseDragHandle.java 57188-p9 services/java/com/android/server/status/DateView.java 46928-p9 services/java/com/android/server/status/ExpandedView.java 70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java 45968-p9 services/java/com/android/server/status/IconData.java 57470-p9 services/java/com/android/server/status/IconMerger.java 82719-p9 services/java/com/android/server/status/LatestItemView.java 45968-p9 services/java/com/android/server/status/NotificationData.java 66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java 57458-p9 services/java/com/android/server/status/NotificationViewList.java 45968-p9 services/java/com/android/server/status/StatusBarException.java 45968-p9 services/java/com/android/server/status/StatusBarIcon.java 46130-p9 services/java/com/android/server/status/StatusBarNotification.java 45968-p9 services/java/com/android/server/status/StatusBarView.java 46199-p9 services/java/com/android/server/status/Ticker.java 62286-p9 services/java/com/android/server/status/TickerView.java 57188-p9 services/java/com/android/server/status/TrackingView.java 86041-p9 telephony/java/android/telephony/PhoneStateListener.java 87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java 136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java 34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java 55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java 127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java 129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java 25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java 46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java 77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java 9788976b1465ce982b5ae7c741345edd0ecd9322 core/java/android/accounts/AuthenticatorDescription.java 53332883543868fb83e111a07306368b7772b340 core/java/android/app/UiModeManager.java 93e7e22ec91dbc641d10ca6d70423e1357a95bba core/java/android/app/FullBackupAgent.java 328c0e7986aa6bb7752ec6de3da9c999920bb55f core/java/android/content/CursorEntityIterator.java 307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncQueue.java 307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncOperation.java eb034652c2037a47ebfd99779e8383bb8bb528af core/java/android/content/pm/LabeledIntent.java 49237345d83e62fdb9eb8d50b13ad086636a04fa core/java/android/content/pm/FeatureInfo.java a2b6c3775ed6b8924232d6a01bae4a19740a15f8 core/java/android/content/pm/PackageInfoLite.java 3ecd5f437580e49d80beecd29489d5fb1f7a7db0 core/java/android/content/pm/RegisteredServicesCacheListener.java 5ebbb4a6b3e16f711735ae0615b9a9ea64faad38 core/java/android/content/pm/XmlSerializerAndParser.java c4516a7b62de525e3d6d5e76851bdfaf12c11f05 core/java/android/database/sqlite/SQLiteTransactionListener.java 9bbc21a773cbdfbef2876a75c32bda5839647751 core/java/com/android/internal/backup/LocalTransport.java 21f1bd17b2dfe361acbb28453b3f3b1a110932fa core/java/com/android/internal/content/PackageMonitor.java 4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseSurfaceHolder.java 4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseIWindow.java e540833fdff4d58e37c9ba859388e24e2945ed45 core/java/com/android/internal/os/SamplingProfilerIntegration.java 192ab903887bbb8e7c7b6da5c581573850e30f46 core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java 1619367ab823150fa8856d419abe02ceb75886f1 media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java 27f8002e591b5c579f75b2580183b5d1c4219cd4 opengl/tools/glgen/stubs/gles11/glGetString.java 560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java 560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java 560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glShaderSource.java 1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GenerateGLES.java 1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/Jsr239CodeEmitter.java 1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GLESCodeEmitter.java 69e21f5f6e0d04539cd92848ea009dd615d88c2c opengl/tests/gldual/src/com/android/gldual/TriangleRenderer.java c028be4f3b8c7476b46859f66c3f33d528adf181 packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java 7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java 7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java 7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.java df8a3f31d871db25e952972c2eb346a71186e9e3 tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.java cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.java cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java Copyright header moved to top in following file: core/tests/coretests/src/android/widget/ListViewTest.java Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
2010-03-06Clarify the default algorithm used to choose an EGLConfig.Jack Palevich
Explicitly default to an RGB_565 android.view.Surface.
2010-03-06Fix inverted release-EGLContext-on-pause logic.Jack Palevich
This works around a bug in the "Q3Dimension MSM7500" driver. That driver only supports a single active EGLContext, so we must release and restore the EGLContext when pausing and unpausing. Unfortunately the test for deciding whether to release the context was inverted. We were releasing the context on every device besides the MSM7500 devices, which was a performance drain, and we were not releasing the context on the MSM7500, which meant the underlying driver bug was not worked around. Now we release the EGL context when pausing only on the devices that have the bug.
2010-01-18Decouple the EGL context lifetime from the EGL surface lifetime.Jack Palevich
The EGL context is now preserved when possible. Previously we would destroy it whenever the EGL surface was destroyed. Preserving the EGL context preserves loaded textures and VBO resources.
2009-12-31Fix javadoc typos.Jack Palevich
2009-12-31A library for encoding and decoding ETC1 textures.Jack Palevich
The ETC1 compressed texture format is commonly supported by OpenGL ES 2.0-capable devices.
2009-12-21Fix merge conflict markers that accidentally got checked in.Jack Palevich
(They were in a comment, so it wasn't detected by the compiler.)
2009-12-21Fix bug 2325244 screen turns black for a brief period of timeJack Palevich
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.
2009-12-10am 74befcc7: am 981ccfbb: Implement Matrix Palette extension.Jack Palevich
Merge commit '74befcc7fd721ca34f60bf75e18ce6faaab37aef' * commit '74befcc7fd721ca34f60bf75e18ce6faaab37aef': Implement Matrix Palette extension.
2009-12-10resolved conflicts for merge of fac57636 to masterJack Palevich
2009-12-09Implement Matrix Palette extension.Jack Palevich
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.
2009-12-09Unhide the Android OpenGL ES 2.0 APIJack Palevich
Add a Matrix.setLookAtM method for computing a look-at viewing transform. Change GLU.lookAt to use Matrix.setLook.
2009-12-09Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 contextJack Palevich
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.
2009-12-09Add a Java API for OpenGL ES 2.0.Jack Palevich
Currently this API is hidden. Add a test program.
2009-12-08Merge change Ibe6eac82Android (Google) Code Review
* changes: Implement Matrix Palette extension.
2009-12-08Implement Matrix Palette extension.Jack Palevich
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.
2009-12-07am 9196034b: am 30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2Jack Palevich
Merge commit '9196034b84c48844799a2904ef3ce31f18ee748e' * commit '9196034b84c48844799a2904ef3ce31f18ee748e': Improve error message thrown when eglCreateContext fails. Improve error reporting by always returning the public
2009-12-04Improve error message thrown when eglCreateContext fails.Jack Palevich
2009-12-02the vertex index should be "first + i".Li Wenhao
2009-11-27Unhide the Android OpenGL ES 2.0 APIJack Palevich
Add a Matrix.setLookAtM method for computing a look-at viewing transform. Change GLU.lookAt to use Matrix.setLook.
2009-11-25am 85a9498a: am 9c0b39c4: am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich
Merge commit '85a9498a2f33d62a4313a3561b5468456974696e' * commit '85a9498a2f33d62a4313a3561b5468456974696e': Improve the exception message text by including eglGetError().
2009-11-25am 9c0b39c4: am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich
Merge commit '9c0b39c47efade5ee2303a8f8ffbd9cf87c2c841' into eclair-mr2-plus-aosp * commit '9c0b39c47efade5ee2303a8f8ffbd9cf87c2c841': Improve the exception message text by including eglGetError().
2009-11-25am ca00dee2: Merge change I5aa3adcf into eclairJack Palevich
Merge commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5' into eclair-mr2 * commit 'ca00dee21425882619aef4ecbe3e0d08de0544e5': Improve the exception message text by including eglGetError().
2009-11-25Improve the exception message text by including eglGetError().Jack Palevich
Should help us track down the cause of bug 2285187
2009-11-19Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 contextJack Palevich
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.
2009-11-19Add a Java API for OpenGL ES 2.0.Jack Palevich
Currently this API is hidden. Add a test program.
2009-11-17am 8d0e1472: am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2Jack Palevich
Merge commit '8d0e14723312a9f8286ba95cc559ee000eab1b82' * commit '8d0e14723312a9f8286ba95cc559ee000eab1b82': More GLSurfaceView cleanup.
2009-11-16am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2Jack Palevich
Merge commit 'a822f02bb9c7f5bf2e3fa3cb63effc391be158c5' into eclair-mr2-plus-aosp * commit 'a822f02bb9c7f5bf2e3fa3cb63effc391be158c5': More GLSurfaceView cleanup.
2009-11-17resolved conflicts for merge of dc49acb0 to eclair-mr2Jack Palevich
2009-11-16More GLSurfaceView cleanup.Jack Palevich
+ 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..."
2009-11-10am 99cf71b0: am 83536cee: Merge change I1179efbb into eclair-mr2Jack Palevich
Merge commit '99cf71b0856e00c1ae9631db91702349cceb9bf8' * commit '99cf71b0856e00c1ae9631db91702349cceb9bf8': Fix multi-lock ordering issues in GLSurfaceView
2009-11-10am 83536cee: Merge change I1179efbb into eclair-mr2Jack Palevich
Merge commit '83536cee2b2b5445c5ba0b22531c23890b82da41' into eclair-mr2-plus-aosp * commit '83536cee2b2b5445c5ba0b22531c23890b82da41': Fix multi-lock ordering issues in GLSurfaceView
2009-11-11resolved conflicts for merge of ba56915a to eclair-mr2Jack Palevich
2009-11-10Fix multi-lock ordering issues in GLSurfaceViewJack Palevich
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.
2009-11-09am 73ae27f0: am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2Jack Palevich
Merge commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad' * commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad': Allow a GLThread to release and reacquire the EGL Surface as needed.
2009-11-09am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2Jack Palevich
Merge commit '8da3ac92a6a6247ef06de4d4b684f8635d8fc003' into eclair-mr2-plus-aosp * commit '8da3ac92a6a6247ef06de4d4b684f8635d8fc003': Allow a GLThread to release and reacquire the EGL Surface as needed.
2009-11-10resolved conflicts for merge of 3f857b78 to eclair-mr2Jack Palevich
2009-11-08Allow a GLThread to release and reacquire the EGL Surface as needed.Jack Palevich
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.
2009-11-06am e54f267f: am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2Jack Palevich
Merge commit 'e54f267f06e86f9c1248742fc56967355721a4e7' * commit 'e54f267f06e86f9c1248742fc56967355721a4e7': Fix stupid bug in GLThreadManager implementation.
2009-11-06am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2Jack Palevich
Merge commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76' into eclair-mr2-plus-aosp * commit 'a3a351e5d164d0c8b461ae7af86edc0227654a76': Fix stupid bug in GLThreadManager implementation.
2009-11-06resolved conflicts for merge of 4e3fadd0 to eclair-mr2Jack Palevich
2009-11-07Fix stupid bug in GLThreadManager implementation.Jack Palevich
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
2009-11-06am a9e47546: am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2Jack Palevich
Merge commit 'a9e47546a5132b30a2ed1e24d9193d4db09ef323' * commit 'a9e47546a5132b30a2ed1e24d9193d4db09ef323': Improve GLSurfaceView to avoid deadlocks and race conditions.
2009-11-06am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2Jack Palevich
Merge commit '79447b2087c8c820d742185dda7305101f9656f0' into eclair-mr2-plus-aosp * commit '79447b2087c8c820d742185dda7305101f9656f0': Improve GLSurfaceView to avoid deadlocks and race conditions.
2009-11-06resolved conflicts for merge of 84872738 to eclair-mr2Jack Palevich
2009-11-06Improve GLSurfaceView to avoid deadlocks and race conditions.Jack Palevich
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.
2009-10-13am 70d12dda: am 3743559d: Merge change I28023911 into eclair-mr2Jack Palevich
Merge commit '70d12dda7c1e36850e1ed95d719bc1d6dadb6fef' * commit '70d12dda7c1e36850e1ed95d719bc1d6dadb6fef': Add additional error checking of EGL function calls.
2009-10-13am 3743559d: Merge change I28023911 into eclair-mr2Jack Palevich
Merge commit '3743559db03645ef7d319c0344238c335a315b65' into eclair-mr2-plus-aosp * commit '3743559db03645ef7d319c0344238c335a315b65': Add additional error checking of EGL function calls.