summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
* surfaceflinger and libagl: fix bug #11829Denis 'GNUtoo' Carikli2011-01-093-19/+30
| | | | | | | | | | | | | | | The bug #11829 that can be found here: http://code.google.com/p/android/issues/detail?id=11829 causes various graphic artefacts. According to naseer.ahmed it needed modifications in SurfaceFlinger and libagl The modifications comes from: https://www.codeaurora.org/gitweb/quic/la/?p=platform/frameworks/base.git;a=shortlog;h=refs/heads/froyo_almond at commit 33e6506d96d7602284e18ea8c66dbfd04dc72aa3 Change-Id: I703bace69cb7a41ac8ed69ca1e28b98aa618e0f3 Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
* [opengl] implement work around for tegra errata 657451Gary King2010-11-144-2/+41
| | | | | | | copy the tegra errata work around compile flags from bionic, to pick up the correct __get_tls implementation Change-Id: Idf131ad536b3f6bce643a83bb99e007a9b45c3bb
* [egl] return error code for NULL num_config output parameterGary King2010-11-141-0/+1
| | | | | | | if a client passes NULL for num_config to eglGetConfigs, set EGL_BAD_PARAMETER and return rather than crash Change-Id: I412cce9a89cbe4fc4270b1444d21601633c21d21
* [egl] add support for vendor-specific GL extensionsGary King2010-11-141-0/+62
| | | | | | | | | | | | | | | on implementations which have a single EGL backend, it is straight- forward to query the EGL implementation for the supported GL extensions the mechanism added in this commit will only work on implementations which have a single EGL backend; on implementations which have multiple backends, this feature should be disabled at compile-time for EGLImage extensions, call into a wrapper layer implementation to translate the meta-EGL object into the vendor object before calling into the vendor's EGLImage implementation Change-Id: I4c930a506a743b6ea88c4b2e769a9ea5ebf8e0d0
* egl: return success for eglSwapIntervalGary King2010-11-141-1/+5
| | | | | default shouldn't return an error, since this would preclude hardware implementations which implement this function correctly
* frameworks/base/opengl: Change copybit image width to buffer strideOmprakash Dhyade2010-08-241-2/+2
| | | | | | | Change copybit image width to buffer stride when copybit is used. Change-Id: If91405e1ed438a514a002402d697d2981b23b750 CRs-fixed: 251015
* frameworks/base/opengl: Add NULL checkNaomi Luis2010-08-161-4/+7
| | | | | | | Check for the validity of the attrs_list in eglChooseConfig before using it. This avoids a crash during tests in which the attributes are NULL. Change-Id: I1c0a46b505ae919e2454cfdce32f8dfc21ead247
* Fix a bug that prevented the creation of EGL shared contexts.Jamie Gennis2010-07-301-0/+4
| | | | Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
* 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.
* Fix Android's glEGLImageTargetRenderbufferOES() wrapperMathias Agopian2010-03-292-2/+2
| | | | | | | glEGLImageTargetRenderbufferOES() pass the wrapped EGLImage to the implementation, rather than the unwrapped one. Change-Id: I149f9ed73e6ab9089110600e1db4311ba7a8c83a
* Add a test of EGL pausing and resuming.Jack Palevich2010-03-296-0/+274
|
* Turn off logging.Jack Palevich2010-03-271-4/+4
|
* Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number"Mathias Agopian2010-03-251-1/+1
|\
| * fix [2236865] STOPSHIP: bump soft gl and egl minor version numberMathias Agopian2010-03-251-1/+1
| | | | | | | | | | | | | | this is to allow developpers to deal with potiential differences between the softgl versions. Change-Id: I7ec2451d6af1be29818d66215b22977405d403e8
* | 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.
* Implement eglInitialize / eglTerminate reference countingJack Palevich2010-03-151-1/+4
| | | | | | | | | | | | | | | | | Previously we imlpemented the standard semantics for eglInitialize / eglTerminate, which are that eglInitialize may be called any number of times, but the first call to eglTerminate will terminate the display. Now we follow reference-countins semantics, which means that eglTerminate will only terminate the display when the reference count returns to zero. This change allows EGL to be used by multiple independently written modules in the same process. (Otherwise there is no way for the independent modules to coordinate their use of the display.)
* 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.
* Fix glCopyTexSubImage2D inverted texture bug.Jack Palevich2010-03-121-1/+1
| | | | | This bug only affects the software OpenGL ES driver.
* Add correct copyright headers to multiple filesKenny Root2010-03-1117-0/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* get rid off the YUV formats at the libui layerMathias Agopian2010-02-161-14/+1
|
* Merge "fix [2189862] Race condition in eglIntialize and eglDestroy"Mathias Agopian2010-02-051-3/+16
|\
| * fix [2189862] Race condition in eglIntialize and eglDestroyMathias Agopian2010-02-051-3/+16
| | | | | | | | | | there is now a lock protext a perticular display. it's held during initialization and destruction.
* | Proper EGLImageKHR error handlingMathias Agopian2010-02-042-1/+41
|/ | | | | Validate EGLImageKHR format and return an error for unsupported ones. Also make sure to return an error when binding EGL_NO_IMAGE_KHR to a texture
* fix [2133133] Software OpenGL ES Lighting is buggy (GL Gears washed out bug)Mathias Agopian2010-02-033-26/+78
| | | | | | | | | | A typo caused GL_AMBIENT_AND_DIFFUSE to only set the the ambient color. Fix another typo which caused the viewer position to be wrong for specular highlights. Switch back to eye-space lighting, since there are still some issues with some demos (San Angeles in particular).
* Fix ETC1 texture decoding.Jack Palevich2010-02-021-1/+1
| | | | | etc1_decode_image requires the stride argument to be in bytes, but the surface->stride field is in pixels. Convert by multiplying by pixel size.
* implement [2396050] Add ETC1 texture support to AGLMathias Agopian2010-02-023-6/+40
|
* fix [2397853] glCopyTexImage2D crashes emulatorMathias Agopian2010-02-011-1/+23
| | | | Fixed a typo which would cause a buffer overflow
* Implement the GL11ExtensionPack APIs.Jack Palevich2010-01-286-38/+187
|
* fix [2341222] AGL version of glDrawTexxOES doesn't handle "Z" value correctlyMathias Agopian2010-01-251-4/+4
|
* fix [2303866] eglMakeCurrent doesn't return all error messages described in ↵Mathias Agopian2010-01-251-3/+3
| | | | the spec
* 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.
* Use correct TLS codepath in graphics librariesGary King2010-01-122-0/+16
| | | | | | | Duplicate ARCH_ARM_HAVE_TLS_REGISTER BoardConfig to proprocessor HAVE_ARM_TLS_REGISTER define from Bionic's libc Android.mk to ensure that OpenGL libraries (libEGL, libGLESv1_CM, libGLESv2, libGLES_android) use the correct codepath in bionic_tls.h for accessing the TLS address
* Deprecate fill_parent and introduce match_parent.Romain Guy2010-01-081-4/+4
| | | | Bug: #2361749.
* Do not use a user tag on apps, as it is ignored.Jean-Baptiste Queru2010-01-063-3/+3
| | | | | | | | | | The build system does not honor user tags on apps, and setting it is misleading. This removes the confusion by making the makefiles behave like they read. Change-Id: I7c5feba1c7d07f915b97dd098584f29938a4c885
* Fix javadoc typos.Jack Palevich2009-12-312-2/+2
|
* A library for encoding and decoding ETC1 textures.Jack Palevich2009-12-315-0/+1171
| | | | | The ETC1 compressed texture format is commonly supported by OpenGL ES 2.0-capable devices.
* Print OpenGL version and extension information.Jack Palevich2009-12-241-144/+152
| | | | | | Something happened to the line endings, adding a blank line after most lines of text. I repaired the damage, but in the process some blank lines have been added / removed.
* 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.
| * am 981ccfbb: Implement Matrix Palette extension.Jack Palevich2009-12-0916-64/+302
| |\ | | | | | | | | | | | | | | | | | | Merge commit '981ccfbbfd737e2bdf0cedec0089975f91fd4e0a' into eclair-mr2-plus-aosp * commit '981ccfbbfd737e2bdf0cedec0089975f91fd4e0a': Implement Matrix Palette extension.
| | * Implement Matrix Palette extension.Jack Palevich2009-12-0916-64/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ | |/ /
| * | am aa396b96: Unhide the Android OpenGL ES 2.0 APIJack Palevich2009-12-094-65/+91
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'aa396b9610f339cf280159144fbea47506f060e7' into eclair-mr2-plus-aosp * commit 'aa396b9610f339cf280159144fbea47506f060e7': Unhide the Android OpenGL ES 2.0 API