Android.common.mk | 2 VERSION | 2 configure.ac | 124 +++-- debian/changelog | 19 debian/control | 10 debian/patches/egl-platform-mir.patch | 11 debian/rules | 2 docs/relnotes/17.0.0.html | 213 +++++++++- src/amd/common/ac_nir_to_llvm.c | 11 src/amd/vulkan/radv_image.c | 3 src/compiler/glsl/builtin_functions.cpp | 18 src/gallium/auxiliary/tgsi/tgsi_dump.c | 24 - src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 51 +- src/gallium/drivers/nouveau/nvc0/nvc0_screen.h | 5 src/gallium/drivers/radeon/r600_buffer_common.c | 17 src/gallium/drivers/radeonsi/si_state.h | 2 src/gallium/drivers/swr/rasterizer/core/clip.h | 39 - src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 17 src/glx/dri3_glx.c | 10 src/glx/glxcmds.c | 18 src/intel/vulkan/anv_blorp.c | 10 src/intel/vulkan/anv_pass.c | 1 src/mesa/drivers/dri/common/dri_util.c | 12 src/mesa/drivers/dri/i965/brw_state.h | 7 src/mesa/drivers/dri/i965/brw_state_upload.c | 3 src/mesa/drivers/dri/i965/gen6_clip_state.c | 57 -- src/mesa/drivers/dri/i965/gen6_sf_state.c | 15 src/mesa/drivers/dri/i965/gen6_viewport_state.c | 150 ++++--- src/mesa/drivers/dri/i965/gen7_sf_state.c | 12 src/mesa/drivers/dri/i965/gen7_viewport_state.c | 39 - src/mesa/drivers/dri/i965/gen8_viewport_state.c | 48 -- src/mesa/state_tracker/st_extensions.c | 2 src/mesa/vbo/vbo_save_api.c | 7 src/util/disk_cache.c | 33 + 34 files changed, 603 insertions(+), 391 deletions(-)
New commits: commit fd2485ca700994fdabdead0748d6b915e805651c Author: Timo Aaltonen <[email protected]> Date: Mon Feb 13 17:01:14 2017 +0200 upload to zesty diff --git a/debian/changelog b/debian/changelog index 3829482..31f260c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (17.0.0-1ubuntu1) UNRELEASED; urgency=medium +mesa (17.0.0-1ubuntu1) zesty; urgency=medium [ Timo Aaltonen ] * Merge from Debian. @@ -10,7 +10,7 @@ mesa (17.0.0-1ubuntu1) UNRELEASED; urgency=medium upstream and made wayland specific). - Change MirSurfaceParameters into MirWindowParameters. - -- Timo Aaltonen <[email protected]> Tue, 07 Feb 2017 13:50:06 +0200 + -- Timo Aaltonen <[email protected]> Mon, 13 Feb 2017 16:19:39 +0200 mesa (17.0.0-1) experimental; urgency=medium commit 5c028e0904e6738c2b2fb3f1fc0888b7e2b84072 Author: Cemil Azizoglu <[email protected]> Date: Wed Feb 8 16:36:52 2017 -0600 Refresh egl-platform-mir.patch - remove device_name field (removed from the generic struct in the upstream and made wayland specific). - Change MirSurfaceParameters into MirWindowParameters. diff --git a/debian/changelog b/debian/changelog index acc2e32..3829482 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ mesa (17.0.0-1ubuntu1) UNRELEASED; urgency=medium + [ Timo Aaltonen ] * Merge from Debian. * Drop patches for 16k wide textures on i965, upstream. - * egl-platform-mir.patch: Refreshed. + + [ Cemil Azizoglu ] + * Updated egl-platform-mir.patch. + - remove device_name field (removed from the generic struct in the + upstream and made wayland specific). + - Change MirSurfaceParameters into MirWindowParameters. -- Timo Aaltonen <[email protected]> Tue, 07 Feb 2017 13:50:06 +0200 diff --git a/debian/patches/egl-platform-mir.patch b/debian/patches/egl-platform-mir.patch index c094c00..ad15c0c 100644 --- a/debian/patches/egl-platform-mir.patch +++ b/debian/patches/egl-platform-mir.patch @@ -160,7 +160,7 @@ --- /dev/null +++ b/src/egl/drivers/dri2/platform_mir.c -@@ -0,0 +1,637 @@ +@@ -0,0 +1,636 @@ +/* + * Copyright © 2012 Canonical, Inc + * @@ -487,7 +487,7 @@ + struct dri2_egl_config *dri2_conf = dri2_egl_config(conf); + struct dri2_egl_surface *dri2_surf; + const __DRIconfig *config; -+ MirSurfaceParameters surf_params; ++ MirWindowParameters win_params; + + (void) drv; + @@ -501,11 +501,11 @@ + goto cleanup_surf; + + dri2_surf->mir_surf = window; -+ if (!dri2_surf->mir_surf->surface_get_parameters(dri2_surf->mir_surf, &surf_params)) ++ if (!dri2_surf->mir_surf->surface_get_parameters(dri2_surf->mir_surf, &win_params)) + goto cleanup_surf; + -+ dri2_surf->base.Width = surf_params.width; -+ dri2_surf->base.Height = surf_params.height; ++ dri2_surf->base.Width = win_params.width; ++ dri2_surf->base.Height = win_params.height; + + dri2_surf->dri_buffers[__DRI_BUFFER_FRONT_LEFT] = + calloc(sizeof(*dri2_surf->dri_buffers[0]), 1); @@ -739,7 +739,6 @@ + dri2_dpy->mir_disp = disp->PlatformDisplay; + dri2_dpy->mir_disp->display_get_platform(dri2_dpy->mir_disp, &platform); + dri2_dpy->fd = platform.fd[0]; -+ dri2_dpy->device_name = loader_get_device_name_for_fd(dri2_dpy->fd); + + /* + * At the moment, a pointer to gbm_device is the first and only commit 0e1e04cd2a16db023c9fba5de650a143a1ca0992 Author: Timo Aaltonen <[email protected]> Date: Mon Feb 13 16:00:46 2017 +0200 update changelog diff --git a/debian/changelog b/debian/changelog index aae45a8..acc2e32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,4 @@ -mesa (17.0.0-1) experimental; urgency=medium - - * New upstream release. - * control, rules: Bump clang/llvm to 4.0, and libclc to match. - - -- Timo Aaltonen <[email protected]> Mon, 13 Feb 2017 15:46:47 +0200 - -mesa (17.0.0~rc3-1ubuntu1) UNRELEASED; urgency=medium +mesa (17.0.0-1ubuntu1) UNRELEASED; urgency=medium * Merge from Debian. * Drop patches for 16k wide textures on i965, upstream. @@ -13,6 +6,13 @@ mesa (17.0.0~rc3-1ubuntu1) UNRELEASED; urgency=medium -- Timo Aaltonen <[email protected]> Tue, 07 Feb 2017 13:50:06 +0200 +mesa (17.0.0-1) experimental; urgency=medium + + * New upstream release. + * control, rules: Bump clang/llvm to 4.0, and libclc to match. + + -- Timo Aaltonen <[email protected]> Mon, 13 Feb 2017 15:46:47 +0200 + mesa (17.0.0~rc3-1) experimental; urgency=medium [ Timo Aaltonen ] commit ca5e7217075a01a6ac438f47eb654392bd415a35 Author: Timo Aaltonen <[email protected]> Date: Mon Feb 13 15:46:59 2017 +0200 release to experimental diff --git a/debian/changelog b/debian/changelog index 259c6df..3d4b9b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -mesa (17.0.0-1) UNRELEASED; urgency=medium +mesa (17.0.0-1) experimental; urgency=medium * New upstream release. * control, rules: Bump clang/llvm to 4.0, and libclc to match. - -- Timo Aaltonen <[email protected]> Mon, 13 Feb 2017 15:35:16 +0200 + -- Timo Aaltonen <[email protected]> Mon, 13 Feb 2017 15:46:47 +0200 mesa (17.0.0~rc3-1) experimental; urgency=medium commit 4844a9fc2a83f2a6c132f7992b98ffafd06d6186 Author: Timo Aaltonen <[email protected]> Date: Mon Feb 13 15:46:41 2017 +0200 control, rules: Bump clang/llvm to 4.0, and libclc to match. diff --git a/debian/changelog b/debian/changelog index dbbf3e6..259c6df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mesa (17.0.0-1) UNRELEASED; urgency=medium * New upstream release. + * control, rules: Bump clang/llvm to 4.0, and libclc to match. -- Timo Aaltonen <[email protected]> Mon, 13 Feb 2017 15:35:16 +0200 diff --git a/debian/control b/debian/control index aa7a93c..3645282 100644 --- a/debian/control +++ b/debian/control @@ -41,11 +41,11 @@ Build-Depends: python-mako, flex, bison, - llvm-3.9-dev (>= 1:3.9.1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el], + llvm-4.0-dev (>= 1:4.0~) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el], libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el], libwayland-dev (>= 1.11.0) [linux-any], - libclang-3.9-dev (>= 1:3.9.1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf], - libclc-dev (>= 0.2.0+git20160907) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf], + libclang-4.0-dev (>= 1:4.0~) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf], + libclc-dev (>= 0.2.0+git20170213) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf], Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/mesa.git Homepage: http://mesa3d.org/ @@ -425,8 +425,8 @@ Section: libs Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf Pre-Depends: ${misc:Pre-Depends} Depends: - libclc-r600 (>= 0.2.0+git20160907), - libclc-amdgcn (>= 0.2.0+git20160907), + libclc-r600 (>= 0.2.0+git20170213), + libclc-amdgcn (>= 0.2.0+git20170213), ocl-icd-libopencl1 | libopencl1, ${shlibs:Depends}, ${misc:Depends}, diff --git a/debian/rules b/debian/rules index 0f9030f..551ca37 100755 --- a/debian/rules +++ b/debian/rules @@ -91,7 +91,7 @@ else ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el)) GALLIUM_DRIVERS += radeonsi confflags_GALLIUM += --enable-gallium-llvm - confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.9 + confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-4.0 GALLIUM_DRIVERS += swrast else DRI_DRIVERS += swrast commit c80cc3272f67ea813cbd522cae8c1960dbd1fd89 Author: Timo Aaltonen <[email protected]> Date: Mon Feb 13 15:35:46 2017 +0200 update changelog diff --git a/debian/changelog b/debian/changelog index 232018c..dbbf3e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mesa (17.0.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Timo Aaltonen <[email protected]> Mon, 13 Feb 2017 15:35:16 +0200 + mesa (17.0.0~rc3-1) experimental; urgency=medium [ Timo Aaltonen ] commit 683462e680326ee0cd7a794f018178b7b5573c4f Author: Emil Velikov <[email protected]> Date: Mon Feb 13 11:53:28 2017 +0000 docs: Update 17.0.0 release notes Signed-off-by: Emil Velikov <[email protected]> diff --git a/docs/relnotes/17.0.0.html b/docs/relnotes/17.0.0.html index 71fb4c3..aed746f 100644 --- a/docs/relnotes/17.0.0.html +++ b/docs/relnotes/17.0.0.html @@ -14,7 +14,7 @@ <iframe src="../contents.html"></iframe> <div class="content"> -<h1>Mesa 17.0.0 Release Notes / TBD</h1> +<h1>Mesa 17.0.0 Release Notes / February 13, 2017</h1> <p> Mesa 17.0.0 is a new development release. @@ -62,13 +62,222 @@ Note: some of the new features are only available with certain drivers. <ul> +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=70623";>Bug 70623</a> - libglx.so: undefined symbol: _glapi_tls_Context</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72902";>Bug 72902</a> - [IVB/HSW/BDW] DOTA2 segfaults unless Mesa is configured with (non-default) --enable-glx-tls</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73778";>Bug 73778</a> - _glapi_tls_Dispatch undefined</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=77662";>Bug 77662</a> - Fail to render to different faces of depth-stencil cube map</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=89043";>Bug 89043</a> - undefined symbol: _glapi_tls_Dispatch</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91281";>Bug 91281</a> - Tonga VCE 2160p encode fails with BO to small for addr</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=92234";>Bug 92234</a> - [BDW] GPU hang in Shogun2</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=92634";>Bug 92634</a> - gallium's vl_mpeg12_decoder does not work with st/va</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=92760";>Bug 92760</a> - Add FP64 support to the i965 shader backends</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=92925";>Bug 92925</a> - Incorrect GEN for ASTC in Surface Format Table</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=93551";>Bug 93551</a> - Divinity: Original Sin Enhanced Edition(Native) crash on start</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=94512";>Bug 94512</a> - X segfaults with glx-tls enabled in a x32 environment</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=94900";>Bug 94900</a> - HD6950 GPU lockup loop with various steam games (octodad[always], saints row 4[always], dead island[always], grid autosport[sometimes])</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=94904";>Bug 94904</a> - [vulkan, BSW] dEQP-VK.api.object_management.multithreaded_per_thread_device intermittent crash</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=95460";>Bug 95460</a> - Please add more drivers (freedreno, virgl) to features.txt status document</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=96959";>Bug 96959</a> - nop.sat generated by pow workaround?</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97102";>Bug 97102</a> - [dri][swr] stack overflow / infinite loop with GALLIUM_DRIVER=swr</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97232";>Bug 97232</a> - Line rendering broken in Dolphin when using gl_ClipDistance</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97287";>Bug 97287</a> - GL45-CTS.vertex_attrib_binding.basic-inputL-case1 fails</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97321";>Bug 97321</a> - Query INFO_LOG_LENGTH for empty info log should return 0</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97420";>Bug 97420</a> - "#version 0" crashes glsl_compiler</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97422";>Bug 97422</a> - trying to call a number as a function results into a crash</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97447";>Bug 97447</a> - GL 3.0 compatibility context exposes GL_ARB_compute_shader</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97473";>Bug 97473</a> - Memory corruption when uploading DXT5 cubemap faces</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97715";>Bug 97715</a> - [ILK,G45,G965] piglit.spec.arb_separate_shader_objects.misc api error checks</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97779";>Bug 97779</a> - [regression, bisected][BDW, GPU hang] stuck on render ring, always reproducible</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97804";>Bug 97804</a> - Later precision statement isn't overriding earlier one</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97952";>Bug 97952</a> - /usr/include/string.h:518:12: error: exception specification in declaration does not match previous declaration</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=97967";>Bug 97967</a> - glsl/tests/cache-test regression</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98005";>Bug 98005</a> - VCE dual instance encoding inconsistent since st/va: enable dual instances encode by sync surface</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98012";>Bug 98012</a> - [IVB] Segfault when running Dolphin twice with Vulkan</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98134";>Bug 98134</a> - dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.draw_buffers wants a different GL error code</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98172";>Bug 98172</a> - Concurrent call to glClientWaitSync results in segfault in one of the waiters.</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98238";>Bug 98238</a> - witcher 2: objects are black when changing lod</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98243";>Bug 98243</a> - dEQP mismatched UBO precision qualifiers</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98245";>Bug 98245</a> - GLES3.1 link negative dEQP "expected linking to fail, but passed."</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98250";>Bug 98250</a> - dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.texparameterIiv/texparameterIuiv failure</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98263";>Bug 98263</a> - [radv] The Talos Principle fails to launch with "Fatal error: Cannot set display mode."</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98297";>Bug 98297</a> - Can't configure a desktop with 3x4k monitors in one row</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98299";>Bug 98299</a> - Compute shaders generate stupid divides</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98307";>Bug 98307</a> - "st/glsl_to_tgsi: explicitly track all input and output declaration" broke flightgear colors on rs780</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98326";>Bug 98326</a> - [dEQP, EGL] pbuffer depth/stencil tests fail</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98327";>Bug 98327</a> - [dEQP, EGL] dEQP-EGL.functional.resize not supported</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98328";>Bug 98328</a> - [dEQP, EGL] luminance tests fail</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98329";>Bug 98329</a> - [dEQP, EGL, SKL, BDW, BSW] dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_depth16_depth_buffer</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98330";>Bug 98330</a> - [dEQP, EGL] dEQP-EGL.functional.buffer_age.no_preserve fails</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98339";>Bug 98339</a> - dEQP-EGL: Got EGL_BAD_MATCH: eglCreateSyncKHR()</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98343";>Bug 98343</a> - dEQP-EGL: GL_INVALID_ENUM at teglCreateContextExtTests</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98415";>Bug 98415</a> - Vulkan Driver JSON file contains incorrect field</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98421";>Bug 98421</a> - src/loader/loader.c:111:40: error: unknown type name ‘drmDevicePtr’</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98431";>Bug 98431</a> - UnrealEngine v4 demos startup fails to blorp blit assert</li> + <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98480";>Bug 98480</a> - Support R8 image texture in ES 3.1</li> +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98512";>Bug 98512</a> - radeon r600 vdpau: Invalid command stream: texture bo too small</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98518";>Bug 98518</a> - [r600g, bisected] regression: NI/Turks MSAA texture corruption with FreeCAD and Wine games</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98526";>Bug 98526</a> - glsl/tests/general-ir-test regression</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98595";>Bug 98595</a> - glsl: ralloc assertion "info->canary == CANARY" failed</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98599";>Bug 98599</a> - xterm menus corrupt since tgsi/scan: handle indirect image indexing correctly</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98632";>Bug 98632</a> - Fix build on Hurd without PATH_MAX</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98681";>Bug 98681</a> - ir_builder_print_visitor.cpp:401:67: error: expected ')' before 'PRIx64'</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98694";>Bug 98694</a> - "(5=2)?1:1" as array size decleration crashes glsl_compiler</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98740";>Bug 98740</a> - bitcode.cpp:102:8: error: ‘Error’ is not a member of ‘llvm’</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98767";>Bug 98767</a> - [swrast] ralloc.c:84: get_header: Assertion `info->canary == CANARY' failed.</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98774";>Bug 98774</a> - glsl/tests/warnings-test regression</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98815";>Bug 98815</a> - [SKL/BDW GT2] large perf regression in TessMark</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98840";>Bug 98840</a> - nir clone test fails</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98893";>Bug 98893</a> - [SKL] piglit.spec.arb_shader_image_load_store.semantics intermittent</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98914";>Bug 98914</a> - mesa-vdpau-drivers: breaks vdpau for mpeg2video</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98917";>Bug 98917</a> - [BDW SKL BSW KBL] Tessellation CTS tests regression</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98975";>Bug 98975</a> - Wasteland 2 Directors Cut: Hangs. GPU fault</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99010";>Bug 99010</a> - --disable-gallium-llvm no longer recognized</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99013";>Bug 99013</a> - [regression, bisected] radeonsi: commit 4c8c13b3 "Use amdgcn intrinsics for fs interpolation" makes system unusable</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99030";>Bug 99030</a> - [HSW, regression] transform feedback fails on Linux 4.8</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99038";>Bug 99038</a> - [dEQP, EGL, SKL, BDW, BSW] dEQP-EGL.functional.negative_api.create_pixmap_surface crashes</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99072";>Bug 99072</a> - [byt,ivb,snb] ES3-CTS.gtf.GL3Tests.shadow regression</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99085";>Bug 99085</a> - [EGL] dEQP-EGL.functional.sharing.gles2.multithread intermittent</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99097";>Bug 99097</a> - [vulkancts] dEQP-VK.image.store regression</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99100";>Bug 99100</a> - [SKL,BDW,BSW,KBL] dEQP-VK.glsl.return.return_in_dynamic_loop_dynamic_vertex regression</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99119";>Bug 99119</a> - swr_fence_work.cpp(42): error: argument of type "std::nullptr_t" is incompatible with parameter of type "unsigned long"</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99144";>Bug 99144</a> - Incorrect rendering using glDrawArraysInstancedBaseInstance and first != 0 on Skylake</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99154";>Bug 99154</a> - Link time error when using multiple builtin functions</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99158";>Bug 99158</a> - vdpau segfaults and gpu locks with kodi on R9285</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99185";>Bug 99185</a> - dEQP-EGL.functional.image.modify.tex_rgb5_a1_tex_subimage_rgba8</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99188";>Bug 99188</a> - dEQP-EGL.functional.create_context_ext.robust_gl_30.rgb565_no_depth_no_stencil</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99210";>Bug 99210</a> - ES3-CTS.functional.texture.mipmap.cube.generate.rgba5551_*</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99214";>Bug 99214</a> - Crash in library libswrAVX.so when assigning vertex buffer object pointers with elements of type GL_DOUBLE</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99219";>Bug 99219</a> - The Stanley Parable GPU hang when starting a new game</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99229";>Bug 99229</a> - [G33] thousands of tests crash</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99231";>Bug 99231</a> - [HSW][i965] Crash in upload_3dstate_streamout()</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99287";>Bug 99287</a> - piglit.spec.glsl-1_10.execution.vs-nested-return-sibling-loop regression</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99303";>Bug 99303</a> - [REGRESSION][BISECTED] DMs are crashing on start with "radeon"</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99314";>Bug 99314</a> - [g33] glsl regressions</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99339";>Bug 99339</a> - Blender line rendering broken after removing XY clipping of lines</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99354";>Bug 99354</a> - [G71] "Assertion `bkref' failed" reproducible with glmark2</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99389";>Bug 99389</a> - Mesa build broken: sid_tables.h</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99391";>Bug 99391</a> - [ILK,G45,G965] piglit regressions</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99401";>Bug 99401</a> - [g33] regression: piglit.spec.!opengl 1_0.gl-1_0-beginend-coverage</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99419";>Bug 99419</a> - Crash(Segmentation fault) si_shader_select in Master Of Orion</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99450";>Bug 99450</a> - [amdgpu] Payday 2 visual glitches on some models</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99451";>Bug 99451</a> - polygon offset use after free</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99456";>Bug 99456</a> - Firefox crashing when opening about:support with WebGL2 enabled</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99631";>Bug 99631</a> - segfault with OSVRTrackerView and openscenegraph git master</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99633";>Bug 99633</a> - rasterizer/core/clip.h:279:49: error: ‘const struct API_STATE’ has no member named ‘linkageCount’</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99637";>Bug 99637</a> - VLC video has corrupted colors when using VDPAU output on Radeon SI</li> + </ul> <h2>Changes</h2> -TBD. +<ul> +<li>Building RADV requires --enable-gallium-llvm</li> +<li>The vulkan headers vk_platform.h and vulkan.h are no longer installed</li> +<li>The configure options --with-sha1 and --disable-shader-cache are +removed alongside their respective library requirements</li> +</ul> </div> </body> commit 8088ffa12a121627b3d8565e8f9731796ab0f704 Author: Emil Velikov <[email protected]> Date: Mon Feb 13 11:46:24 2017 +0000 Update version to 17.0.0(final) Signed-off-by: Emil Velikov <[email protected]> diff --git a/VERSION b/VERSION index 0b34163..aac5898 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.0.0-rc3 +17.0.0 commit 269266359967be69f39d9aa2cddbe1faeb2eaa36 Author: Timothy Arceri <[email protected]> Date: Wed Feb 8 15:05:19 2017 +1100 util/disk_cache: use stat() to check if entry is a directory d_type is not supported on all systems. Tested-by: Vinson Lee <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97967 (cherry picked from commit d7b3707c612027b354deea6bc5eae56a02d5f8d5) Squashed with commit: util/disk_cache: correctly use stat(3) I forgot to error check stat() and also I wasn't using the subdir in is_two_character_sub_directory(). Fixes: d7b3707c612 "util/disk_cache: use stat() to check if entry is a directory" Reviewed-by: Plamena Manolova <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 0cbde643eb29c8bf19eb8551ac8e821f7f733212) diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c index 6de608c..d3e8b40 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c @@ -366,7 +366,8 @@ make_cache_file_directory(struct disk_cache *cache, cache_key key) */ static char * choose_random_file_matching(const char *dir_path, - bool (*predicate)(struct dirent *)) + bool (*predicate)(struct dirent *, + const char *dir_path)) { DIR *dir; struct dirent *entry; @@ -383,7 +384,7 @@ choose_random_file_matching(const char *dir_path, entry = readdir(dir); if (entry == NULL) break; - if (! predicate(entry)) + if (!predicate(entry, dir_path)) continue; count++; @@ -403,7 +404,7 @@ choose_random_file_matching(const char *dir_path, entry = readdir(dir); if (entry == NULL) break; - if (! predicate(entry)) + if (!predicate(entry, dir_path)) continue; if (count == victim) break; @@ -428,14 +429,20 @@ choose_random_file_matching(const char *dir_path, * ".tmp" */ static bool -is_regular_non_tmp_file(struct dirent *entry) +is_regular_non_tmp_file(struct dirent *entry, const char *path) { - size_t len; + char *filename; + if (asprintf(&filename, "%s/%s", path, entry->d_name) == -1) + return false; + + struct stat sb; + int res = stat(filename, &sb); + free(filename); - if (entry->d_type != DT_REG) + if (res == -1 || !S_ISREG(sb.st_mode)) return false; - len = strlen (entry->d_name); + size_t len = strlen (entry->d_name); if (len >= 4 && strcmp(&entry->d_name[len-4], ".tmp") == 0) return false; @@ -469,9 +476,17 @@ unlink_random_file_from_directory(const char *path) * special name of "..") */ static bool -is_two_character_sub_directory(struct dirent *entry) +is_two_character_sub_directory(struct dirent *entry, const char *path) { - if (entry->d_type != DT_DIR) + char *subdir; + if (asprintf(&subdir, "%s/%s", path, entry->d_name) == -1) + return false; + + struct stat sb; + int res = stat(subdir, &sb); + free(subdir); + + if (res == -1 || !S_ISDIR(sb.st_mode)) return false; if (strlen(entry->d_name) != 2) commit e81e284611fed996b7b5d768af1d5636490c2d7f Author: Emil Velikov <[email protected]> Date: Wed Jan 18 13:54:04 2017 +0000 configure.ac: correctly manage llvm auto-detection Earlier refactoring commits changed from one, dare I say it, broken behaviour to another. Namely: Before, as you explicitly --enable-gallium-llvm your selection was ignored when llvm-config was not present/detected. Today, the "auto" heuristics enables gallium llvm regardless if you have llvm/llvm-config available or not. Rework the auto-detection to attribute for llvm's presence. v2: Set enable_gallium_llvm=no when LLVM is not found. Cc: "17.0" <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Tobias Droste <[email protected]> Reported-by: Samuel Pitoiset <[email protected]> Tested-by: Samuel Pitoiset <[email protected]> (cherry picked from commit d4840c0c26315fe4f0ba82e2b0d81cd9f2636f5e) diff --git a/configure.ac b/configure.ac index d4c1fd4..8448736 100644 --- a/configure.ac +++ b/configure.ac @@ -1744,10 +1744,14 @@ AC_ARG_ENABLE([gallium-llvm], [enable_gallium_llvm=auto]) if test "x$enable_gallium_llvm" = xauto; then - case "$host_cpu" in - i*86|x86_64|amd64) enable_gallium_llvm=yes;; - *) enable_gallium_llvm=no;; - esac + if test "x$FOUND_LLVM" = xyes; then + case "$host_cpu" in + i*86|x86_64|amd64) enable_gallium_llvm=yes;; + *) enable_gallium_llvm=no;; + esac + else + enable_gallium_llvm=no + fi fi if test "x$enable_gallium_llvm" = xyes -a "x$FOUND_LLVM" = xno; then commit edecfda23fdfbbeb802bc4facae5207272414f07 Author: Emil Velikov <[email protected]> Date: Wed Jan 18 13:54:03 2017 +0000 configure.ac: disable enable_gallium_llvm in the !x86 case Already implicitly handled throughout, but keep it clear and disable gallium-llvm. This change should be a no-op. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Tobias Droste <[email protected]> (cherry picked from commit ce65cc1f1f648f17d9284e65f1ad69be647de3d3) diff --git a/configure.ac b/configure.ac index 4703b6a..d4c1fd4 100644 --- a/configure.ac +++ b/configure.ac @@ -1746,6 +1746,7 @@ AC_ARG_ENABLE([gallium-llvm], if test "x$enable_gallium_llvm" = xauto; then case "$host_cpu" in i*86|x86_64|amd64) enable_gallium_llvm=yes;; + *) enable_gallium_llvm=no;; esac fi commit d0c7c6a8ccd67eba8f190985dee7ef3dee570bd7 Author: Emil Velikov <[email protected]> Date: Wed Jan 18 13:54:02 2017 +0000 configure.ac: set LLVM_{C, CXX, LD}FLAGS only as needed Earlier refactoring commits started setting the above regardless if LLVM is used or not. Move them to the respective section to restore the original functionality. Since we require the preprocessor flags (includes in particular) for the header version parsing keep those as-is. They are not used outside of configure.ac thus should not cause any side-effects. As-is adding the C/CXXFLAGS can lead to build issues on when cross-compiling. Cc: Ilia Mirkin <[email protected]> Cc: Tomasz Figa <[email protected]> Cc: "17.0" <[email protected]> Reported-by: Ilia Mirkin <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Tobias Droste <[email protected]> (cherry picked from commit 4d8bb9cf8c8e8bd3185461760ca89e6021c0b8e0) Conflicts: configure.ac diff --git a/configure.ac b/configure.ac index 3906ac7..4703b6a 100644 --- a/configure.ac +++ b/configure.ac @@ -969,17 +969,14 @@ strip_unwanted_llvm_flags() { llvm_set_environment_variables() { if test "x$LLVM_CONFIG" != xno; then LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'` - LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` LLVM_BINDIR=`$LLVM_CONFIG --bindir` LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` - LLVM_CFLAGS=$LLVM_CPPFLAGS # CPPFLAGS seem to be sufficient - LLVM_CXXFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cxxflags"` LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` LLVM_LIBDIR=`$LLVM_CONFIG --libdir` - # We need to respect LLVM_CFLAGS when compiling LLVM headers. + # We need to respect LLVM_CPPFLAGS when compiling LLVM headers. save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $LLVM_CFLAGS" + CFLAGS="$CFLAGS $LLVM_CPPFLAGS" AC_COMPUTE_INT([LLVM_VERSION_MAJOR], [LLVM_VERSION_MAJOR], [#include "${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h"]) @@ -2411,6 +2408,10 @@ dnl if test "x$enable_gallium_llvm" = xyes; then DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DMESA_LLVM_VERSION_PATCH=$LLVM_VERSION_PATCH" + LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` + LLVM_CFLAGS=$LLVM_CPPFLAGS # CPPFLAGS seem to be sufficient + LLVM_CXXFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cxxflags"` + dnl Set LLVM_LIBS - This is done after the driver configuration so dnl that drivers can add additional components to LLVM_COMPONENTS. dnl Previously, gallium drivers were updating LLVM_LIBS directly commit 619b102ecba50c130b40edbb2f0c75cc9b6acccb Author: Tobias Droste <[email protected]> Date: Tue Feb 7 19:53:32 2017 +0000 configure.ac: Only define HAVE_LLVM if LLVM is used Make sure that HAVE_LLVM compiler define is only set if LLVM is actually used. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99010 Cc: "17.0" <[email protected]> Signed-off-by: Tobias Droste <[email protected]> v2 [Emil] fold within the existing conditional Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit 143c566a81fa7425df64ca83b8131e016af1d660) diff --git a/configure.ac b/configure.ac index cf76262..3906ac7 100644 --- a/configure.ac +++ b/configure.ac @@ -1001,7 +1001,6 @@ llvm_set_environment_variables() { LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}" fi - DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DMESA_LLVM_VERSION_PATCH=$LLVM_VERSION_PATCH" FOUND_LLVM=yes else FOUND_LLVM=no @@ -2406,14 +2405,18 @@ if test "x$HAVE_GALLIUM_ETNAVIV" != xyes -a "x$HAVE_GALLIUM_IMX" == xyes ; then AC_ERROR([Building with imx requires etnaviv]) fi -dnl Set LLVM_LIBS - This is done after the driver configuration so -dnl that drivers can add additional components to LLVM_COMPONENTS. -dnl Previously, gallium drivers were updating LLVM_LIBS directly -dnl by calling llvm-config --libs ${DRIVER_LLVM_COMPONENTS}, but -dnl this was causing the same libraries to be appear multiple times -dnl in LLVM_LIBS. - +dnl +dnl Set defines and buildtime variables only when using LLVM. +dnl if test "x$enable_gallium_llvm" = xyes; then + DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DMESA_LLVM_VERSION_PATCH=$LLVM_VERSION_PATCH" + + dnl Set LLVM_LIBS - This is done after the driver configuration so + dnl that drivers can add additional components to LLVM_COMPONENTS. + dnl Previously, gallium drivers were updating LLVM_LIBS directly + dnl by calling llvm-config --libs ${DRIVER_LLVM_COMPONENTS}, but + dnl this was causing the same libraries to be appear multiple times + dnl in LLVM_LIBS. if ! $LLVM_CONFIG --libs ${LLVM_COMPONENTS} >/dev/null; then AC_MSG_ERROR([Calling ${LLVM_CONFIG} failed]) commit b90405d56569abd9d6845040de4e948031a0e366 Author: Tobias Droste <[email protected]> Date: Sat Jan 28 14:56:57 2017 +0100 configure.ac: Rework MESA_LLVM and LLVM detection Set FOUND_LLVM only when LLVM is present (checking for exact version/etc is deferred) and use enable-gallium-llvm to indicate the global LLVM status. Renaming the latter is not appropriate for stable patches, so we'll address it with a later commit. Loosely based on work by Tobias. v2: Check FOUND_LLVM if enable_gallium_llvm is set. Cc: Dave Airlie <[email protected]> Cc: "17.0" <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Tobias Droste <[email protected]> (cherry picked from commit 04377cbdcf19a112c04035d622c40d722cc238d7) diff --git a/configure.ac b/configure.ac index 0c0f521..cf76262 100644 --- a/configure.ac +++ b/configure.ac @@ -1002,9 +1002,9 @@ llvm_set_environment_variables() { fi DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DMESA_LLVM_VERSION_PATCH=$LLVM_VERSION_PATCH" - MESA_LLVM=1 + FOUND_LLVM=yes else - MESA_LLVM=0 + FOUND_LLVM=no LLVM_VERSION_INT=0 fi } @@ -1016,10 +1016,6 @@ require_llvm() { } llvm_require_version() { - if test "x$MESA_LLVM" = x0; then - AC_MSG_ERROR([LLVM $1 or newer is required for $2]) - return - fi require_llvm $2 llvm_target_version_major=`echo $1 | cut -d. -f1 | egrep -o '^[[0-9]]+'` @@ -1741,6 +1737,10 @@ fi dnl dnl Gallium LLVM dnl +dnl With follow-up commits we'll rework --enable-gallium-llvm to --enable-llvm +dnl Since that is too invasive to stable, do the more conservative thing for now +dnl and consider it as a global LLVM toggle. +dnl AC_ARG_ENABLE([gallium-llvm], [AS_HELP_STRING([--enable-gallium-llvm], [build gallium LLVM support @<:@default=enabled on x86/x86_64@:>@])], @@ -1753,6 +1753,10 @@ if test "x$enable_gallium_llvm" = xauto; then esac fi +if test "x$enable_gallium_llvm" = xyes -a "x$FOUND_LLVM" = xno; then + AC_MSG_ERROR([--enable-gallium-llvm selected but llvm-config is not found]) +fi + # # Vulkan driver configuration # @@ -2345,7 +2349,7 @@ if test -n "$with_gallium_drivers"; then ;; xswrast) HAVE_GALLIUM_SOFTPIPE=yes - if test "x$MESA_LLVM" = x1 && test "x$enable_gallium_llvm" == "xyes"; then + if test "x$enable_gallium_llvm" = xyes; then HAVE_GALLIUM_LLVMPIPE=yes fi ;; @@ -2409,7 +2413,7 @@ dnl by calling llvm-config --libs ${DRIVER_LLVM_COMPONENTS}, but dnl this was causing the same libraries to be appear multiple times dnl in LLVM_LIBS. -if test "x$MESA_LLVM" != x0; then +if test "x$enable_gallium_llvm" = xyes; then if ! $LLVM_CONFIG --libs ${LLVM_COMPONENTS} >/dev/null; then AC_MSG_ERROR([Calling ${LLVM_CONFIG} failed]) @@ -2511,8 +2515,7 @@ AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$HAVE_GALLIUM_R300" = xyes -o \ AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$enable_glx" = xgallium-xlib) AM_CONDITIONAL(NEED_RADEON_LLVM, test x$NEED_RADEON_LLVM = xyes) AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes) -AM_CONDITIONAL(HAVE_GALLIUM_LLVM, test "x$MESA_LLVM" = x1 -a \ - "x$enable_gallium_llvm" = xyes) +AM_CONDITIONAL(HAVE_GALLIUM_LLVM, test "x$enable_gallium_llvm" = xyes) AM_CONDITIONAL(USE_VC4_SIMULATOR, test x$USE_VC4_SIMULATOR = xyes) if test "x$USE_VC4_SIMULATOR" = xyes -a "x$HAVE_GALLIUM_ILO" = xyes; then AC_MSG_ERROR([VC4 simulator on x86 replaces i965 driver build, so ilo must be disabled.]) @@ -2797,7 +2800,7 @@ else fi echo "" -if test "x$MESA_LLVM" = x1; then +if test "x$enable_gallium_llvm" = xyes; then echo " llvm: yes" echo " llvm-config: $LLVM_CONFIG" echo " llvm-version: $LLVM_VERSION" @@ -2844,7 +2847,7 @@ echo " CFLAGS: $cflags" echo " CXXFLAGS: $cxxflags" echo " Macros: $defines" echo "" -if test "x$MESA_LLVM" = x1; then +if test "x$enable_gallium_llvm" = xyes; then echo " LLVM_CFLAGS: $LLVM_CFLAGS" echo " LLVM_CXXFLAGS: $LLVM_CXXFLAGS" echo " LLVM_CPPFLAGS: $LLVM_CPPFLAGS" commit d6e8489069bb335bf8cb776bb23da9716bbe4a5e Author: Emil Velikov <[email protected]> Date: Tue Feb 7 21:59:14 2017 +0000 configure.ac: move enable-gallium-llvm dependency with-gallium-drivers ... to where it's applicable. Since we effectively made --enable-gallium-llvm mean --enable-llvm with earlier commits, we need to move the requirement to guard the compnents added for the LLVM draw. Otherwise we'll error (as below) when building RADV w/o gallium drivers. configure: error: --enable-gallium-llvm is required when building radv v2: Don't remove but move the dependency (Tobias). Cc: Dave Airlie <[email protected]> Cc: "17.0" <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Tobias Droste <[email protected]> (cherry picked from commit 5869a7db75a144ae898dafe9d9b7cb9d6ae29e12) diff --git a/configure.ac b/configure.ac index 3e1e3f0..0c0f521 100644 --- a/configure.ac +++ b/configure.ac @@ -1747,9 +1747,6 @@ AC_ARG_ENABLE([gallium-llvm], [enable_gallium_llvm="$enableval"], [enable_gallium_llvm=auto]) -if test -z "$with_gallium_drivers"; then - enable_gallium_llvm=no -fi if test "x$enable_gallium_llvm" = xauto; then case "$host_cpu" in
