summaryrefslogtreecommitdiffstats
path: root/opengl
Commit message (Collapse)AuthorAgeFilesLines
* Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-071-1/+1
| | | | | | | | | | Passes the BufferItem for the queued buffer to the onFrameAvailable callback so the consumer can track the BufferQueue's contents. Also adds an onFrameReplaced callback, which is necessary if the consumer wants to do anything more than simple queue length tracking. Bug: 18111837 Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
* Add rate-limited logging for unimplemented es functions.Michael Lentine2014-09-231-5/+19
| | | | | | Bug: 17322013 Change-Id: I7aa5ab2f76cf344cfb75802edbfd44e8e7526ff1
* Don't try to capture the pointer when using PBOs for texture APIsBen Clayton2014-08-203-34/+85
| | | | | | | | | | If a PBO is bound, then the pointer argument is a relative offset from the start of the PBO, not an absolute address. Fixes b/17063439 Change-Id: I39629ce6c9bb3cb6bac5c9b0311287628306ddd4 (cherry picked from commit 0ad707f2f3d714af7d983d68330ed51dace815f5)
* Revert "Modify EGL to disconnect the window when the surface gets destroyed."Michael Lentine2014-08-081-9/+0
| | | | This reverts commit 843cbb241da60ada234918a30cfe9a01a1e04187.
* Merge "Modify EGL to disconnect the window when the surface gets destroyed." ↵Michael Lentine2014-07-251-0/+9
|\ | | | | | | into lmp-dev
| * Modify EGL to disconnect the window when the surface gets destroyed.Michael Lentine2014-07-291-0/+9
| | | | | | | | | | | | Bug: 14445579 Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa
* | Install symlinks in multilib build.Ying Wang2014-07-241-12/+7
| | | | | | | | | | | | (cherry picked from commit c3aed1eaefa9c824d5863d58db3954eb642cffe4) Change-Id: Ic0082ffbd7ecf610476bccb0929e67427a05190d
* | Use the count parameter to store all the uniform vectors, not just the first ↵Ben Clayton2014-07-211-4/+8
|/ | | | | | | one. DO NOT MERGE. Change-Id: Ib56d859051f0b895de5c12ffa371cd4b2b65ac0b (cherry picked from commit 31b0aec64ba44b1ee0581e00a588d84f4b081512)
* Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D ↵Ben Clayton2014-07-071-0/+63
| | | | | | calls. Change-Id: I38643f5d279a84f1b7069801d7c106fc8f1ae394
* am 0cea0a22: am d284c4cd: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."Ying Wang2014-06-111-4/+0
|\ | | | | | | | | * commit '0cea0a22109ace7e3dfbb4913a1469f3f8480f6e': Don't set LOCAL_MODULE_PATH for native tests.
| * Don't set LOCAL_MODULE_PATH for native tests.Ying Wang2014-06-091-4/+0
| | | | | | | | | | | | The build system will set it up automatically. Change-Id: Id5ed9eff88dab2349c3b357ee09f7da9479d7d2d
* | am 17cbadf0: am 6fa169fa: Merge "Add aarch64 EGL/GLES trampolines"Jesse Hall2014-06-073-27/+83
|\ \ | |/ | | | | | | * commit '17cbadf0f598b0d02179262ad5b6b270850ccb94': Add aarch64 EGL/GLES trampolines
| * Add aarch64 EGL/GLES trampolinesJesse Hall2014-06-063-27/+83
| | | | | | | | Change-Id: Ia90e18d26ff3bdb7e643aff8d77cbaddd2ac2a03
* | am ad8d25e8: am 90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too"Simon Wilson2014-05-291-1/+1
|\ \ | | | | | | | | | | | | * commit 'ad8d25e812d8842298de92657158a0325c42cdbd': Revert "Enable OMAP4 SGX workaround for OMAP3 too"
| * \ am 90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too"Simon Wilson2014-05-291-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '90654afb3aeac78916f2a53fe689a087c0e283c9': Revert "Enable OMAP4 SGX workaround for OMAP3 too"
| | * | Revert "Enable OMAP4 SGX workaround for OMAP3 too"Simon Wilson2014-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the new TI SGX DDK 1.12 has fixed support for RGBA8888, the workaround can be reverted. This may help with CTS issues. Bug: 14995811 This reverts commit 6e79cb81d02984c9f7ac0586078f947c94c56c2a. Change-Id: Id8160ebe577d7009d2dd5eb4501ec40356a4274d
* | | | am 92374318: am 618c78c0: am dc273621: Merge "EGL: add x86/64 assembly code ↵Jesse Hall2014-05-273-0/+121
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | for EGL/GLES wrappers" * commit '92374318b82945f3d03461f3d0c659adb8409fc5': EGL: add x86/64 assembly code for EGL/GLES wrappers
| * | | am 618c78c0: am dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES ↵Jesse Hall2014-05-273-0/+121
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | wrappers" * commit '618c78c032ce84c02724a1e5a7f439fa788ecf3a': EGL: add x86/64 assembly code for EGL/GLES wrappers
| | * | EGL: add x86/64 assembly code for EGL/GLES wrappersmwajdecz2014-05-273-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was no explicit support for x86/64 architecture in EGL/GLES wrappers. This resulted either in failures or sub-optimal implementation of the wrapper functions. Change-Id: I20d99d7372fbf642ee4b94a05c8cb971cba29988 Signed-off-by: Wajdeczko, Michal <michal.wajdeczko@intel.com>
* | | | opengl: Fix include style in generated JNI codeJesse Hall2014-05-201-2/+2
| | | | | | | | | | | | | | | | | | | | Bug: 15028495 Change-Id: Ie38d398751a374f11bef8944a2aa0f8311934911
* | | | opengl: Un-hide GLES31 and GLES31Ext classesJesse Hall2014-05-202-2/+0
| | | | | | | | | | | | | | | | | | | | Bug: 15028495 Change-Id: Iaac1e8d2ad5ea840d728a78804e2566be18a4340
* | | | opengl: Add GLES31 and GLES31Ext class templatesJesse Hall2014-05-2051-3/+1006
| | | | | | | | | | | | | | | | | | | | Bug: 15028495 Change-Id: I276d04f029d441e092428fad72f09ca15e1d233a
* | | | Merge "opengl: Regenerate code with ES 3.1 and new extensions"Jesse Hall2014-05-2014-19/+5448
|\ \ \ \
| * | | | 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