summaryrefslogtreecommitdiffstats
path: root/opengl/java/android
Commit message (Collapse)AuthorAgeFilesLines
* Kill the global references in the OpenGL wrappers.Elliott Hughes2011-04-115-70/+75
| | | | | | | | | | | | | | | Just use jniThrowException instead. Note that it would be trivial to throw seemingly more appropriate exceptions (NullPointerException and OutOfMemoryException in particular), but I'm only attempting to preserve existing behavior here. I also found shadowing bugs in some of the special-case functions, which would previously always have leaked memory. This also moves an accidental change to a generated file (ActivityThread -> AppGlobals) into the generator, so it won't be overwritten in future. Change-Id: Iab570310b568cb406c60dd0e2b8211f8a36ae590
* Extend recycled bitmap check to all GLUtils APIs.Jack Palevich2011-02-071-0/+18
| | | | Change-Id: I9ea0022b167af2153190b6642aa303232e257379
* Throw an exception when trying to upload a recycled bitmap.Jack Palevich2011-02-021-0/+3
| | | | | | Previously we would upload garbage. Change-Id: Id785792a16f9d24685687f4e6b64ec893ccad225
* Add GL11ExtensionPack support to GLDebugWrapperJack Palevich2011-01-273-1/+721
| | | | | | | Allows calling GL11ExtensionPack APIs in a GL context that has been wrapped for debugging. Change-Id: Ib0695b51a92f5dcce32db8b0dc7ee948e5059e7f
* Unhide GLSurfaceView.get/setPreserveEGLContextOnPauseJack Palevich2011-01-181-2/+0
| | | | Change-Id: I882b8fa7888e2baae41c81b75af7fc1f639d38d6
* Add support for preserving EGL contexts when pausing / resuming.Jack Palevich2011-01-141-7/+43
| | | | | | Hidden for now. Change-Id: I350576c11960a1aa232da7aebc5c6ec60ff796b5
* These files had an older header.Dan Bornstein2010-12-077-79/+74
| | | | | | | This patch replaces the file headers with the approved Android header text. Change-Id: I63cbd21e9112dab404158fb65f74bc6ca5b07eac
* Preserve the render mode when recreating the render thread.Jack Palevich2010-10-271-0/+7
| | | | Change-Id: I67a12a9598d3ef099bef8727411891614b1bc3f7
* Allow a GLSurfaceView to be reattached to a window.Jack Palevich2010-10-261-0/+29
| | | | | | | | | | This approach is more backwards-compatible than the previous attempt. The onDetachedFromWindow case is unchanged from the "classic" GLSurfaceView behavior, except that we don't throw a NPE if the renderer has never been set. Change-Id: Ia8103a73366ddb13be44f16b789c929e75ddc792
* Do not exit the GLSurfaceView thread when detached from a window.Jack Palevich2010-10-251-1/+0
| | | | | | | Allows a GLSurfaceView to be removed from a window and later reattached to a window. Change-Id: I2b44f35d0c95404b13912782df8877953609a5d0
* reserve android.opengl.GLWallpaperService name for future useMathias Agopian2010-08-251-0/+25
| | | | Change-Id: I7a217593a1ca39214dda26ddb3af3ddc30a8a95a
* Fix deadlock when switching between two GLSurfaceViewsJack Palevich2010-07-131-18/+74
| | | | | | | | | | | | | | | | Some devices only support a single active EGL context. On those devices, when a second activity that uses a GLSurfaceView is started in the same process, the second activity can potentially hang in GLSurfaceView.onWindowResize waiting for its GLSurfaceView render thread to draw a frame. The second activity's render thread is waiting to acquire an EGL context, but the first activity's render thread doesn't know it should release the EGL context. The fix is to detect the potential hang, and ask the first activity's render thread to release the EGL context. Change-Id: Ibb342c68772297744c973bcf5010581cd132db67
* Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.Jack Palevich2010-06-222-0/+100
| | | | Change-Id: Id0069535e97fe96eef74e4d0c1d19b010061fe3b
* fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and ↵Mathias Agopian2010-05-241-1/+0
| | | | | | | | fail force all SurfaceView to 565 Change-Id: I8ebfa1239d8e4fa097c2e544677fb92fa20b39bd
* Quietly handle EGL_BAD_NATIVE_WINDOW errorsJack Palevich2010-04-191-5/+19
| | | | | | | | | | | | | | | | | We believe these errors happen when the window manager has told surface flinger to close the native window. If this error happens while we are creating the EGL surface we exit the render loop (and therefore exit the render thread.) If the error happens while swapping the surface we ignore it. In either situation, we expect that the application is about to be shut down by the window manager, so it should not be necessary to try and recover from the error.
* Turn off logging.Jack Palevich2010-03-271-4/+4
|
* GLSurfaceView pause and resume now synchronizeJack Palevich2010-03-251-3/+41
| | | | | | | | | | | | | | with the GLThread. We used to just set the mPaused state and return, now we wait until the rendering thread signals that it has noticed the change in pause state. This makes Pause/Resume more consistent with other UI-thread-to-GLThread event communication. This change was made in the hope of fixing some race conditions observed in monkey testing.
* Turn off thread logging (too many messages.)Jack Palevich2010-03-251-1/+1
| | | Leave some other logging on for the monkey test.
* Add logging of GLSurfaceView pause/resume calls.Jack Palevich2010-03-251-3/+10
| | | | | | | Turn on GLSurfaceView logging, so we can get better information in the monkey tests. Change-Id: Ifec0101f8a00ab09037dc9f7a1496fa1a374cc08
* Improve our EGL management when pausing / resuming.Jack Palevich2010-03-241-0/+13
| | | | | | | | | | | | | | | | We now release the EGL context when pausing. This is required to reduce the chance of running out of contexts on devices which support a limited number of active EGL contexts. Someday we may implement a global EGL context manager that will allow us to let EGL contexts persist until another activity needs an EGL context. But for now, without such a manager, we take the conservative approach. Separately, we now terminate EGL when pausing on Sapphire. This is a requirement of the Sapphire OpenGL driver.
* GLSurfaceView: Log egl failuresJack Palevich2010-03-231-3/+50
| | | Decode the EGL error code when throwing exceptions.
* Improve eglSwapBuffers error handling.Jack Palevich2010-03-151-9/+20
| | | | | | | | | | | | | | 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.
* Add correct copyright headers to multiple filesKenny Root2010-03-111-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Clarify the default algorithm used to choose an EGLConfig.Jack Palevich2010-03-061-35/+39
| | | | Explicitly default to an RGB_565 android.view.Surface.
* Fix inverted release-EGLContext-on-pause logic.Jack Palevich2010-03-061-5/+18
| | | | | | | | | | | | | | | | | | | 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.
* Decouple the EGL context lifetime from the EGL surface lifetime.Jack Palevich2010-01-181-31/+81
| | | | | | 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.
* Fix javadoc typos.Jack Palevich2009-12-312-2/+2
|
* A library for encoding and decoding ETC1 textures.Jack Palevich2009-12-312-0/+365
| | | | | The ETC1 compressed texture format is commonly supported by OpenGL ES 2.0-capable devices.
* Fix merge conflict markers that accidentally got checked in.Jack Palevich2009-12-211-5/+1
| | | | (They were in a comment, so it wasn't detected by the compiler.)
* Fix bug 2325244 screen turns black for a brief period of timeJack Palevich2009-12-211-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 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-094-41/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-084-41/+113
|\ \ | | | | | | | | | | | | * changes: Implement Matrix Palette extension.
| * | Implement Matrix Palette extension.Jack Palevich2009-12-084-41/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | 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
| |
| * 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.