summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge "Remove vestigial remnants of GLES2_dbg"Jesse Hall2014-05-192-254/+0
|\ \ \ \ \ | |/ / / /
| * | | | Remove vestigial remnants of GLES2_dbgJesse Hall2014-05-172-254/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are left over from an early (not finished?) GL debugging facility that morphed into GLES_trace. Most of the rest of it has already been removed, these few pieces were still hanging aroung. Bug: 15028495 Change-Id: Ib7c03eb8d0db30112e1b83e5262bba03006770de
* | | | | Merge "Disable warnings when generating GL wrappers"Jesse Hall2014-05-192-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Disable warnings when generating GL wrappersJesse Hall2014-05-172-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15028495 Change-Id: Ic0c974e868d05632a06748c90cedbdd409ce2aa8
* | | | | Merge "Rationalize GLES2/3 .in files."Jesse Hall2014-05-198-761/+324
|\ \ \ \ \ | |/ / / /
| * | | | Rationalize GLES2/3 .in files.Jesse Hall2014-05-178-761/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We weren't using gl2_api.in, since gl3_api.in was a superset. And gl3ext_api.in was empty, and Khronos has decided to keep it that way (any GLES2/3/... extensions will be in gl2ext.h). Since libGLES2.so will have all future backwards-compatible GLES APIs, it makes sense to just use gl2_api.in and gl2ext_api.in to build its contents. This changes renames gl3_api.in to gl2_api.in and updates uses of it, and removes gl3ext_api.in and references. Bug: 15028495 Change-Id: I0745eda27ec91ee625f03e957e4fdb22035dd781
* | | | | opengl: Fix whitespace in Java templatesJesse Hall2014-05-187-11/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Someone fixed these in the generated code, so re-generating even with no other changes caused diffs. Better to just fix it at the source. Bug: 15028495 Change-Id: I248f9796d4e3d904c4c0dc15be5f8de231df7285
* | | | am 114d71ce: am 214b4a61: am 8155ce81: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-082-6/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '114d71ce7c6ec1ce0327c812a42966c4258b4a46': Remove unused LOCAL_LDLIBS.
| * | | am 214b4a61: am 8155ce81: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-072-6/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '214b4a61ac3fa63e35c79157d3acf0d8b692b3ac': Remove unused LOCAL_LDLIBS.
| | * | Remove unused LOCAL_LDLIBS.Ying Wang2014-05-072-6/+0
| | | | | | | | | | | | | | | | Change-Id: I62904c410a66f256da8253764577acae18f964f8
* | | | Merge "Revert "Temporarily turn on callstack logging""John Reck2014-04-241-1/+1
|\ \ \ \
| * | | | Revert "Temporarily turn on callstack logging"John Reck2014-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13927881 'twas useful and perhaps should be always enabled (please?) but not like this, so reverting. This reverts commit db4488565a791fc769b0b0b6ca4a0689eb3d5f4e. Change-Id: I9a78c6d6e48342ef6ca1f2f7b5303ca47ccc6086
* | | | | am 43b3e600: am 3f0d5669: Merge "Expose core EGL entry points to ↵Jesse Hall2014-04-213-2/+11
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | eglGetProcAddress" * commit '43b3e600c1a477697408b1cac4cbd40b0ad97d56': Expose core EGL entry points to eglGetProcAddress
| * | | | am 3f0d5669: Merge "Expose core EGL entry points to eglGetProcAddress"Jesse Hall2014-04-213-2/+11
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '3f0d5669eb437ce1f9ce599e196d045534ec3d4f': Expose core EGL entry points to eglGetProcAddress
| | * | | Merge "Expose core EGL entry points to eglGetProcAddress"Jesse Hall2014-04-213-2/+11
| | |\ \ \
| | | * | | Expose core EGL entry points to eglGetProcAddressMichael Chock2014-03-273-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required behavior for EGL_KHR_get_all_proc_addresses. Change-Id: I1e6209ef3cb9f2fa6f22808b077c35139d4cb814
* | | | | | Merge "Temporarily turn on callstack logging"John Reck2014-04-091-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Temporarily turn on callstack loggingJohn Reck2014-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13745587 Temporarily turn on callstack logging for gl_no_context() to try and track down font cache corruption Change-Id: I657ee85e811746441c5ce0ffe5adbfb3fb011d4c
* | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-04-071-3/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: I153b5470b21832cebe3c617d28a4ab9c9bf3b362
* | | | | am fc1544d5: am 17b5ca1e: Merge "opengl: fix UAL conformity"Glenn Kasten2014-04-022-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fc1544d52d1232ccdf57a05704a013bad784f8f6': opengl: fix UAL conformity
| * | | | am 17b5ca1e: Merge "opengl: fix UAL conformity"Glenn Kasten2014-04-022-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '17b5ca1e665a1bbe17387b36fcce8f6b52513d5e': opengl: fix UAL conformity
| | * | | opengl: fix UAL conformitysynergy dev2014-04-022-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | GAS assumes .align 2 if .align only is set, however the UAL doesn't enforce this assumption. Change-Id: I88b567dc84ee8f04a13f2b8e80c3ee41530a9e49
* | | | Request RGBX rather than RGBAAndy McFadden2014-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes San Angeles for certain devices. Bug 13641473 Change-Id: Icb148e1fed15fe56297942475c095e7eb4a11549
* | | | am d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues"Mark Salyzyn2014-03-1311-51/+55
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb': native frameworks: 64-bit compile issues
| * | | am cdbf28b3: Merge "native frameworks: 64-bit compile issues"Mark Salyzyn2014-03-1311-51/+55
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba': native frameworks: 64-bit compile issues
| | * | native frameworks: 64-bit compile issuesMark Salyzyn2014-03-1211-51/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix format (print/scanf) - Suppress unused argument warning messages (bonus) Change-Id: I05c7724d2aba6da1e82a86000e11f3a8fef4e728
* | | | Fix broken test buildJesse Hall2014-03-131-0/+1
| | | | | | | | | | | | | | | | Change-Id: I767bcefd92899334e4769dd3495595f546133694
* | | | Adjust for device orientationAndy McFadden2014-03-121-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | When the device is rotated, reverse the width/height values. Change-Id: Idc2b80b1cb96d9379cd94192997580e1ade70bf6
* | | | Restore old OpenGL testsAndy McFadden2014-03-0637-73/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests call android_createDisplaySurface() to get a FramebufferNativeWindow that is passed to EGL. This relies on the existence of the framebuffer HAL, which is not supported on many recent devices. This change adds a new "window surface" object that the tests can use to get a window from SurfaceFlinger instead. All tests except for the HWC tests now appear to do things. The HWC tests don't do anything useful, but they no longer depend on the android_createDisplaySurface() function. Bug 13323813 Change-Id: I2cbfbacb3452fb658c29e945b0c7ae7c94c1a4ba
* | | | am eac548c6: am 61d6a008: Merge "hwc test: 64-bit compilation error"Mark Salyzyn2014-03-041-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'eac548c65c30b04983a8c904f9a1c6003d428196': hwc test: 64-bit compilation error
| * | | am 61d6a008: Merge "hwc test: 64-bit compilation error"Mark Salyzyn2014-03-041-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '61d6a00895d2e8b9085278d0acbf98c19e7d6ed5': hwc test: 64-bit compilation error
| | * | hwc test: 64-bit compilation errorMark Salyzyn2014-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | * cast 1u to size_t in max() argument lists Change-Id: I02f711c89e96e4cfc348f1c7bac455339bec2fa1
* | | | am 8ffc2346: am 6e79cb81: Enable OMAP4 SGX workaround for OMAP3 tooSimon Wilson2014-03-041-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8ffc2346b86ef5a0d686b43229d2bbd70545a208': Enable OMAP4 SGX workaround for OMAP3 too
| * | | am 6e79cb81: Enable OMAP4 SGX workaround for OMAP3 tooSimon Wilson2014-03-041-1/+1
| |\ \ \ | | |/ / | |/| / | | |/ | | | * commit '6e79cb81d02984c9f7ac0586078f947c94c56c2a': Enable OMAP4 SGX workaround for OMAP3 too
| | * Enable OMAP4 SGX workaround for OMAP3 tooSimon Wilson2014-02-281-1/+1
| | | | | | | | | | | | Change-Id: I04308d8b7435b4adf1811f75f48f9e8a07a8c8a6
* | | Fix bad link tag in javadoc.Narayan Kamath2014-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Java7 javadoc tools seem to accept this without complaint but not all targets use java7 yet. Change-Id: Ib08be8ad0f7db2e89f38b764cce858d0e7eecd2e
* | | API changes for 64 bit platforms.Narayan Kamath2014-02-271-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | EGLObjectHandle.<init>(int) and int EGLObjectHandle.getHandle() have now been deprecated and replaced with variants that take and return java longs. bug: 13181704 Change-Id: Ie88e591c288d6de5655364b4cd673f61cce68d7d
* | | am 3e599252: am 93e6a48b: Merge "AArch64: Make eglGetDisplay(int) work for ↵Narayan Kamath2014-02-272-3/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | EGL_DEFAULT_DISPLAY" * commit '3e599252c0f5a8e70f4b8d4ab5baffb7e5b0b0e1': AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
| * | AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAYAshok Bhat2014-02-262-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow eglGetDisplay(int) to work on both 32-bit and 64-bit systems when EGL_DEFAULT_DISPLAY is passed as a parameter. Change-Id: I0d7e9ca5410b0dd893eacc02aac40956908e4f25 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | am aa01ad91: am aaa27fd5: Merge "Use reinterpret_cast when an integer is ↵Narayan Kamath2014-02-256-6/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | cast to a pointer" * commit 'aa01ad91cd22304fd15810f241c67ebb59e90c04': Use reinterpret_cast when an integer is cast to a pointer
| * | Merge "Use reinterpret_cast when an integer is cast to a pointer"Narayan Kamath2014-02-256-6/+8
| |\ \
| | * | Use reinterpret_cast when an integer is cast to a pointerAshok Bhat2014-02-246-6/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I5adcd59f58c029f7b2b596f4826d8ea69fb9bba6 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | am 097b5991: am e5c99bf3: Merge "Use long for pointers in opengl/EGL classes"Narayan Kamath2014-02-2514-40/+203
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '097b59919f01d7b057d252d23cb96ce5fcdd9469': Use long for pointers in opengl/EGL classes
| * | | Use long for pointers in opengl/EGL classesAshok Bhat2014-02-2414-40/+203
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGL classes in frameworks/base have to be updated to support 64-bit platforms. Key changes in the EGL classes include [x] EGLObjectHandle class - EGLObjectHandle class has two public methods (constructor and getHandle) that assume handles are 32-bit. They have not been changed. Instead, two new hidden methods (EGLObjectHandle(long) and getNativeHandle) have been added. [x] EG14 class - Two public methods eglGetDisplay and eglCreatePbufferFromClientBuffer assume that handles are 32-bit. They have been changed to throw unsupported operation exception on non 32-bit machines. Two new methods eglGetDisplay(long) and eglCreatePbufferFromClientBuffer(...long buffer..) have been added to support 64-bit handles. To allow the above changes in frameworks/base EGL classes, corresponding code generation mechanism in frameworks/native has been updated. Change-Id: I5d0a62e10c20ccf05f610d6608b8dfb6414b5116 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
| * | Merge "Update EGL codegen to be in sync with frameworks/base"Narayan Kamath2014-02-211-1/+1
| |\ \
| | * | Update EGL codegen to be in sync with frameworks/baseAshok Bhat2014-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Takeshi Aimi with commit-id f9337377 changed core/jni/android_opengl_EGL14.cpp in the frameworks/base. However the corresponding code snippet in frameworks/ native was not updated. This patch addresses the issue. Change-Id: I40bcc43d36d7ab4e0db4a73556a4f7480c7431c1 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
| * | | Update GLES codegen to be in sync with frameworks/baseAshok Bhat2014-02-201-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from synergydev with commit-id 01994c79 changed core/jni/com_google_android_gles_jni_GLImpl.cpp in the frameworks/base. However the corresponding code snippet in frameworks/native was not updated. This patch addresses the issue. Change-Id: I89c3d88de832efc8cbbe682c8a7ff7dfbef99db3 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | Merge "Hide three malformed GL bindings"Andy McFadden2014-02-195-2/+5
|\ \ \
| * | | Hide three malformed GL bindingsAndy McFadden2014-02-195-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were replaced with correct bindings a while back, but the broken methods weren't hidden. Also, pick up two changes that were made to the generated code rather than the source. Bug 6006380 Change-Id: Ibfe9a5f2e13e745f8d82116d1b4d8c2d025ac830
* | | | am 7a66f7af: am 913a17fd: Merge "libagl: support multilib build"Colin Cross2014-02-181-11/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '7a66f7afd1b6a975ab3b99b4765781a0d66958c8': libagl: support multilib build
generated by cgit v1.1 at 2025-02-09 04:02:08 +0000