summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* radeonsi: add a workaround for GFX9 hang with init_config alignmentMarek Olšák2018-03-201-1/+2
| | | | | | Fixes: 75c5d25f0f34cd702 "radeonsi: align command buffer starting address to fix some Raven hangs" Cc: 17.3 18.0 <[email protected]> (cherry picked from commit 2bdb54bce77828ef20b730ad869b66c5889b5347)
* radeonsi: align command buffer starting address to fix some Raven hangsMarek Olšák2018-03-205-5/+27
| | | | | | | | | | | | Cc: 17.3 18.0 <[email protected]> Reviewed-by: Christian König <[email protected]> Reviewed-by: Alex Deucher <[email protected]> (cherry picked from commit 75c5d25f0f34cd70246ee1b0b77a75ec82dfcecb) [Emil Velikov: remove uvd_enc hunk - missing in branch] Signed-off-by: Emil Velikov <[email protected]> Conflicts: src/amd/common/ac_gpu_info.c
* st/mesa: expose 0 shader binary formats for compat profiles for QtMarek Olšák2018-03-204-6/+14
| | | | | | | | Bugzilla: https://bugreports.qt.io/browse/QTBUG-66420 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105065 Cc: "18.0" <[email protected]> Tested-by: Kai Wasserbäch <[email protected]> (cherry picked from commit 55376cb31e2f495a4d872b4ffce2135c3365b873)
* radv: make sure to emit cache flushes before starting a querySamuel Pitoiset2018-03-203-7/+33
| | | | | | | | | | | | If the query pool has been previously resetted using the compute shader path. Fixes: a41e2e9cf5 ("radv: allow to use a compute shader for resetting the query pool") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105292 Cc: "18.0" <[email protected]> Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> (cherry picked from commit c956d0f4069cf39d8d3c57ebed8d905575e9ea34)
* swr/rast: Fix index buffer overfetch issue for non-indexed drawsGeorge Kyriazis2018-03-201-0/+15
| | | | | | | | | | | | Populate pLastIndex, even for the non-indexed case. An zero pLastIndex can cause the index offsets inside the fetcher to have non-sensical values that can be either very large positive or very large negative numbers. cc: "18.0" <[email protected]> Reviewed-by: Bruce Cherniak <[email protected]> (cherry picked from commit 539de78633c45598e0b1e3b7763ea318f9200c32) [George Kyriazis: patch is a backport for 18.0 of the cherry-pick above]
* glsl/linker: fix bug when checking precision qualifierSamuel Iglesias Gonsálvez2018-03-201-8/+3
| | | | | | | | | | | | | | | | According to GLSL ES 3.2 spec, see table in 9.2.1 "Linked Shaders" section, the precision qualifier should match for uniform variables. This also applies to previous GLSL ES 3.x specs. This 'if' checks the condition for uniform variables, while for UBOs it is checked in link_interface_blocks.cpp. Fixes: b50b82b8a553 ("glsl/es31: precision qualifier doesn't need to match in shader interface block members") Signed-off-by: Samuel Iglesias Gonsálvez <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> (cherry picked from commit e207b2e2c8dea99972e744c8fdfa0b9a9481ea5e)
* r600: partly revert disabling tiling for 1d texture.Dave Airlie2018-03-201-0/+5
| | | | | | | | | | | | | Previously we had a check for 1d of narrow 2D textures, however narrow 2d textures caused gpu hangs, but it was correct for 1d textures. This fixes a bunch of 1D image piglits for me. Fixes: 7b8e1c089d (r600/texture: drop lowering 1d/2d images to linear.) Reviewed-by: Roland Scheidegger <[email protected]> Signed-off-by: Dave Airlie <[email protected]> (cherry picked from commit a5853a33332d51382cae42397f353817e47cccc9)
* nir: fix interger divide by zero crash during constant foldingTimothy Arceri2018-03-201-2/+2
| | | | | | | | | | | | | From the GLSL 4.60 spec Section 5.9 (Expressions): "Dividing by zero does not cause an exception but does result in an unspecified value." Fixes: 89285e4d47a6 "nir: add new constant folding infrastructure" Reviewed-by: Jason Ekstrand <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105271 (cherry picked from commit 0c1f37cc2d8555223ade73b244a3ee374be8d9cd)
* meson: fix building without GLDylan Baker2018-03-201-9/+10
| | | | | | | | | | | | | | | | | libgl will be undefined _glx, so move that check inside the `if with_glx != 'disabled'` block. v2: - Simplify commit message (Eric, Emil) Fixes: 5c460337fd9c109 ("meson: Fix GL and EGL pkg-config files with glvnd") Reported-by: Jason Ekstrand <[email protected]> Signed-off-by: Dylan Baker <[email protected]> CC: Daniel Stone <[email protected]> Acked-by: Jason Ekstrand <[email protected]> Untested-by: Jason Ekstrand <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit b9636fe38aea6af1d3a30528da89069fc390b6a0)
* r600: fix tgsi clock last settingDave Airlie2018-03-201-0/+1
| | | | | | | | On cayman this was hitting an assert later, which probably wasn't see on non-cayman due to having the t slot. Fixes: 9041730d1 (r600: add support for ARB_shader_clock.) (cherry picked from commit 0cc5be7741aa77bd65046d627370c18839e0da25)
* meson: Fix GL and EGL pkg-config files with glvndDylan Baker2018-03-202-2/+21
| | | | | | | | | | | | | | Currently meson will generate a pkg-config that links to EGL_mesa (or GLX_mesa), but this isn't correct, it should always link to EGL or GL. Probably the "right" solution is to have glvnd itself provide the pkg config files for GL and EGL, but that also means that glvnd needs to provide many of the header files, which makes it a more involved job. Fixes: a47c525f3281a27 ("meson: build glx") Fixes: 035ec7a2bb2d5e4 ("meson: Add support for EGL glvnd") Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Daniel Stone <[email protected]> (cherry picked from commit 5c460337fd9c1096dea4bc569bd876a112ed6f16)
* egl/dri2: fix segfault when display initialisation failsFrank Binns2018-03-201-1/+1
| | | | | | | | | | | | | dri2_display_destroy() is called when platform specific display initialisation fails. However, this would typically lead to a segfault due to the dri2_egl_display vbtl not having been set up. Fixes: 2db95482964 ("loader_dri3/glx/egl: Optionally use a blit context for blitting operations") Signed-off-by: Frank Binns <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 6160bf97db8bc493512795b1fa49c072a703df50)
* ac/nir: use ordered float comparisons except for not equalSamuel Pitoiset2018-03-201-3/+3
| | | | | | | | | | | | | | | | | | | Original patch from Timothy Arceri, I have just fixed the not equal case locally. This fixes one important rendering issue in Wolfenstein 2 (the cutscene transition issue). RadeonSI uses the same ordered comparisons, so I guess that what we should do as well. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104302 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104905 Cc: <[email protected]> Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Reviewed-by: Connor Abbott <[email protected]> (cherry picked from commit e05507a427b79e481eb8e45d7aa3c9b4b78376bf)
* android: vulkan/util: add dependency on libnativewindow for O and laterMauro Rossi2018-03-201-0/+4
| | | | | | | | | | | | | | | Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") Fixes the following building error: In file included from out/target/product/x86_64/obj_x86/STATIC_LIBRARIES/libmesa_vulkan_util_intermediates/util/vk_enum_to_str.c:26: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^~~~~~~~~~~~~~~~~ 1 error generated. Cc: "18.0" <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 6451b0703ff3027b746d6268b98dd2b3e6698be5)
* android: anv: add dependency on libnativewindow for O and laterMauro Rossi2018-03-201-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") Fixes the following building errors: In file included from external/mesa/src/intel/vulkan/gen7_cmd_buffer.c:30: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^~~~~~~~~~~~~~~~~ 1 error generated. ... In file included from external/mesa/src/intel/vulkan/anv_gem.c:32: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^~~~~~~~~~~~~~~~~ 1 error generated. Cc: "18.0" <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit d448954228e69fd1b4000ea13e28c2ba2832db13) [Emil Velikov: drop gen11 hunk] Signed-off-by: Emil Velikov <[email protected]> Conflicts: src/intel/Android.vulkan.mk
* android: anv/extensions: fix generated sources buildMauro Rossi2018-03-201-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Building rules are aligned to automake ones The correct script to build anv_extensions.{c,h} is anv_extensions_gen.py Generation rules for anv_extensions.c requires --out-c option Generation rules for anv_extensions.h were missing Necessary include paths are added to avoid following build errors: cp: cannot stat '.../gen/STATIC_LIBRARIES/libmesa_vulkan_common_intermediates/vulkan/anv_extensions.c': No such file or directory In file included from external/mesa/src/intel/vulkan/anv_gem.c:32: external/mesa/src/intel/vulkan/anv_private.h:75:10: fatal error: 'anv_extensions.h' file not found ^~~~~~~~~~~~~~~~~~ 1 error generated. In file included from external/mesa/src/intel/vulkan/anv_batch_chain.c:30: external/mesa/src/intel/vulkan/anv_private.h:75:10: fatal error: 'anv_extensions.h' file not found ^~~~~~~~~~~~~~~~~~ 1 error generated. Fixes: dd088d4bec7 ("anv/extensions: Generate a header file with extension tables") Cc: "18.0" <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> (cherry picked from commit 9a508b719be32ef10ca929250b7aafba313104c6)
* r600: Take ALU_EXTENDED into account when evaluating jump offsetsGert Wollny2018-03-201-2/+7
| | | | | | | | | | | | ALU_EXTENDED needs 4 DWORDS instead of the usual 2, hence if the last ALU clause within a IF-JUMP or ELSE branch is ALU_EXTENDED the target jump offset needs to be adjusted accordingly. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104654 Cc: <[email protected]> Signed-off-by: Gert Wollny <[email protected]> Reviewed-by: Dave Airlie <[email protected]> (cherry picked from commit c7cadcbda47537d474eea52b9e77e57ef9287f9b)
* i965: Fix KHR_blend_equation_advanced with some render targets.Francisco Jerez2018-03-201-1/+3
| | | | | | | | | | | | | | | | | This reverts two bogus and seemingly useless changes from the commits referenced below, which broke KHR_blend_equation_advanced (and EXT_shader_framebuffer_fetch_non_coherent which wasn't exposed yet) for any kind of render target surface that would cause the get_isl_surf() call in brw_emit_surface_state() to do anything useful (notice how the result of get_isl_surf() is completely ignored by the caller right now), as was the case while using those extensions with 1D array or 3D framebuffers in particular. Fixes: f5859b45b1686e8116380d87 "i965/miptree: Switch remaining surfaces to isl" Fixes: bf24c3539e4b6989512968ca "i965/miptree: Clean-up unused" Cc: [email protected] Reviewed-by: Plamena Manolova <[email protected]> (cherry picked from commit 27c829da28ab3cfac0195d02ffb13afa8fe0e23d)
* radv: Really use correct HTILE expanded words.James Legg2018-03-201-3/+3
| | | | | | | | | | | | | | | | | | | | | When transitioning to an htile compressed depth format, Set the full depth range, so later rasterization can pass HiZ. Previously, for depth only formats, the depth range was set to 0 to 0. This caused unwanted HiZ rejections with a VK_FORMAT_D16_UNORM depth buffer (VK_FORMAT_D32_SFLOAT was not affected somehow). These values are derived from PAL [0], since I can't find the specification describing the htile values. [0] https://github.com/GPUOpen-Drivers/pal/blob/5cba4ecbda9452773f59692f5915301e7db4a183/src/core/hw/gfxip/gfx9/gfx9MaskRam.cpp#L1500 CC: Dave Airlie <[email protected]> CC: Bas Nieuwenhuizen <[email protected]> CC: [email protected] Reviewed-by: Bas Nieuwenhuizen <[email protected]> Tested-by: Grazvydas Ignotas <[email protected]> Fixes: 5158603182fe7435 "radv: Use correct HTILE expanded words." (cherry picked from commit afd8fd0656a8eb3a2ce892381387aad3c6b0a78f)
* i965: perf: ensure reading config IDs from sysfs isn't interruptedLionel Landwerlin2018-03-201-1/+2
| | | | | | | | Fixes: 458468c136e "i965: Expose OA counters via INTEL_performance_query" Signed-off-by: Lionel Landwerlin <[email protected]> Cc: <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> (cherry picked from commit bd9672695b6b95085bb0af1d8eec9b550cdb01e6)
* swr/rast: blend_epi32() should return Integer, not FloatGeorge Kyriazis2018-03-201-1/+1
| | | | | | | | | fix gcc8 compiler error for KNL. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105029 Reviewed-by: Bruce Cherniak <[email protected]> (cherry picked from commit f1fbeb1a530f46402b201756b3e76a9b4ef0739b) Fixes: fc4f6c44c47 ("swr/rast: Switch intrinsic usage to SIMDLib")
* nvir/nvc0: fix legalizing of ld unlock c0[0x10000]Karol Herbst2018-03-201-1/+1
| | | | | | | | | | We have to increase the file index also for 0x10000 not just for values greater than 0x10000. Fixes: 37b67db6ae34fb6586d640a7a1b6232f091dd812 Signed-off-by: Karol Herbst <[email protected]> Reviewed-by: Ilia Mirkin <[email protected]> (cherry picked from commit 7319311a504c06890181044668c8d01cf5ddd322)
* glsl/tests: Fix a compiler warning about signed/unsigned loop comparison.Eric Anholt2018-03-201-1/+1
| | | | | | Fixes: d32956935edf ("glsl: Walk a list of ir_dereference_array to mark array elements as accessed") Reviewed-by: Ian Romanick <[email protected]> (cherry picked from commit 4636ce362d4defc70a2b40cab1f52d1c890f5673)
* glsl: Silence warnings in the uniform initializer test about 16-bit typesEric Anholt2018-03-201-0/+9
| | | | | | | | | | They should probably get unit tests implemented, but this cleans up a bunch of warnings in my build for now. Fixes: 59f458cd8703 ("glsl: Add 16-bit types") Cc: Eduardo Lima Mitev <[email protected]> Reviewed-by: Ian Romanick <[email protected]> (cherry picked from commit 1b313eedb5e5da3c7ee3f62a83b66a6e097fe0d3)
* i965: Fix aux-surface size checkDaniel Stone2018-03-202-3/+12
| | | | | | | | | | | | | | | | | | | | The previous commit reworked the checks intel_from_planar() to check the right individual cases for regular/planar/aux buffers, and do size checks in all cases. Unfortunately, the aux size check was broken, and required the aux surface to be allocated with the correct aux stride, but full image height (!). As the ISL aux surface is not recorded in the DRIimage, we cannot easily access it to check. Instead, store the aux size from when we do have the ISL surface to hand, and check against that later when we go to access the aux surface. Signed-off-by: Daniel Stone <[email protected]> Fixes: c2c4e5bae3ba ("i965: Fix bugs in intel_from_planar") Reviewed-by: Jason Ekstrand <[email protected]> (cherry picked from commit 9d21dbeb88bc99ca0e153c11265e19536ad36b61)
* meson: freedreno depends on nirDylan Baker2018-03-201-0/+1
| | | | | | | | | | This fixes a race condition in building targets that link in freedreno. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105120 Fixes: 0bbecc5a8548883f76a7 ("meson: define driver dependencies") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Mark Janes <[email protected]> (cherry picked from commit 03ab40b1f7bbff7f1c6ba128e202bdf31352ea66)
* egl/wayland: Always use in-tree wayland-egl-backend.hDaniel Stone2018-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | A recent patchset to Wayland[0] migrated Mesa's libwayland-egl backend into Wayland itself, so implementations could provide backends. Mesa still uses its own, and the two have already diverged[1]. The include from egl_dri2.h could pick up either the installed Wayland wayland-egl-backend.h (with a 'driver_private' member), or the Mesa internal wayland-egl-backend.h (with a 'private' member), failing the build in the first instance. Add an explicit directory prefix to the include, so we always get our in-tree version. [0]: https://patchwork.freedesktop.org/series/31663/ [1]: https://cgit.freedesktop.org/wayland/wayland/commit/?id=9fa60983b579 Signed-off-by: Daniel Stone <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105103 Fixes: 198af27c679c ("wayland-egl: rename wayland-egl-{priv,backend}.h") (cherry picked from commit ff5432dc506111788ef19d25466b8c4ac91478d3)
* virgl: remap query types to hw support.Dave Airlie2018-03-201-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | The gallium query types changed, so we need to remap from the gallium ones to the virgl ones. Fixes: dEQP-GLES3.functional.transform_feedback.basic_types* "This also fixes: dEQP-GLES3.functional.transform_feedback.array.separate* dEQP-GLES3.functional.transform_feedback.array_element* dEQP-GLES3.functional.transform_feedback.interpolation.* Gallium's p_defines.h and virglrenderer's p_defines.h have diverged quite a bit, so not including PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE there makes sense for now." - Gurchetan Singh Fixes: 3f6b3d9db (gallium: add PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE) Reviewed-by: Gurchetan Singh <[email protected]> Tested-by: Gurchetan Singh <[email protected]> Signed-off-by: Dave Airlie <[email protected]> (cherry picked from commit 60c14a0db25d3dd246744858179a52548325c25f)
* meson: fix xvmc target linkageDylan Baker2018-03-201-3/+4
| | | | | | | | | | | | | This needs to link the state tracker with --whole-archive to expose the right symbols. v4: - Always add libswdri and libswkmsdri to the link_with list Fixes: 22a817af8a89eb3c7 ("meson: build gallium xvmc state tracker") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 2ab1ce30c4543fb4091795cbf6a5526e74c9e4aa)
* meson: Fix xa target linkageDylan Baker2018-03-201-3/+5
| | | | | | | | | | | | | This needs to use --whole-archive (link_whole in meson) to properly expose symbols. v4: - Always add libswdri and libswkmsdri to link_with list Fixes: 0ba909f0f111824 ("meson: build gallium xa state tracker") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 0b73c329bc024d94d85d4e0bf5e95cd8be635eb2)
* meson: Fix omx-bellagio target linkageDylan Baker2018-03-201-3/+4
| | | | | | | | | | | | | This needs to use --whole-archive (link_whole in meson) to properly expose symbols. v4: - Always add libswdri and libswkmsdri to link_with Fixes: 1d36dc674d528b93b ("meson: build gallium omx state tracker") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 91a59b628745a1f77b446c85ab6163a50ebe2e55)
* meson: fix va target linkageDylan Baker2018-03-201-3/+4
| | | | | | | | | | | | | | The state tracker needs to be linked with whole-archive (like autotools). As a result there are symbols from libswdri and libswkmsdri that are needed, so link those as well. v4: - Always add libswdri and libswkmsdri to link_with list Fixes: 5a785d51a6d6 ("meson: build gallium va state tracker") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 2e4be28fb2a256c423485cc99b1250b2d3c92da6)
* meson: fix vdpau target linkageDylan Baker2018-03-201-3/+5
| | | | | | | | | | | | | | The VDPAU state tracker needs to be linked with whole-archive (autotools does this). Because we are linking the whole archive we alos need to link with libswdri and libswkmsdri if those have been enabled. v4: - Always add libswdri and libswkmsdri to link_with list Fixes: 68076b87474e7959 ("meson: build gallium vdpau state tracker") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 90d361753ce5a5e705adecbc68edaf7a6d0f51ee)
* meson: Actually link xvmc target with libxvmcDylan Baker2018-03-201-3/+0
| | | | | | | | | | Unlike vdpau this is required. Fixes: 22a817af8a89eb3c7 ("meson: build gallium xvmc state tracker") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 340305576840c2a432202f1ace9279f490d87e59)
* meson: actually link with libomxil-bellagioDylan Baker2018-03-201-5/+0
| | | | | | | | | | This state tracker actually needs to link, unlike vdpau. Fixes: 1d36dc674d528b93b ("meson: build gallium omx state tracker") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 77081038579ed7ef3d0962637cddd6fae4d6d4fa)
* meson: link dri3 xcb libs into vlwinsys instead of into each targetDylan Baker2018-03-206-18/+11
| | | | | | | | | | | This makes the dependencies easier to manage, since each media target doesn't need to worry about linking to half a dozen libraries. Fixes: b1b65397d0c4978e3 ("meson: Build gallium auxiliary") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 7023b373ec76a2ea25b1bd0a7501276de9007047)
* meson: use va-api version reported by pkg-configDylan Baker2018-03-202-4/+4
| | | | | | | | Fixes: 5a785d51a6d6 ("meson: build gallium va state tracker") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 424e654cb02182c00d1b76c512a8fe17af281e4b)
* meson: dedup gallium-xa logicEric Engestrom2018-03-201-15/+10
| | | | | | Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]> (cherry picked from commit 2f0db33527fc5415858e60d76d5b82c5492151fa)
* meson: dedup gallium-va logicEric Engestrom2018-03-201-20/+18
| | | | | | Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]> (cherry picked from commit fa5d616bf907bedda6904cdff98832d9c8c59770)
* meson: dedup gallium-omx logicEric Engestrom2018-03-201-19/+19
| | | | | | Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]> (cherry picked from commit 86168ed31c52ca5be3b618a5aae2e5d8990f4c31)
* meson: dedup gallium-xvmc logicEric Engestrom2018-03-201-20/+18
| | | | | | Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]> (cherry picked from commit 724916c8a84b5bba8f880f17da936585d52c97b6)
* meson: dedup gallium-vdpau logicEric Engestrom2018-03-201-22/+19
| | | | | | Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]> (cherry picked from commit 992af0a4b8224bdb4809e01c2f00d2f32546aee5)
* meson: add libswdri and libswkmsdri to dri link_withDylan Baker2018-03-201-9/+2
| | | | | | | | Fixes: b154b44ae342 ("meson: build radeonsi gallium driver") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 8eb608df61912cfd0633fe982b140e22e7563770)
* meson: add libswdri and libswkmsdri to d3dadaptor link_withDylan Baker2018-03-201-10/+3
| | | | | | | | | | v5: - Fix libswdi -> libswdri typo Fixes: 6b4c7047d571 ("meson: build gallium nine state_tracker") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit be879f9f290c5277097ec82ffb7d8d2de2e2707a)
* meson: define empty variables for libswdri and libswkmsdriDylan Baker2018-03-203-5/+12
| | | | | | | | | | | | | | | | This allows these variables to unconditionally included in `link_with` lists, even if they're not used. This allows deleting duplicated logic in nearly every gallium target implemented in meson today. This also removes the now useless `build_by_default` flag from swdri and swkmsdri. v4: - add this patch Fixes: 66c94b9313a697ce8f2b222f4ba353035e4b8726 ("meson: build gallium winsys for dri, null, and wrapper") Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit d672084ba29a64f5ec8c9cd23d4b77c0efa05693)
* meson: use depend_files for adding extra file dependenciesDylan Baker2018-03-201-2/+2
| | | | | | | | cc: Jason Ekstrand <[email protected]> Fixes: dd088d4bec74f37ffe4 ("anv/extensions: Generate a header file with extension tables") Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]> (cherry picked from commit 0e617c04f16563381b3d9bd1ddd092e32e38a843)
* meson: use depend_files to track extra file dependenciesDylan Baker2018-03-201-2/+2
| | | | | | | | cc: Jason Ekstrand <[email protected]> Fixes: f93994080993bda ("anv: Split anv_extensions.py into two files") Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]> (cherry picked from commit b03969a5adeffaceec7ff722e90205c4284b1f1e)
* Revert "anv/meson: Make anv_entrypoints_gen.py depend on anv_extensions.py"Dylan Baker2018-03-201-2/+1
| | | | | | | | | | | | | | This reverts commit 10d1b0be8e9c463dbc35cd66968299f33c76672c. This is unnecessary, the depend_files argument is for adding dependencies on files that are not part of the input, which is already done. cc: Jason Ekstrand <[email protected]> Fixes: 10d1b0be8e9c463dbc35cd66968299f33c76672c Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]> (cherry picked from commit 384bff13e034bcca06eec1bdf50a3913f9e941db)
* meson: use a custom target instead of a generator for i965 oaDylan Baker2018-03-201-11/+10
| | | | | | | | | | | | | | | | | | | Generators really are never the thing you want. The problem in this case is that a generator must create a file that contains any file that the generated target depends on. Since brw_oa.py doesn't generate such a file the generated sources are not regenerated even if the xml files they should depend on changes. While we could change brw_oa.py to write such a file, that's silly, it depends on itself and the xml file. So we'll just use a custom target instead, which will have the correct dependency behavior and doesn't really add that much code. Fixes: 3218056e0eb3 ("meson: Build i965 and dri stack") CC: Ian Romanick <[email protected]> Signed-off-by: Dylan Baker <[email protected]> Acked-by: Lionel Landwerlin <[email protected]> (cherry picked from commit 5317211fa029ee8d0e1c802ef8c01f64c470e3d5)
* mesa: add missing switch case for EXTRA_VERSION_40 in check_extra()Brian Paul2018-03-201-0/+5
| | | | | | | | | | | The EXTRA_VERSION_40 predicate is tested as part of extra_gl40_ARB_sample_shading but there was no switch case for it. Fixes: 77b440e42d8e7247c2295 ("mesa: Add new functions and enums required by GL_ARB_sample_shading") Reviewed-by: Eric Engestrom <[email protected]> (cherry picked from commit b08d718703bc907d9cb99887f90ea80d7e91dc45)