summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | opengl: Regenerate code with ES 3.1 and new extensionsJesse Hall2014-05-1914-19/+5448
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable ES 3.1 generation in glgen.py, and regenerate everything to add support for that as well as these new extensions in the registry: - EXT_copy_image - EXT_draw_buffers_indexed - EXT_geometry_shader - EXT_gpu_shader5 - EXT_primitive_bounding_box - EXT_shader_implicit_conversions - EXT_shader_io_blocks - EXT_tessellation_shader - EXT_texture_border_clamp - EXT_texture_buffer - EXT_texture_cube_map_array - EXT_texture_view Bug: 15028495 Change-Id: I35acb473cba2433b9aeb95d1b8bfbdcfadf22532
* | | | | Merge "opengl: Add EXT_primitive_bounding_box to registry"Jesse Hall2014-05-202-3/+32
|\ \ \ \ \ | |/ / / /
| * | | | opengl: Add EXT_primitive_bounding_box to registryJesse Hall2014-05-192-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extension hasn't been published yet, so it isn't in the public registry. That will change before the next platform release to AOSP. Bug: 15028495 Change-Id: Iadafe0f776b5b9be4f81c4279a89c57ae02293e4
* | | | | Merge "opengl: Update registry and headers from Khronos"Jesse Hall2014-05-205-48/+1833
|\ \ \ \ \ | |/ / / /
| * | | | opengl: Update registry and headers from KhronosJesse Hall2014-05-195-48/+1833
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gl.xml @ r26697: https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api GLES headers @ r26698: https://cvs.khronos.org/svn/repos/registry/trunk/public/gles/api Bug: 15028495 Change-Id: Id8e7aaf8a09ec6f47dc3a3b14b95d0ddf35d50f6
* | | | | Merge "opengl: Generate *.in from registry XML"Jesse Hall2014-05-2016-3839/+9727
|\ \ \ \ \ | |/ / / /
| * | | | opengl: Generate *.in from registry XMLJesse Hall2014-05-1916-3839/+9727
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are many non-functional whitespace and parameter name changes included here. These were introduced upstream when converting from the old .spec registry to the new XML registry. There are also some new extensions added. Unfortunately there isn't a version of the XML that matches the headers the previous versions of the *.in files were generated from, so I can't separate out the non-functional changes from the new extensions (other than temporarily hacking them out of the XML). See below. Finally, I had to hack the official glext.h. Khronos hasn't updated the official GLES1 headers since switching to the XML registry, and there is one critical difference: a "const void**" parameter in the official header is "const void* const*" in the registry. I changed the header to avoid build errors with code generated from the registry. Dependencies on the *.in files required manually updating some GLES_trace/ files as well: - gltrace_api.{h,cpp} must be manually re-generated using tools/genapi.py. - New GL prototypes must be manually added to gltrace.proto. - gltrace.pb.{h,cpp} must be regenerated using aprotoc (see dev.make) New GLES extensions in libs/GLES_CM/glext_api.in: - GL_OES_byte_coordinates - GL_EXT_map_buffer_range - GL_APPLE_copy_texture_levels - GL_APPLE_sync New GLES2 extensions in libs/GLES2/gl2ext_api.in: - GL_KHR_blend_equation_advanced - GL_KHR_debug - GL_OES_sample_shading - GL_OES_texture_storage_multisample_2d_array - GL_EXT_disjoint_timer_query - GL_EXT_draw_buffers - GL_EXT_draw_instanced - GL_EXT_instanced_arrays - GL_EXT_map_buffer_range - GL_EXT_map_buffer_range - GL_EXT_multiview_draw_buffers - GL_EXT_separate_shader_objects - GL_ANGLE_instanced_arrays - GL_ANGLE_translated_shader_source - GL_APPLE_copy_texture_levels - GL_APPLE_sync - GL_INTEL_performance_query - GL_NV_blend_equation_advanced - GL_NV_copy_buffer - GL_NV_draw_instanced - GL_NV_framebuffer_blit - GL_NV_framebuffer_multisample - GL_NV_instanced_arrays - GL_NV_non_square_matrices Bug: 15028495 Change-Id: Ib3fa700a146adf7f1487a93e459b1e6df0dcdc42
* | | | | Merge "Update GLES headers from Khronos SVN r26322"Jesse Hall2014-05-205-2411/+2578
|\ \ \ \ \ | |/ / / /
| * | | | Update GLES headers from Khronos SVN r26322Jesse Hall2014-05-195-2411/+2578
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Public registry is: https://cvs.khronos.org/svn/repos/registry/trunk/public/gles/api Bug: 15028495 Change-Id: I2269a6a2486c34b6a9e378d4a25a41492d531c81
* | | | | Merge "Import GL registry from upstream @r26448."Jesse Hall2014-05-194-0/+45481
|\ \ \ \ \ | |/ / / /
| * | | | Import GL registry from upstream @r26448.Jesse Hall2014-05-194-0/+45481
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Public GL registry is at: https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api Bug: 15028495 Change-Id: I41cc865bf39e1155c4467411d0b1afced44b0874
* | | | | 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>