aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* radv: Remove SI num RB override for occlusion queries.Bas Nieuwenhuizen2017-06-141-3/+0
| | | | | | | | | radeonsi doesn't have it anymore either. Signed-off-by: Bas Nieuwenhuizen <[email protected]> Fixes: f4e499ec791 "radv: add initial non-conformant radv vulkan driver" Reviewed-by: Dave Airlie <[email protected]> (cherry picked from commit 59c2e2a061736a981819c3cb217e92e1509d9852)
* radv: fewer than 8 RBs are possibleNicolai Hähnle2017-06-141-2/+0
| | | | | | | This fixes the subsequent assertion on Bonaire. Reviewed-by: Dave Airlie <[email protected]> (cherry picked from commit 388d36dfd180bc16b9d2803d9a213aa5e5ee011f)
* radv: expose integrated device type for APUs.Dave Airlie2017-06-141-1/+1
| | | | | | | | | This just sets the vulkan device type depending on whether this is an APU or GPU. Signed-off-by: Dave Airlie <[email protected]> Fixes: f4e499ec791 "radv: add initial non-conformant radv vulkan driver" (cherry picked from commit 2890a711587e03f906530919056275b599f5f03e)
* radv: Dirty all descriptors sets when changing the pipeline.Bas Nieuwenhuizen2017-06-142-8/+14
| | | | | | | | | | | | | | Sets could have been ignored during previous descriptor set flush due to the shader not using them and therefore no SGPR being assigned. Signed-off-by: Bas Nieuwenhuizen <[email protected]> Reviewed-by: Dave Airlie <[email protected]> Fixes: ae61ddabe8c "radv: move userdata sgpr ownership to compiler side." (cherry picked from commit 4415a46be2cbb752b94b62bdf5bc7d4d4bbe9fab) Conflicts: src/amd/vulkan/radv_cmd_buffer.c src/amd/vulkan/radv_meta.c
* radv: Set both compute and graphics SGPRS on descriptor set flush.Bas Nieuwenhuizen2017-06-141-29/+27
| | | | | | | | | | | | | | | | | We clear the descriptors_dirty array afterwards, so the SGPRs for the other pipeline don't get updated on the flush for that other draw/dispatch, so we have to make sure we do it immediately. Signed-off-by: Bas Nieuwenhuizen <[email protected]> Reviewed-by: Dave Airlie <[email protected]> Fixes: ae61ddabe8c "radv: move userdata sgpr ownership to compiler side." (cherry picked from commit 5fb8bb306534d633ceb4e33d89984718326773ba) [Emil Velikov: drop radv_flush_indirect_descriptor_sets hunk - missing in branch] Signed-off-by: Emil Velikov <[email protected]> Conflicts: src/amd/vulkan/radv_cmd_buffer.c
* egl: fix _eglQuerySurface in EGL_BUFFER_AGE_EXT caseTapani Pälli2017-06-144-5/+9
| | | | | | | | | | | | | | | | | | | Specification states that in case of error, value should not be written, patch changes buffer age queries to return -1 in case of error so that we can skip changing the value. In addition, small change to droid_query_buffer_age to return 0 in case buffer does not have a back buffer available. Fixes: dEQP-EGL.functional.negative_partial_update.not_postable_surface Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Reviewed-by: Chad Versace <[email protected]> Cc: [email protected] (cherry picked from commit 8fac894f9b8e4e2cb93061fdd25f3aecbfb3bbb7)
* swr: relax c++ requirement from c++14 to c++11Tim Rowley2017-06-144-20/+21
| | | | | | | | | | | | Remove c++14 generic lambda to keep compiler requirement at c++11. No regressions on piglit or vtk test suites. Tested-by: Chuck Atkins <[email protected]> Reviewed-by: Bruce Cherniak <[email protected]> CC: [email protected] (cherry picked from commit 0b80b025021f97d27520390867c20336dc891a16)
* radeonsi: disable the patch ID workaround on SI when the patch ID isn't used ↵Marek Olšák2017-06-142-15/+21
| | | | | | | | | | | | | | | | | (v2) The workaround causes a massive performance decrease on 1-SE parts. (Cape Verde, Hainan, Oland) The performance regression is already part of 17.0 and 17.1. v2: check tess_uses_prim_id Cc: 17.0 17.1 <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]> (cherry picked from commit 391673af7ad1565a5f6ac8fc2f8c9fcdd1fe9908) [Emil Velikov: s/tcs_tes_uses_prim_id/tess_uses_prim_id/] Signed-off-by: Emil Velikov <[email protected]>
* i965: Mark depth surfaces as needing a HiZ resolve after blittingJason Ekstrand2017-06-141-0/+2
| | | | | | | | Cc: "17.0 17.1" <[email protected]> Reviewed-by: Topi Pohjolainen <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Chad Versace <[email protected]> (cherry picked from commit 5097fcbfdc8dc5aab779af92022f9b5ff16026f0)
* i965: Perform HiZ flush/stall prior to HiZ resolvesJason Ekstrand2017-06-141-13/+26
| | | | | | Cc: "17.1" <[email protected]> Reviewed-by: Topi Pohjolainen <[email protected]> (cherry picked from commit acbd02450bfd53f61bbe468a6f0e8bf5e4507095)
* i965: Move the pre-depth-clear flush/stalls to intel_hiz_execJason Ekstrand2017-06-142-56/+58
| | | | | | Cc: "17.1" <[email protected]> Reviewed-by: Topi Pohjolainen <[email protected]> (cherry picked from commit acb9a2ef8f5d92002ed7eb7676c4a96db661ba3a)
* i965/blorp: Take a layer range in intel_hiz_execJason Ekstrand2017-06-145-18/+16
| | | | | | Cc: "17.1" <[email protected]> Reviewed-by: Topi Pohjolainen <[email protected]> (cherry picked from commit 252b004a51d951391846ec5644abe88bfffb72bd)
* dri3/GLX: Fix drawable invalidation v2Thomas Hellstrom2017-06-141-0/+6
| | | | | | | | | | | | | | | | | | | | A number of internal VMware apitrace traces image comparisons fail with dri3 because the viewport transformation becomes incorrect after an X drawable resize. The incorrect viewport transformation sometimes persist until the second draw-call after a swapBuffer. Comparing with the dri2 glx code there are a couple of places where dri2 invalidates the drawable in the absence of server-triggered invalidation, where dri3 doesn't do that. When these invalidation points are added to dri3, the image comparisons become correct. v2: Addressed review comment by Michel Dänzer. Cc: <[email protected]> Signed-off-by: Thomas Hellstrom <[email protected]> Reviewed-and-tested-by: Michel Dänzer <[email protected]> (cherry picked from commit 1253d58983b2b6ba4ed16444a344327e8117f333)
* radeonsi: fix a GPU hang with tessellation on 2-CU configsMarek Olšák2017-06-141-1/+5
| | | | | | | | | | Only harvested Stoney has 2 CUs. Tested on 2-CU Stoney and Fiji forced to 2 CUs. Cc: 17.0 17.1 <[email protected]> Tested-by: Edmondo Tommasina <[email protected]> Tested-by: Dieter Nützel <[email protected]> (cherry picked from commit 6c655cfeb49a8142c44782c5164619a5860c7706)
* st/mesa: don't load cached TGSI shaders on demandMarek Olšák2017-06-141-1/+6
| | | | | | | | | | | This fixes a performance issue with the shader cache that delayed Gallium shader create calls until draw calls. I'd like this in stable, but it's not a showstopper. Cc: 17.1 <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> (cherry picked from commit 2ec50f98a9be9ee94aa0dd82fb7560c00153b03f)
* nvc0: disable BGRA8 images on FermiLyude2017-06-141-5/+14
| | | | | | | | | | | | | BGRA8 image stores on Fermi don't work, which results in breaking PBO downloads, such that they always return 0x0. Discovered this through a glamor bug, and confirmed it does indeed break a good number of piglit tests such as spec/arb_pixel_buffer_object/pbo-read-argb8888 Fixes: 8e7893eb53213 ("nvc0: add support for BGRA8 images") Signed-off-by: Lyude <[email protected]> Reviewed-by: Ilia Mirkin <[email protected]> Cc: [email protected] (cherry picked from commit 245912b684b862d47cde10052b137d76a55d0bd3)
* xlib: fix glXGetCurrentDisplay() failureBrian Paul2017-06-144-5/+18
| | | | | | | | | | | | | | | | | | glXGetCurrentDisplay() has been broken for years and nobody noticed until recently. This change adds a new XMesaGetCurrentDisplay() that the GLX emulation API can call, just as we did for glXGetCurrentContext(). Tested by hacking glxgears to call glXGetCurrentContext() before and after glXMakeCurrent() to verify the return value is NULL beforehand and the same as the opened display afterward. Also tested by Tom Hudson with his tests programs. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100988 Cc: [email protected] Tested-by: Tom Hudson <[email protected]> Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit c6ba85a8c0f02b3b7058dae7afb6c49f56567319)
* automake: Link all libGL.so variants with -Bsymbolic.Jose Fonseca2017-06-142-0/+2
| | | | | | | | | | | | | | | | | | | We were linking src/glx with -Bsymbolic, but not the classic/gallium X11 libGL.so. But it's always a good idea to build all libGL.so and all DRI drivers with -Bsymbolic, otherwise they might resolve symbols from the 3rd party application executable or shared libraries, which is _never_ what we want. In particular, this can happen when intercepting OpenGL calls with apitrace, before https://github.com/apitrace/apitrace/commit/63194b2573176ef34efce1a5c8b08e624b8dddf5 Cc: [email protected] Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit ce5e83b8a0c757072075e781a090d35d9dc0e285)
* i965/dri: Fix bad GL error in intel_create_winsys_renderbuffer()Chad Versace2017-06-141-5/+1
| | | | | | | | | | | | | | | | | This function never occurs in the callchain of a GL function. It occurs only in the callchain of eglCreate*Surface and the analogous paths for GLX. Therefore, even if a thread does have a bound GL context, emitting a GL error here is wrong. A misplaced GL error, when no GL call is made, can confuse clients. Cc: [email protected] Reviewed-by: Ian Romanick <[email protected]> (cherry picked from commit 9d996e94fbbfdb3692061009f5441cf61bba36ae) [Emil Velikov: resolve trivial conflicts] Signed-off-by: Emil Velikov <[email protected]> Conflicts: src/mesa/drivers/dri/i965/intel_fbo.c
* etnaviv: always do cpu_fini in transfer_unmapLucas Stach2017-06-141-3/+6
| | | | | | | | | | | | | | | | | | The cpu_fini() call pushes the buffer back into the GPU domain, which needs to be done for all buffers, not just the ones with CPU written content. The etnaviv kernel driver currently doesn't validate this, but may start to do so at a later point in time. If there is a temporary resource the fini needs to happen before the RS uses this one as the source for the upload. Also remove an invalid comment about flushing CPU caches, cpu_fini takes care of everything involved in this. Fixes: c9e8b49b885 ("etnaviv: gallium driver for Vivante GPUs") Cc: [email protected] Signed-off-by: Lucas Stach <[email protected]> Reviewed-by: Philipp Zabel <[email protected]> Reviewed-By: Wladimir J. van der Laan <[email protected]> (cherry picked from commit cab5996c2637c31a78a0196e42ec6de9eb61f270)
* docs: add sha256 checksums for 17.1.2Juan A. Suarez Romero2017-06-051-1/+2
| | | | Signed-off-by: Juan A. Suarez Romero <[email protected]>
* docs: add release notes for 17.1.2mesa-17.1.2Juan A. Suarez Romero2017-06-051-0/+186
| | | | Signed-off-by: Juan A. Suarez Romero <[email protected]>
* Update version to 17.1.2Juan A. Suarez Romero2017-06-051-1/+1
| | | | Signed-off-by: Juan A. Suarez Romero <[email protected]>
* anv: Require vertex buffers to come from a 32-bit heapJason Ekstrand2017-06-031-0/+12
| | | | | | | Reviewed-by: Nanley Chery <[email protected]> Cc: "17.1" <[email protected]> (cherry picked from commit 39adea9330376a64a4b5e8da98f5e055ebd3331e) Signed-off-by: Juan A. Suarez Romero <[email protected]>
* Revert "cherry-ignore: anv: Require vertex buffers to come from a 32-bit heap"Juan A. Suarez Romero2017-06-031-2/+0
| | | | This reverts commit b3e48a07c0bb0c58e73ec6d82f3a3104ec26aacb.
* i965: Rework Sandy Bridge HiZ and stencil layoutsJason Ekstrand2017-06-025-29/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sandy Bridge does not technically support mipmapped depth/stencil. In order to work around this, we allocate what are effectively completely separate images for each miplevel, ensure that they are page-aligned, and manually offset to them. Prior to layered rendering, this was a simple matter of setting a large enough halign/valign. With the advent of layered rendering, however, things got more complicated. Now, things weren't as simple as just handing a surface off to the hardware. Any miplevel of a normally mipmapped surface can be considered as just an array surface given the right qpitch. However, the hardware gives us no capability to specify qpitch so this won't work. Instead, the chosen solution was to use a new "all slices at each LOD" layout which laid things out as a mipmap of arrays rather than an array of mipmaps. This way you can easily offset to any of the miplevels and each is a valid array. Unfortunately, the "all slices at each lod" concept missed one fundamental thing about SNB HiZ and stencil hardware: It doesn't just always act as if you're always working with a non-mipmapped surface, it acts as if you're always working on a non-mipmapped surface of the same size as LOD0. In other words, even though it may only write the upper-left corner of each array slice, the qpitch for the array is for a surface the size of LOD0 of the depth surface. This mistake causes us to under-allocate HiZ and stencil in some cases and also to accidentally allow different miplevels to overlap. Sadly, piglit test coverage didn't quite catch this until I started making changes to the resolve code that caused additional HiZ resolves in certain tests. This commit switches Sandy Bridge HiZ and stencil over to a new scheme that lays out the non-zero miplevels horizontally below LOD0. This way they can all have the same qpitch without interfering with each other. Technically, the miplevels still overlap, but things are spaced out enough that each page is only in the "written area" of one LOD. Cc: "17.0 17.1" <[email protected]> Reviewed-by: Topi Pohjolainen <[email protected]> (cherry picked from commit 10903d228919085cdb160c563c481ed1cc09e34c) Signed-off-by: Juan A. Suarez Romero <[email protected]>
* anv: Advertise both 32-bit and 48-bit heaps when we have enough memoryJason Ekstrand2017-06-021-6/+36
| | | | | | | Reviewed-by: Nanley Chery <[email protected]> Cc: "17.1" <[email protected]> (cherry picked from commit 50d0eb5096bd9514821a641f25c0b3455c0f8a88) Signed-off-by: Juan A. Suarez Romero <[email protected]>
* anv: Refactor memory type setupJason Ekstrand2017-06-021-36/+40
| | | | | | | | | | This makes us walk over the heaps one at a time and add the types for LLC and !LLC to each heap. Reviewed-by: Nanley Chery <[email protected]> Cc: "17.1" <[email protected]> (cherry picked from commit 34581fdd4f149894dfa51777a2f7eb289bd08b71) Signed-off-by: Juan A. Suarez Romero <[email protected]>
* anv: Make supports_48bit_addresses a heap propertyJason Ekstrand2017-06-022-3/+14
| | | | | | | | | | | Reviewed-by: Nanley Chery <[email protected]> Cc: "17.1" <[email protected]> (cherry picked from commit b83b1af6f6936f36db42a8f8b8e0854d0f9491fd) [Juan A. Suarez: resolve trivial conflicts] Signed-off-by: Juan A. Suarez Romero <[email protected]> Conflicts: src/intel/vulkan/anv_device.c
* anv: Stop setting BO flags in bo_init_newJason Ekstrand2017-06-023-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | The idea behind doing this was to make it easier to set various flags. However, we have enough custom flag settings floating around the driver that this is more of a nuisance than a help. This commit has the following functional changes: 1) The workaround_bo created in anv_CreateDevice loses both flags. This shouldn't matter because it's very small and entirely internal to the driver. 2) The bo created in anv_CreateDmaBufImageINTEL loses the EXEC_OBJECT_ASYNC flag. In retrospect, it never should have gotten EXEC_OBJECT_ASYNC in the first place. Reviewed-by: Nanley Chery <[email protected]> Cc: "17.1" <[email protected]> (cherry picked from commit 00df1cd9d6234cdfc9fb2bf3615196ff83a3c956) [Juan A. Suarez: resolve trivial conflicts] Signed-off-by: Juan A. Suarez Romero <[email protected]> Conflicts: src/intel/vulkan/anv_allocator.c src/intel/vulkan/anv_device.c src/intel/vulkan/anv_queue.c
* anv: Add valid_bufer_usage to the memory type metadataJason Ekstrand2017-06-022-8/+26
| | | | | | | | | | | | | | | | Instead of returning valid types as just a number, we now walk the list and check the buffer's usage against the usage flags we store in the new anv_memory_type structure. Currently, valid_buffer_usage == ~0. Reviewed-by: Nanley Chery <[email protected]> Cc: "17.1" <[email protected]> (cherry picked from commit f7736ccf53eaeb66c4270afe0916e2cb29ab8667) [Juan A. Suarez: resolve trivial conflicts] Signed-off-by: Juan A. Suarez Romero <[email protected]> Conflicts: src/intel/vulkan/anv_device.c src/intel/vulkan/anv_private.h
* anv: Determine the type of mapping based on type metadataJason Ekstrand2017-06-022-7/+7
| | | | | | | | | | | | | | | | Before, we were just comparing the type index to 0. Now we actually look the type up in the table and check its properties to determine what kind of mapping we want to do. Reviewed-by: Nanley Chery <[email protected]> Cc: "17.1" <[email protected]> (cherry picked from commit 92325a7efc769c32e03031323e21700dc55171e4) [Juan A. Suarez: resolve trivial conflicts] Signed-off-by: Juan A. Suarez Romero <[email protected]> Conflicts: src/intel/vulkan/anv_device.c src/intel/vulkan/anv_private.h
* anv: Set EXEC_OBJECT_ASYNC when availableJason Ekstrand2017-06-028-4/+26
| | | | | | | | | | | | | | | | | | | Reviewed-by: Chad Versace <[email protected]> (cherry picked from commit 35e626bd0e59e7ce9fd97ccef66b2468c09206a4) Signed-off-by: Juan A. Suarez Romero <[email protected]> Squashed with: anv/tests: Create a dummy instance as well as device This fixes crashes caused by 35e626bd0e59e7ce9fd97ccef66b2468c09206a4 which made us start referencing the instance in the allocators. With this commit, the tests now happily pass again. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100877 Tested-by: Vinson Lee <[email protected]> (cherry picked from commit 6ef1bd4fa57b36efc7919773fd26c36fd43d2ea9) Signed-off-by: Juan A. Suarez Romero <[email protected]>
* Revert "cherry-ignore: anv: [...]"Juan A. Suarez Romero2017-06-021-11/+1
| | | | | | | | | | | | | | | | | | | | Revert "cherry-ignore: anv: Refactor memory type setup" This reverts commit eab4a503a0b04dfe1fdcfc2dcde62eb09c038aca. Revert "cherry-ignore: anv: Add valid_bufer_usage to the memory type metadata" This reverts commit c31e814a85a27249e2a57cb7350240c01a1cad58. Revert "cherry-ignore: anv: Advertise both 32-bit and 48-bit heaps when we have enough memory" This reverts commit e391144853640ee39fca8dfe0e9387bbf1d90a76. Revert "cherry-ignore: anv: Make supports_48bit_addresses a heap property" This reverts commit dbadd066321786ea9b8f0259413740a10f753f36. Revert "cherry-ignore: anv: Stop setting BO flags in bo_init_new" This reverts commit 07867f72cf53209d230b3fb13f24f9371ab9d4b4. Revert "cherry-ignore: anv: Determine the type of mapping based on type metadata" This reverts commit 9299466b83ce88c911b30b35d9f4f6addb25c92a.
* cherry-ignore: anv: Refactor memory type setupJuan A. Suarez Romero2017-06-011-1/+2
|
* cherry-ignore: anv: Add valid_bufer_usage to the memory type metadataJuan A. Suarez Romero2017-06-011-0/+2
|
* cherry-ignore: radv: fix regression in descriptor set freeingJuan A. Suarez Romero2017-06-011-0/+2
|
* cherry-ignore: anv: Require vertex buffers to come from a 32-bit heapJuan A. Suarez Romero2017-06-011-1/+2
|
* cherry-ignore: anv: Advertise both 32-bit and 48-bit heaps when we have ↵Juan A. Suarez Romero2017-06-011-0/+2
| | | | enough memory
* cherry-ignore: anv: Make supports_48bit_addresses a heap propertyJuan A. Suarez Romero2017-06-011-0/+2
|
* cherry-ignore: anv: Stop setting BO flags in bo_init_newJuan A. Suarez Romero2017-06-011-0/+2
|
* cherry-ignore: anv: Determine the type of mapping based on type metadataJuan A. Suarez Romero2017-06-011-0/+2
|
* cherry-ignore: radeonsi: load patch_id for TES-as-ES when exporting for PSJuan A. Suarez Romero2017-06-011-0/+2
|
* r100: Use _mesa_get_format_base_format in radeon_update_wrapperIan Romanick2017-06-011-1/+1
| | | | | | | | | | | | | | | | The wrapper is for a renderbuffer around a texture. Textures can have formats (e.g., 3) that aren't valide for API generated renderbuffers. _mesa_base_fbo_format will return 0, but _mesa_get_format_base_format will return the base format of RGB. Fixes a crashes in piglit tests fbo-alphatest-formats (all subtests pass) and fbo-colormask-formats (some subtests pass, some fail). Signed-off-by: Ian Romanick <[email protected]> Cc: [email protected] Reviewed-by: Kenneth Graunke <[email protected]> (cherry picked from commit 303b47f253f595ca0f708bef1059cbb4996f83a0) Signed-off-by: Juan A. Suarez Romero <[email protected]>
* r100,r200: Don't assume glVisual is non-NULL during context creationIan Romanick2017-06-013-3/+1
| | | | | | | | | | | | | Thanks to EGL_MESA_configless_context, the visual pointer can be NULL. Fixes a segfault (or assertion failure) in piglit's egl-configless-context test. Signed-off-by: Ian Romanick <[email protected]> Cc: [email protected] Reviewed-by: Kenneth Graunke <[email protected]> (cherry picked from commit c24881d39c139c451c1c096d6b0a98c8945c902b) Signed-off-by: Juan A. Suarez Romero <[email protected]>
* r100: Don't assume that the base mipmap of a texture existsIan Romanick2017-06-011-4/+10
| | | | | | | | | | Fixes crashes in piglit's gl-1.2-texture-base-level. Signed-off-by: Ian Romanick <[email protected]> Cc: [email protected] Reviewed-by: Kenneth Graunke <[email protected]> (cherry picked from commit 2dcec62075d8da8b7d8741df75b09907e1eea460) Signed-off-by: Juan A. Suarez Romero <[email protected]>
* egl/android: fix segfault within swap_buffersTapani Pälli2017-06-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Function droid_swap_buffers may get called without dri2_surf->buffer set, in these cases we don't have a back buffer set either. Patch fixes segfault seen with 3DMark that uses android.opengl.GLSurfaceView for rendering it's UI. backtrace: #00 pc 00013f88 /system/lib/egl/libGLES_mesa.so (droid_swap_buffers+104) #01 pc 000117b2 /system/lib/egl/libGLES_mesa.so (dri2_swap_buffers+50) #02 pc 000058b2 /system/lib/egl/libGLES_mesa.so (eglSwapBuffers+386) #03 pc 00011329 /system/lib/libEGL.so (eglSwapBuffersWithDamageKHR+553) #04 pc 000118e7 /system/lib/libEGL.so (eglSwapBuffers+55) #05 pc 000754dc /system/lib/libandroid_runtime.so Note, this is v1 as v2 caused dEQP regressions. Fixes: 2acc69d ("EGL/Android: Add EGL_EXT_buffer_age extension") Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Acked-by: Emil Velikov <[email protected]> Cc: "17.1" <[email protected]> (cherry picked from commit f347bac30f4045a9583f95a5776484b1a2947183) Signed-off-by: Juan A. Suarez Romero <[email protected]>
* Revert "android: fix segfault within swap_buffers"Juan A. Suarez Romero2017-06-011-8/+0
| | | | | | | | This reverts commit 4d4558411db166d2d66f8cec9cb581149dbe1597. See https://lists.freedesktop.org/archives/mesa-stable/2017-June/006408.html Signed-off-by: Juan A. Suarez Romero <[email protected]>
* configure.ac: Also match -androideabi tupleNicolas Boichat2017-06-011-1/+1
| | | | | | | | | | On ARM Android platforms, the host_os tuple should be linux-androideabi, so let's match both -android and -androideabi (or any other -android* tuple) to determine if we should do an Android build. Reviewed-by: Chad Versace <[email protected]> (cherry picked from commit f6ac3d0db67dd81f0aff754b977ed1277b33af63) Signed-off-by: Juan A. Suarez Romero <[email protected]>
* st/mesa: remove redundant stfb->iface checksNicolai Hähnle2017-06-012-9/+2
| | | | | | | | | | | | stfb->iface is always non-NULL for an st_framebuffer. These checks were incorrect, relying on out-of-bounds memory access in the surface-less case of EGL_KHR_surfaceless_context. v2: remove redundant stread check (Marek) Reviewed-by: Marek Olšák <marek@[email protected]> (v2) (cherry picked from commit 9d346af322e3f9d6d52e00759e8c3cd37c192004) Signed-off-by: Juan A. Suarez Romero <[email protected]>