summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* docs: add release notes for 17.0.6mesa-17.0.6Andres Gomez2017-05-121-0/+185
| | | | Signed-off-by: Andres Gomez <[email protected]>
* Update version to 17.0.6Andres Gomez2017-05-121-1/+1
| | | | Signed-off-by: Andres Gomez <[email protected]>
* cherry-ignore: rejected commitsAndres Gomez2017-05-121-0/+16
| | | | | | stable: rejected commits. Signed-off-by: Andres Gomez <[email protected]>
* cherry-ignore: fix regression in descriptor set freeing.Andres Gomez2017-05-121-0/+2
| | | | | | fixes: Fixes earlier commit 126d5ad which did not land in branch Signed-off-by: Andres Gomez <[email protected]>
* cherry-ignore: 17.1 nominations onlyAndres Gomez2017-05-121-0/+39
| | | | | | stable: 17.1 nominations only. Signed-off-by: Andres Gomez <[email protected]>
* radeonsi: apply the tess+GS hang workaround to Polaris12 as wellMarek Olšák2017-05-121-1/+2
| | | | | | | | | | | | Cc: 17.1 <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]> (cherry picked from commit ee5908396e4b0d4be64d8bc486d25c2e95b7fd71) [Andres Gomez: resolve trivial conflicts] Signed-off-by: Andres Gomez <[email protected]> Conflicts: src/gallium/drivers/radeonsi/si_state_draw.c
* radv: enable POLARIS12 support.Dave Airlie2017-05-123-0/+7
| | | | | | | | | | | | | | | | | This just adds the chip in the right places. We don't set the partial_vs_wave workaround, as radeonsi doesn't, but have to confirm it's not required. Reviewed-by: Bas Nieuwenhuizen <[email protected]> Cc: "17.1" <[email protected]> Signed-off-by: Dave Airlie <[email protected]> (cherry picked from commit a096d8d3f7a8c6dffc91b2ac1794fdd215c054d3) [Andres Gomez: dropped code that didn't make it for 17.0] Signed-off-by: Andres Gomez <[email protected]> Conflicts: src/amd/vulkan/radv_device.c
* radeonsi: fix gl_PrimitiveID in tessellation with instanced draws on SINicolai Hähnle2017-05-121-0/+14
| | | | | | Cc: [email protected] Reviewed-by: Marek Olšák <[email protected]> (cherry picked from commit f16b7558632d1d2d355a8251e969b8fc41f9c1e8)
* freedreno/a3xx: fix hang w/ large render targets and small gmemRob Clark2017-05-123-0/+7
| | | | | | | | | | Possibly other gen's have a similar limit. Fixes glmark2 -b shadow with larger resolutions on devices with small gmem (for example, fullscreen 1080p on 8x16/db410c). Cc: [email protected] Signed-off-by: Rob Clark <[email protected]> (cherry picked from commit 6050d5bf3d8d0043386de35cad4efa77e8be957e)
* scons: update for LLVM 4.0Ben Boeckel2017-05-121-2/+20
| | | | | | | | | | | | | LLVMDemangle, LLVMGlobalISel, and LLVMDebugInfoMSF are new. Also update the comment to add irreader to the list of components. CC: <[email protected]> Reviewed-by: Chuck Atkins <[email protected]> Signed-off-by: Ben Boeckel <[email protected]> Acked-by: Emil Velikov <[email protected]> Reviewed-by: Jose Fonseca <[email protected]> (cherry picked from commit 58f51f0754d736e76248e075bd25424ff4b64b46)
* nir/lower_tex: Fix minor error in YUV color conversion matrixJohnson Lin2017-05-121-3/+3
| | | | | | | | | | | | | | | | The matrix used for YCbCr to RGB is listed in: https://en.wikipedia.org/wiki/YCbCr There was an error in converting the offsets from integers to unorm values: 0.0625=16/256 should be 16.0/255,and 0.5=128.0/256 should be 128.0/255. With this fix, the CSC result is bit aligned with wikipedia's conversion result and FFMPeg's result. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100854 Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Kristian H. Kristensen <[email protected]> (cherry picked from commit a6fb943f3eb86ca501a7e7b8d4621ba215f91133)
* egl/android: Mark surface as lost when dequeueBuffer failsChad Versace2017-05-121-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that future calls to eglSwapBuffers and eglMakeCurrent emit an error. This patch is part of a series for fixing android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface on Chrome OS x86 devices. Cc: [email protected] Cc: Tomasz Figa <[email protected]> Cc: Tapani Pälli <[email protected]> Reviewed-by: Nicolas Boichat <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit e5eace586848511f4ceaffaa2d45131c31c45ae0) Squashed with commit: egl/android: Set EGLSurface.Lost to EGL_TRUE/EGL_FALSE Lost is an EGLBoolean, so we should assign it to EGL_TRUE/EGL_FALSE, not true/false. Fixes: e5eace58684 ("egl/android: Mark surface as lost when dequeueBuffer fails") Fixes: 0212db35040 ("egl/android: Cancel any outstanding ANativeBuffer in surface destructor") Reviewed-by: Chad Versace <[email protected]> (cherry picked from commit 63b12b0c77759a0244416cd1406c2bf50e7c01ec)
* egl/android: Cancel any outstanding ANativeBuffer in surface destructorChad Versace2017-05-121-4/+9
| | | | | | | | | | | | | | | | | | | | That is, call ANativeWindow::cancelBuffer in droid_destroy_surface(). This should prevent application deadlock when the app destroys the EGLSurface after EGL has acquired a buffer from SurfaceFlinger (ANativeWindow::dequeueBuffer) but before EGL has released it (ANativeWindow::enqueueBuffer). This patch is part of a series for fixing android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface on Chrome OS x86 devices. Cc: [email protected] Cc: Tomasz Figa <[email protected]> Cc: Tapani Pälli <[email protected]> Reviewed-by: Nicolas Boichat <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 0212db350407e1331ff23f04136684cf2b7396cf)
* egl: Emit error when EGLSurface is lostChad Versace2017-05-123-0/+42
| | | | | | | | | | | | | | | | | | | | | | | Add a new bool, _EGLSurface::Lost, and check it in eglMakeCurrent and eglSwapBuffers. The EGL 1.5 spec says that those functions emit errors when the native surface is no longer valid. This patch just updates core EGL. No driver sets _EGLSurface::Lost yet. I discovered that Mesa failed to detect lost surfaces while debugging an Android CTS camera test, android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface. This patch doesn't fix the test though, though, because the test expects EGL_BAD_SURFACE when the surface becomes lost, and this patch actually complies with the EGL spec. If I interpreted the EGL spec correctly, EGL_BAD_NATIVE_WINDOW or EGL_BAD_CURRENT_SURFACE is the correct error. Cc: [email protected] Cc: Tomasz Figa <[email protected]> Cc: Tapani Pälli <[email protected]> Reviewed-by: Nicolas Boichat <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 23c86c74cc450a23848b85cfe914376caede1cdf)
* glx: glX_proto_send.py: use correct compile guard GLX_INDIRECT_RENDERINGEmil Velikov2017-05-122-4/+4
| | | | | | | | | | | | | | The code itself has nothing to do with shared glapi, thus having it behind GLX_SHARED_GLAPI is misleading. Use GLX_INDIRECT_RENDERING instead. The latter macro is set at global scope by the Autotools and Scons build systems. Cc: [email protected] Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]> (cherry picked from commit 6177d60a374a3d48969fcb062ac1d82465850cb4)
* mesa/dri: always link against shared glapiEmil Velikov2017-05-121-7/+9
| | | | | | | | | | Analogous to previous commit. Check with the extensive commit description and bug report referenced. Cc: [email protected] Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]> (cherry picked from commit 51accecce7755be9b7eb1baadaec7e4b7d1011af)
* gallium/dri: always link against shared glapiEmil Velikov2017-05-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the early days of Xorg and Mesa we had multiple providers of the GLAPI. All of those were the ones responsible for dlopening the DRI module. Hence it was perfectly fine, and actually expected, for the DRI modules to have unresolved symbols. Since then we've moved the API to a separate shared library and no other libraries provide the symbols. Here comes the picky part: It's possible that one uses old Xorg (where libglx.so provides the GLAPI) and new Mesa (with DRI modules linking against libglapi.so). That should still work, since the the libglx.so symbols will take precedence over the libglapi.so ones. I've verified this while running 1.14 series Xorg alongside this (and next) patch. It may seem a bit fragile, but that's of reasonably OK since all of the affected Xorg versions have been EOL for years. The final one being the 1.14 series, which saw its final bug fix release 1.14.7 in June 2014. To ensure that the binaries do not have unresolved symbols add -no-undefined and $(LD_NO_UNDEFINED), just like we do everywhere else throughout mesa. Cc: [email protected] Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98428 Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]> (cherry picked from commit 79a26b663acdffc3f21d6e37f3334495aed16ae5)
* egl/platform/drm: Don't take display ownership until gbm is initializedAdam Jackson2017-05-121-1/+1
| | | | | | | | | | | If the gbm_create_device() call here actually did fail, any subsequent eglTerminate on the display would segfault. Cc: <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Signed-off-by: Adam Jackson <[email protected]> (cherry picked from commit f258815c7d4187fd83f6944943e78206a6cdc4cb)
* anv: vkBindImageMemory() should return VK_ERROR_OUT_OF_{HOST,DEVICE}_MEMORY ↵Samuel Iglesias Gonsálvez2017-05-121-1/+1
| | | | | | | | | | | | | | | on failure According to the spec we get VK_ERROR_OUT_OF_HOST_MEMORY or VK_ERROR_OUT_OF_DEVICE_MEMORY on vkBindImageMemory failure. Fixes returned value changed by b546c9d. Fixes: b546c9d ("anv: anv_gem_mmap() returns MAP_FAILED as mapping error") Signed-off-by: Samuel Iglesias Gonsálvez <[email protected]> Cc: "17.0 17.1" <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 939b015736d5091faeabde4f5a373e6a1612c5ed)
* anv: anv_gem_mmap() returns MAP_FAILED as mapping errorSamuel Iglesias Gonsálvez2017-05-122-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Take it into account when checking if the mapping failed. v2: - Remove map == NULL and its related comment (Emil) Signed-off-by: Samuel Iglesias Gonsálvez <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Fixes: 6f3e3c715a7 ("vk/allocator: Add a BO pool") Fixes: 9919a2d34de ("anv/image: Memset hiz surfaces to 0 when binding memory") Cc: "17.0 17.1" <[email protected]> (cherry picked from commit b546c9d318731b988aa3d8c4e4735cdbb596cfbf) Squashed with commit: anv: fix anv_gem_mmap comment to not mention NULL The function cannot return NULL, update the comment accordingly. Fixes: b546c9d ("anv: anv_gem_mmap() returns MAP_FAILED as mapping error") Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]> (cherry picked from commit 9d2aa6e5067752efbc0acbd728bc0bde49aefb61)
* etnaviv: add L8A8_UNORM texture formatChristian Gmeiner2017-05-121-0/+2
| | | | | | | | | No piglit regressions. CC: <[email protected]> Signed-off-by: Christian Gmeiner <[email protected]> Reviewed-by: Philipp Zabel <[email protected]> (cherry picked from commit a8007ed6872ce1e2cce7145585a4dd1cfd1cec62)
* radv/wsi: report presentation error per image requestDave Airlie2017-05-121-7/+14
| | | | | | | | | | | | | | | | | | This ports 0fcb92c17dee681bd39c08ddf0abc358a27337c7 anv: wsi: report presentation error per image request This fixes: dEQP-VK.wsi.xlib.incremental_present.scale_none.* Reviewed-by: Daniel Stone <[email protected]> Signed-off-by: Dave Airlie <[email protected]> (cherry picked from commit 09034aab64c7a6022a2c508658fead1442f08576) [Andres Gomez: resolve trivial conflicts] Signed-off-by: Andres Gomez <[email protected]> Conflicts: src/amd/vulkan/radv_wsi.c
* anv/cmd_buffer: Use the device allocator for QueueSubmitJason Ekstrand2017-05-121-3/+3
| | | | | | | | | | | | | | The command is really operating on a Queue not a command buffer and the nearest object to that with an allocator is VkDevice. Reviewed-by: Chad Versace <[email protected]> Cc: "17.0 17.1" <[email protected]> (cherry picked from commit bd3a9813b92bd2e116b58f0932bc7f1f722a9f63) [Andres Gomez: resolve trivial conflicts] Signed-off-by: Andres Gomez <[email protected]> Conflicts: src/intel/vulkan/anv_batch_chain.c
* i965/vec4: don't modify regioning parameters to the sources of DF align1 ↵Samuel Iglesias Gonsálvez2017-05-121-8/+1
| | | | | | | | | | | | | | | | | | | instructions The regioning parameters are now properly set by convert_to_hw_regs() and we don't need to fix them in the generator. That latter fix previously done in the generator was strictly speaking wrong for any non-identity regions. Signed-off-by: Samuel Iglesias Gonsálvez <[email protected]> Cc: "17.1" <[email protected]> Reviewed-by: Francisco Jerez <[email protected]> (cherry picked from commit f57e234fdd52331d0aa6656a36efdebea9d11e9d) [Andres Gomez: resolve trivial conflicts] Signed-off-by: Andres Gomez <[email protected]> Conflicts: src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
* i965/vec4: fix register width for DF VGRF and UNIFORMSamuel Iglesias Gonsálvez2017-05-121-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | On gen7, the swizzles used in DF align16 instructions works for element size of 32 bits, so we can address only 2 consecutive DFs. As we assumed that in the rest of the code and prepare the instructions for this (scalarize_df()), we need to set it to two again. However, for DF align1 instructions, a width of 2 is wrong as we are not reading the data we want. For example, an uniform would have a region of <0, 2, 1> so it would repeat the first 2 DFs, when we wanted to access to the first 4. This patch sets the default one to 4 and then modifies the width of align16 instruction's DF sources when we translate the logical swizzle to the physical one. v2: - Remove conditional (Curro). Signed-off-by: Samuel Iglesias Gonsálvez <[email protected]> Cc: "17.1" <[email protected]> Reviewed-by: Francisco Jerez <[email protected]> (cherry picked from commit aaeb1c99beed39d85c300ebdb8a7bf056ee6717c)
* i965/vec4: fix vertical stride to avoid breaking region parameter ruleSamuel Iglesias Gonsálvez2017-05-121-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From IVB PRM, vol4, part3, "General Restrictions on Regioning Parameters": "If ExecSize = Width and HorzStride ≠ 0, VertStride must be set to Width * HorzStride." In next patch, we are going to modify the region parameter for uniforms and vgrf. For uniforms that are the source of DF align1 instructions, they will have <0, 4, 1> regioning and the execsize for those instructions will be 4, so they will break the regioning rule. This will be the same for VGRF sources where we use the vstride == 0 exploit. As we know we are not going to cross the GRF boundary with that execsize and parameters (not even with the exploit), we just fix the vstride here. v2: - Move is_align1_df() (Curro) - Refactor exec_size == width calculation (Curro) Signed-off-by: Samuel Iglesias Gonsálvez <[email protected]> Cc: "17.1" <[email protected]> Reviewed-by: Francisco Jerez <[email protected]> (cherry picked from commit 7f728bce811fc283e672e3a07b008bb7b52de35e) [Andres Gomez: use original is_align1_df] Signed-off-by: Andres Gomez <[email protected]> Conflicts: src/mesa/drivers/dri/i965/brw_vec4.cpp
* renderonly: use drmIoctlPhilipp Zabel2017-05-121-4/+3
| | | | | | | | | | | | To restart interrupted system calls, use drmIoctl. Fixes: 848b49b288f ("gallium: add renderonly library") CC: <[email protected]> Suggested-by: Emil Velikov <[email protected]> Signed-off-by: Philipp Zabel <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Christian Gmeiner <[email protected]> (cherry picked from commit b539335e50b355854202c4b1b42aa4ddbe9289fa)
* renderonly: drop resources on destroyPhilipp Zabel2017-05-123-3/+13
| | | | | | | | | | | | | | The renderonly_scanout holds a reference on its prime pipe resource, which should be released when it is destroyed. If it was created by renderonly_create_kms_dumb_buffer_for_resource, the dumb BO also has to be destroyed. Fixes: 848b49b288f ("gallium: add renderonly library") CC: <[email protected]> Signed-off-by: Philipp Zabel <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Reviewed-by: Christian Gmeiner <[email protected]> (cherry picked from commit cd8ee259c8e9b1c16b5c3214595b91eb31e7de19)
* renderonly: close transfer prime_fdPhilipp Zabel2017-05-121-0/+2
| | | | | | | | | | | | | prime_fd is only used to transfer the scanout buffer to the GPU inside renderonly_create_kms_dumb_buffer_for_resource. It should be closed immediately to avoid leaking the DMA-BUF file handle. Fixes: 848b49b288f ("gallium: add renderonly library") CC: <[email protected]> Signed-off-by: Philipp Zabel <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Reviewed-by: Christian Gmeiner <[email protected]> (cherry picked from commit ab51cd2f26496500d52f6b2847291d884f711bc2)
* nir: Pick just the channels we want for bitmap and drawpixels lowering.Eric Anholt2017-05-122-2/+6
| | | | | | | | | | | | | NIR now validates that SSA references use the same number of channels as are in the SSA value. v2: Reword commit message, since the commit didn't land before the validation change did. Fixes: 370d68babcbb ("nir/validate: Validate that bit sizes and components always match") Reviewed-by: Jason Ekstrand <[email protected]> (v1) Cc: <[email protected]> (cherry picked from commit fba6559a1e76a22135b14490fdf5a6f1de1ae272)
* gallium/targets: fix bool setting on BE architecturesIlia Mirkin2017-05-128-11/+11
| | | | | | | | | | | | | | | val_bool and val_int are in a union. val_bool gets the first byte, which happens to work on LE when setting via the int, but breaks on BE. By setting the value properly, we are able to use DRI3 on BE architectures. Tested by running glxgears with a NV34 in a G5 PPC. Signed-off-by: Ilia Mirkin <[email protected]> Cc: [email protected] [Emil Velikov: squash the vmwgfx hunk] Reviewed-by: Emil Velikov <[email protected]> Reviewed-by: Michel Dänzer <[email protected]> (cherry picked from commit 6af14778a3f68030c4ad6426c75fe25d726235d5)
* st/mesa: move duplicated st_ws_framebuffer() function into header fileBrian Paul2017-05-103-28/+18
| | | | | Reviewed-by: Marek Olšák <[email protected]> (cherry picked from commit b71ef173a5a61a667380dc77f5ae1f7e8c0c2fb8)
* radeonsi: adjust ESGS ring buffer size computation on VIMarek Olšák2017-05-101-1/+4
| | | | | | Cc: 17.0 17.1 <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]> (cherry picked from commit 3f2a0649abc982fe5de647a96fbe354aa9e41a59)
* travis: bump MAKEFLAGS to -j4Emil Velikov2017-05-031-6/+6
| | | | | | | | | The instance should have 2 cores, yet bumping the jobs to 4 should give us a minor speed improvement. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit b1d45c3366034341ce4650b0fb5b5605ae761c00)
* travis: enable wayland supportEmil Velikov2017-05-031-4/+16
| | | | | | | | | | | Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit 27a0b383b9edbacb177553685272408945ec630c) [Andres Gomez: resolve trivial conflicts] Signed-off-by: Andres Gomez <[email protected]> Conflicts: .travis.yml
* travis: add Gallium state-tracker targetsEmil Velikov2017-05-031-0/+80
| | | | | | | | | | | | | | | | | | Split into OpenCL and others, since the former is quite time consuming. v2: - explicitly enable/disable components - build libvdpau 1.1 requirement - enable st/vdpau - build libva 1.6.2 (API 0.38) requirement v3: Drop ubuntu-toolchain-r-test from sources (Andres) Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit 0e6a36cd3f2db7208e85864d4d552f8575200fbe) [Andres Gomez: resolve trivial conflicts] Signed-off-by: Andres Gomez <[email protected]>
* travis: model scons check target like the make oneEmil Velikov2017-05-031-1/+7
| | | | | | | | | Should make things a bit more consistent across the board. Cc: Eric Engestrom <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit b3f2076549ec2bf13ee8bca965d3bf887abb6f20)
* travis: split the make target to three separate onesEmil Velikov2017-05-031-16/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the target to allow faster builds for each run. The overall build time will be more, yet Travis runs multiple builds in parallel so we're limited by the slowest one. Things are split roughly as: - DRI loaders, classic DRI drivers, classic OSMesa, make check - All Gallium drivers (minus the SWR) alongside st/dri (mesa) - The Vulkan drivers - ANV and RADV, make check (anv) v2: - rework RUN_CHECK to MAKE_CHECK_COMMAND - explicitly disable DRI loaders - generate linux/memfd.h locally and enable ANV - add libedit-dev v3: Use printf to create the header (Andres). v4: Really add the libedit + printf hunks. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit 7e2af374742f6f387cada8c3e1e8585be3831405) [Andres Gomez: i965 is needed for Vulkan build] Signed-off-by: Andres Gomez <[email protected]> Conflicts: .travis.yml
* travis: add "make swr" to the build matrixEmil Velikov2017-05-021-3/+38
| | | | | | | | | | | | | | v2: Quote OVERRIDE variables. v3: Add missplaced libedit-dev hunk (Andres). Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit 8479fd8a1099c4bf37fb8cded7a3040b4d366fbc) [Andres Gomez: resolve trivial conflicts] Signed-off-by: Andres Gomez <[email protected]> Conflicts: .travis.yml
* travis: add "scons swr" to the build matrixEmil Velikov2017-05-021-0/+28
| | | | | | | | | | | | | | | | Requires GCC 5.0 (due to the C++14 requirement) and LLVM 3.9. v2: Enable the target, add libedit-dev, rework check target. v3: Comment the current check target, add -j4 SCONSFLAGS, quote OVERRIDE variables. v4: Keep check target as-is (Andres) Cc: Tim Rowley <[email protected]> Cc: George Kyriazis <[email protected]> Reviewed-by: George Kyriazis <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit f55d98ac85145fc35e7ee1e41520c07b6f083bb8)
* travis: add separate "scons" and "scons llvm" targetsEmil Velikov2017-05-021-16/+45
| | | | | | | | | | | | | | | | | | | The former does not require any LLVM, while the latter uses LLVM 3.3. This way we'll quickly catch any LLVM 3.3+ functionality that gets introduced where it shouldn't. Add the full list of addons for each build permutation. v2: Keep libedit-dev, rework check target. v3: Comment the current check target, add -j4 SCONSFLAGS v4: - Remove llvm-toolchain-trusty-3.3 source (Andres) - Keep check target as-is (Andres) Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit 85ee2c6cfcd5deeca2ee0cf11079afccd6e7324e)
* travis: split out matrix from envEmil Velikov2017-05-021-5/+13
| | | | | | | | | | | | With next commits we'll add a couple of more options. v2: Rework check target. v3: Comment the current check target, add -j4 SCONSFLAGS v4: Keep check target as-is, will rework with later patch. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit 56ba252e230dfeb93fad26cdbf5f6247524459c7)
* travis: rework "if test" blocks in the script sectionEmil Velikov2017-05-021-1/+3
| | | | | | | | | Split the "if test" blocks so that we get more sensible output in case of a failure. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit abcfea23add91ffa7013a3c862712cfdaefcf8b0)
* travis: remove unused -dev packagesEmil Velikov2017-05-021-2/+0
| | | | | | | | | We effectively override libdrm-dev and libxcb-dri2-0-dev since we build and install the package locally. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit ae713a7b79f60b45befea7c40b6d2aa3d3789441)
* travis: automatically manage ccache cachingEmil Velikov2017-05-021-3/+1
| | | | | | | | | | | | | | | | | According to the manual "If you are using ccache, use: language: c # or other C/C++ variants cache: ccache to cache $HOME/.ccache and automatically add /usr/lib/ccache to your $PATH." Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit 6431b98c54ea2dc0c0f716b5f4a19af45a3b67f3)
* travis: enable apt cacheEmil Velikov2017-05-021-0/+1
| | | | | | | | | | | | Provides a small, but consistent improvement. Example numbers of the jobs added later in the series. "make loaders/classic DRI" - 1s "scons SWR" - 6s Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit 486f28ba88259cc70ee59ad67b2b4277b0da0ce4)
* travis: add the possibility of using the txc-dxtn libraryAndres Gomez2017-05-021-0/+14
| | | | | | | | | | | | | | | | | The txc-dxtn library implements the patented S3 Texture Compression algorithm. By default it won't be used but we add the possibility of setting the USE_TXC_DXTN variable to yes in the travis web UI so it will be installed and used for the scons tests. Cc: Eric Anholt <[email protected]> Cc: Rhys Kidd <[email protected]> Signed-off-by: Andres Gomez <[email protected]> [Emil Velikov: keep the LIB prefix, drop the LD_LIBRARY_PATH, fold URL] Signed-off-by: Emil Velikov <[email protected]> (cherry picked from commit 29322daef2b77c4d869d2945fa1226e6b433c687)
* travis: replace Trusty-based LLVM toolchain apt-get with apt addonAndres Gomez2017-05-021-11/+4
| | | | | | | | | | | | | | Trusty's LLVM toochain repository was whitelisted some time ago. See: https://github.com/travis-ci/apt-source-whitelist/commit/479067c5e74cb0c1e2419209179b1afe2edce274 Signed-off-by: Andres Gomez <[email protected]> [Emil Velikov] - set sudo to false - reference the Trusty change (Rhys) - keep libedit-dev Signed-off-by: Emil Velikov <[email protected]> (cherry picked from commit 7819d265c79ceb1bfcadb7b5e9c1586de5b6aac8)
* travis: explicitly LD_LIBRARY_PATH the local librariesEmil Velikov2017-05-021-0/+1
| | | | | | | | | Some of the libraries may be dlopened, which may not always work due to the non-standard prefix that we're using. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Andres Gomez <[email protected]> (cherry picked from commit cb820daa3ff2dcd697144150e2a9daf1a8898117)
* travis: Add radeonsi to continuous integrationRhys Kidd2017-05-021-1/+1
| | | | | | | | Signed-off-by: Rhys Kidd <[email protected]> Acked-by: Nicolai Hähnle <[email protected]> Reviewed-by: Andres Gomez <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 115e6847920bfe4e2f2d542d947212a2aeae5db7)