Mesa (master): r300g/swtcl: make pipe_context uploaders use malloc'd memory as before
Module: Mesa Branch: master Commit: 17a42062ccdb3bf5624435db9598e4353756771f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=17a42062ccdb3bf5624435db9598e4353756771f Author: Marek Olšák Date: Mon Jun 4 20:39:07 2018 -0400 r300g/swtcl: make pipe_context uploaders use malloc'd memory as before Discovered by Roland Scheidegger. The resource_create code uses GPU memory for PIPE_BIND_CUSTOM, but malloc'd memory otherwise. Vertex and index buffers should use malloc'd memory. Cc: 18.0 18.1 --- src/gallium/drivers/r300/r300_context.c | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c index 627ba0c570..79bfdc53d2 100644 --- a/src/gallium/drivers/r300/r300_context.c +++ b/src/gallium/drivers/r300/r300_context.c @@ -88,6 +88,8 @@ static void r300_destroy_context(struct pipe_context* context) if (r300->uploader) u_upload_destroy(r300->uploader); +if (r300->context.stream_uploader) +u_upload_destroy(r300->context.stream_uploader); /* XXX: This function assumes r300->query_list was initialized */ r300_release_referenced_objects(r300); @@ -424,10 +426,11 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen, r300->context.create_video_codec = vl_create_decoder; r300->context.create_video_buffer = vl_video_buffer_create; -r300->uploader = u_upload_create(&r300->context, 1024 * 1024, +r300->uploader = u_upload_create(&r300->context, 128 * 1024, PIPE_BIND_CUSTOM, PIPE_USAGE_STREAM, 0); -r300->context.stream_uploader = r300->uploader; -r300->context.const_uploader = r300->uploader; +r300->context.stream_uploader = u_upload_create(&r300->context, 1024 * 1024, +0, PIPE_USAGE_STREAM, 0); +r300->context.const_uploader = r300->context.stream_uploader; r300->blitter = util_blitter_create(&r300->context); if (r300->blitter == NULL) ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): intel/eu: Use a struct copy instead of a memcpy
Module: Mesa
Branch: master
Commit: 01ad2067bba17451c663983877ec85145de20f02
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=01ad2067bba17451c663983877ec85145de20f02
Author: Jason Ekstrand
Date: Tue Jun 5 14:33:12 2018 -0700
intel/eu: Use a struct copy instead of a memcpy
The memcpy had the wrong size and this was causing crashes on 32-bit
builds of the driver.
Fixes: 6a9525bf6729a8 "intel/eu: Switch to a logical state stack"
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106830
Reviewed-by: Kenneth Graunke
---
src/intel/compiler/brw_eu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/intel/compiler/brw_eu.c b/src/intel/compiler/brw_eu.c
index d0e4ea2070..6ef0a6a577 100644
--- a/src/intel/compiler/brw_eu.c
+++ b/src/intel/compiler/brw_eu.c
@@ -289,7 +289,7 @@ void brw_set_default_acc_write_control(struct brw_codegen
*p, unsigned value)
void brw_push_insn_state( struct brw_codegen *p )
{
assert(p->current != &p->stack[BRW_EU_MAX_INSN_STACK-1]);
- memcpy(p->current + 1, p->current, sizeof(brw_inst));
+ *(p->current + 1) = *p->current;
p->current++;
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): radv: Use correct color format for fast clears
Module: Mesa Branch: master Commit: cc21e96d5f412aae5d3982dde0d4c926e8d049e8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc21e96d5f412aae5d3982dde0d4c926e8d049e8 Author: Philip Rebohle Date: Mon May 28 14:10:41 2018 +0200 radv: Use correct color format for fast clears Using the image format is incorrect when the view has a different format than the image. Instead, the view format needs to be used. Reviewed-by: Bas Nieuwenhuizen CC: 18.1 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106687 --- src/amd/vulkan/radv_meta_clear.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c index 858e3368b6..fae441ceb6 100644 --- a/src/amd/vulkan/radv_meta_clear.c +++ b/src/amd/vulkan/radv_meta_clear.c @@ -1035,7 +1035,7 @@ emit_fast_color_clear(struct radv_cmd_buffer *cmd_buffer, goto fail; /* DCC */ - ret = radv_format_pack_clear_color(iview->image->vk_format, + ret = radv_format_pack_clear_color(iview->vk_format, clear_color, &clear_value); if (ret == false) goto fail; @@ -1056,7 +1056,7 @@ emit_fast_color_clear(struct radv_cmd_buffer *cmd_buffer, bool can_avoid_fast_clear_elim; bool need_decompress_pass = false; - vi_get_fast_clear_parameters(iview->image->vk_format, + vi_get_fast_clear_parameters(iview->vk_format, &clear_value, &reset_value, &can_avoid_fast_clear_elim); ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): v3d: Be more explicit about include directory from our generated code.
Module: Mesa Branch: master Commit: 2b1b2cbf619f9b3d578dabb0956bd5a248b6a89c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b1b2cbf619f9b3d578dabb0956bd5a248b6a89c Author: Eric Anholt Date: Tue Jun 5 08:50:55 2018 -0700 v3d: Be more explicit about include directory from our generated code. You'd need src/broadcom/cle/ in the -I previously, for srcdir != builddir. nir was fine at that, but automake didn't have it. Bugzilla: https://github.com/anholt/mesa/issues/104 --- src/broadcom/cle/gen_pack_header.py | 2 +- src/gallium/drivers/v3d/Makefile.am | 2 ++ src/gallium/drivers/vc4/Makefile.am | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/broadcom/cle/gen_pack_header.py b/src/broadcom/cle/gen_pack_header.py index e5762762b2..310e0a7c7a 100644 --- a/src/broadcom/cle/gen_pack_header.py +++ b/src/broadcom/cle/gen_pack_header.py @@ -43,7 +43,7 @@ pack_header = """%(license)s #ifndef %(guard)s #define %(guard)s -#include "v3d_packet_helpers.h" +#include "cle/v3d_packet_helpers.h" """ diff --git a/src/gallium/drivers/v3d/Makefile.am b/src/gallium/drivers/v3d/Makefile.am index ff0334a239..5b4ed5df2b 100644 --- a/src/gallium/drivers/v3d/Makefile.am +++ b/src/gallium/drivers/v3d/Makefile.am @@ -25,7 +25,9 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -I$(top_builddir)/src/compiler/nir \ -I$(top_srcdir)/include/drm-uapi \ + -I$(top_srcdir)/src/broadcom \ -I$(top_builddir)/src/broadcom \ + -I$(top_builddir)/src \ $(LIBDRM_CFLAGS) \ $(V3D_SIMULATOR_CFLAGS) \ $(GALLIUM_DRIVER_CFLAGS) \ diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am index d65bf20e26..4c7dd843da 100644 --- a/src/gallium/drivers/vc4/Makefile.am +++ b/src/gallium/drivers/vc4/Makefile.am @@ -30,7 +30,8 @@ AM_CFLAGS = \ -I$(top_builddir)/src/compiler/nir \ -I$(top_srcdir)/include/drm-uapi \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src/broadcom/cle \ + -I$(top_srcdir)/src/broadcom \ + -I$(top_builddir)/src/broadcom \ $(LIBDRM_CFLAGS) \ $(GALLIUM_DRIVER_CFLAGS) \ $(SIM_CFLAGS) \ ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): radv: Do not hardcode fast clear formats.
Module: Mesa
Branch: master
Commit: 2a10fd902d71e7991c1dc81be16e5d61982f8e6e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a10fd902d71e7991c1dc81be16e5d61982f8e6e
Author: Bas Nieuwenhuizen
Date: Tue Jun 5 00:52:34 2018 +0200
radv: Do not hardcode fast clear formats.
except for the odd one out.
This should support many more formats.
Reviewed-by: Dave Airlie
---
src/amd/vulkan/radv_formats.c | 253 --
1 file changed, 73 insertions(+), 180 deletions(-)
diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c
index aafe331f27..50ec904d51 100644
--- a/src/amd/vulkan/radv_formats.c
+++ b/src/amd/vulkan/radv_formats.c
@@ -880,194 +880,87 @@ bool radv_format_pack_clear_color(VkFormat format,
uint32_t clear_vals[2],
VkClearColorValue *value)
{
- uint8_t r = 0, g = 0, b = 0, a = 0;
const struct vk_format_description *desc =
vk_format_description(format);
- if (vk_format_get_component_bits(format, VK_FORMAT_COLORSPACE_RGB, 0)
<= 8) {
- if (desc->colorspace == VK_FORMAT_COLORSPACE_RGB) {
- r = float_to_ubyte(value->float32[0]);
- g = float_to_ubyte(value->float32[1]);
- b = float_to_ubyte(value->float32[2]);
- a = float_to_ubyte(value->float32[3]);
- } else if (desc->colorspace == VK_FORMAT_COLORSPACE_SRGB) {
- r =
util_format_linear_float_to_srgb_8unorm(value->float32[0]);
- g =
util_format_linear_float_to_srgb_8unorm(value->float32[1]);
- b =
util_format_linear_float_to_srgb_8unorm(value->float32[2]);
- a = float_to_ubyte(value->float32[3]);
- }
- }
- switch (format) {
- case VK_FORMAT_R8_UNORM:
- case VK_FORMAT_R8_SRGB:
- clear_vals[0] = r;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_R8G8_UNORM:
- case VK_FORMAT_R8G8_SRGB:
- clear_vals[0] = r | g << 8;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_R8G8B8A8_SRGB:
- case VK_FORMAT_R8G8B8A8_UNORM:
- clear_vals[0] = r | g << 8 | b << 16 | a << 24;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_B8G8R8A8_SRGB:
- case VK_FORMAT_B8G8R8A8_UNORM:
- clear_vals[0] = b | g << 8 | r << 16 | a << 24;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_A8B8G8R8_UNORM_PACK32:
- case VK_FORMAT_A8B8G8R8_SRGB_PACK32:
- clear_vals[0] = r | g << 8 | b << 16 | a << 24;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_R8_UINT:
- clear_vals[0] = value->uint32[0] & 0xff;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_R8_SINT:
- clear_vals[0] = value->int32[0] & 0xff;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_R16_UINT:
- clear_vals[0] = value->uint32[0] & 0x;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_R8G8_UINT:
- clear_vals[0] = value->uint32[0] & 0xff;
- clear_vals[0] |= (value->uint32[1] & 0xff) << 8;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_R8G8_SINT:
- clear_vals[0] = value->int32[0] & 0xff;
- clear_vals[0] |= (value->int32[1] & 0xff) << 8;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_R8G8B8A8_UINT:
- clear_vals[0] = value->uint32[0] & 0xff;
- clear_vals[0] |= (value->uint32[1] & 0xff) << 8;
- clear_vals[0] |= (value->uint32[2] & 0xff) << 16;
- clear_vals[0] |= (value->uint32[3] & 0xff) << 24;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_R8G8B8A8_SINT:
- clear_vals[0] = value->int32[0] & 0xff;
- clear_vals[0] |= (value->int32[1] & 0xff) << 8;
- clear_vals[0] |= (value->int32[2] & 0xff) << 16;
- clear_vals[0] |= (value->int32[3] & 0xff) << 24;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_A8B8G8R8_UINT_PACK32:
- clear_vals[0] = value->uint32[0] & 0xff;
- clear_vals[0] |= (value->uint32[1] & 0xff) << 8;
- clear_vals[0] |= (value->uint32[2] & 0xff) << 16;
- clear_vals[0] |= (value->uint32[3] & 0xff) << 24;
- clear_vals[1] = 0;
- break;
- case VK_FORMAT_R16G16_UINT:
- clear_vals[0] = value->uint32[0] & 0x;
- clear_vals[0] |= (value->uint32[1] & 0x) << 16;
- clear_vals[1] = 0;
- break;
- case VK_FORMA
Mesa (master): util/tests/vma: Fix warning c++11-narrowing
Module: Mesa
Branch: master
Commit: 08535dd8860951ce4572cd2590e417a1f3d96b3d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=08535dd8860951ce4572cd2590e417a1f3d96b3d
Author: Scott D Phillips
Date: Tue Jun 5 09:29:43 2018 -0700
util/tests/vma: Fix warning c++11-narrowing
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106801
Fixes: 943fecc569 ("util: Add a randomized test for the virtual memory
allocator")
Reviewed-by: Dylan Baker
---
src/util/tests/vma/vma_random_test.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/tests/vma/vma_random_test.cpp
b/src/util/tests/vma/vma_random_test.cpp
index 88beb08386..de887fead3 100644
--- a/src/util/tests/vma/vma_random_test.cpp
+++ b/src/util/tests/vma/vma_random_test.cpp
@@ -236,7 +236,7 @@ int main(int argc, char **argv)
errx(1, "USAGE: %s seed iter_count\n", argv[0]);
}
- random_test r{seed};
+ random_test r{(uint_fast32_t)seed};
r.test(count);
printf("ok\n");
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): intel/tools: add intel_sanitize_gpu to EXTRA_DIST
Module: Mesa
Branch: master
Commit: 6fb22114a01c1ec682dbd1b606ec0d3bc690a4ce
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6fb22114a01c1ec682dbd1b606ec0d3bc690a4ce
Author: Scott D Phillips
Date: Tue Jun 5 09:33:49 2018 -0700
intel/tools: add intel_sanitize_gpu to EXTRA_DIST
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106778
Fixes: cc41603d6d ("intel/tools: new intel_sanitize_gpu tool")
Reviewed-by: Dylan Baker
---
src/intel/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index 2f96a68d99..3e098a7ac9 100644
--- a/src/intel/Makefile.am
+++ b/src/intel/Makefile.am
@@ -69,6 +69,8 @@ EXTRA_DIST = \
dev/meson.build \
genxml/meson.build \
isl/meson.build \
+ tools/intel_sanitize_gpu.c \
+ tools/intel_sanitize_gpu.in \
tools/meson.build \
vulkan/meson.build \
meson.build
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): util: tests: vma test depends on C++11 support
Module: Mesa
Branch: master
Commit: 4b123fb74bae332df3ae52d276e5d63b1e6095ee
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b123fb74bae332df3ae52d276e5d63b1e6095ee
Author: Scott D Phillips
Date: Fri Jun 1 16:26:56 2018 -0700
util: tests: vma test depends on C++11 support
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106776
Fixes: 943fecc569 ("util: Add a randomized test for the virtual memory
allocator")
Tested-by: Vinson Lee
Reviewed-by: Dylan Baker
---
src/util/Makefile.am | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index b51dccdadf..65794338c5 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -22,8 +22,11 @@
SUBDIRS = . \
xmlpool \
tests/hash_table \
- tests/string_buffer \
- tests/vma
+ tests/string_buffer
+
+if HAVE_STD_CXX11
+SUBDIRS += tests/vma
+endif
include Makefile.sources
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glx: Fix number of property values to read in glXImportContextEXT
Module: Mesa
Branch: master
Commit: 6b8f3724c83959e62b1be0330d6d14e58f91dc5b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b8f3724c83959e62b1be0330d6d14e58f91dc5b
Author: Michel Dänzer
Date: Fri Jun 1 18:59:36 2018 +0200
glx: Fix number of property values to read in glXImportContextEXT
We were trying to read twice as many as the X server sent us, which
upset XCB:
[xcb] Too much data requested from _XRead
[xcb] This is most likely caused by a broken X extension library
[xcb] Aborting, sorry about that.
glx-free-context: ../../src/xcb_io.c:732: _XRead: Assertion
`!xcb_xlib_too_much_data_requested' failed.
Fixing this takes 3 GLX piglit tests from crash to pass.
Fixes: 085216295033 "glx: Be more tolerant in glXImportContext (v2)"
Reviewed-by: Adam Jackson
---
src/glx/glxcmds.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 949c2a5931..e8485acd80 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -1463,7 +1463,7 @@ glXImportContextEXT(Display *dpy, GLXContextID contextID)
if (_XReply(dpy, (xReply *) & reply, 0, False) &&
reply.n < (INT32_MAX / 2)) {
- for (i = 0; i < reply.n * 2; i++) {
+ for (i = 0; i < reply.n; i++) {
int prop[2];
_XRead(dpy, (char *)prop, sizeof(prop));
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): configure: radv depends on mako
Module: Mesa Branch: master Commit: c765c39ea73178c81a8bf88fe57c8d39a01dc57d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c765c39ea73178c81a8bf88fe57c8d39a01dc57d Author: Eric Engestrom Date: Mon Jun 4 12:08:15 2018 +0100 configure: radv depends on mako Bug: https://bugs.freedesktop.org/show_bug.cgi?id=106784 Fixes: 17201a2eb0b1b85387136 "radv: port to using updated anv entrypoint/extension generator." Acked-by: Bas Nieuwenhuizen Signed-off-by: Eric Engestrom --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 02dca4547c..600127af8f 100644 --- a/configure.ac +++ b/configure.ac @@ -2099,6 +2099,9 @@ if test -n "$with_vulkan_drivers"; then PKG_CHECK_MODULES([AMDGPU], [libdrm >= $LIBDRM_AMDGPU_REQUIRED libdrm_amdgpu >= $LIBDRM_AMDGPU_REQUIRED]) radeon_llvm_check $LLVM_REQUIRED_RADV "radv" require_x11_dri3 "radv" +if test "x$acv_mako_found" = xno; then +AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found]) +fi HAVE_RADEON_VULKAN=yes ;; *) ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): travis: use correct form for array options
Module: Mesa
Branch: master
Commit: 5bdc38f3566f8f281aab3a8c86c0d499e73c2fb2
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5bdc38f3566f8f281aab3a8c86c0d499e73c2fb2
Author: Eric Engestrom
Date: Tue Jun 5 11:42:02 2018 +0100
travis: use correct form for array options
I'd like to eventually drop support for the confusing "an array of
a single empty string is meant to be interpreted as an empty array", so
let's start by not using it anymore.
Reviewed-by: Dylan Baker
Signed-off-by: Eric Engestrom
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index d05c40bf9d..1f83f5b8d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ matrix:
- env:
- LABEL="meson Vulkan"
- BUILD=meson
-- MESON_OPTIONS="-Ddri-drivers= -Dgallium-drivers="
+- MESON_OPTIONS="-Ddri-drivers=[] -Dgallium-drivers=[]"
- LLVM_VERSION=5.0
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
addons:
@@ -53,7 +53,7 @@ matrix:
- env:
- LABEL="meson loaders/classic DRI"
- BUILD=meson
-- MESON_OPTIONS="-Dvulkan-drivers= -Dgallium-drivers="
+- MESON_OPTIONS="-Dvulkan-drivers=[] -Dgallium-drivers=[]"
addons:
apt:
packages:
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): anv: intel: add softpin flag on imported BOs
Module: Mesa
Branch: master
Commit: 9aedee64acefd707aae62991f03ed43cb49da5d9
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9aedee64acefd707aae62991f03ed43cb49da5d9
Author: Lionel Landwerlin
Date: Mon Jun 4 09:54:29 2018 +0100
anv: intel: add softpin flag on imported BOs
Looks like we forgot to update this bit of the driver for softpin.
Fixes: 4affeba1e9eb42 ("anv: Soft-pin everything else")
Signed-off-by: Lionel Landwerlin
Reviewed-by: Tapani Pälli
Reviewed-by: Jason Ekstrand
---
src/intel/vulkan/anv_intel.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/intel/vulkan/anv_intel.c b/src/intel/vulkan/anv_intel.c
index 431cef5c6a..06db5787a9 100644
--- a/src/intel/vulkan/anv_intel.c
+++ b/src/intel/vulkan/anv_intel.c
@@ -76,6 +76,8 @@ VkResult anv_CreateDmaBufImageINTEL(
uint64_t bo_flags = 0;
if (device->instance->physicalDevice.supports_48bit_addresses)
bo_flags |= EXEC_OBJECT_SUPPORTS_48B_ADDRESS;
+ if (device->instance->physicalDevice.use_softpin)
+ bo_flags |= EXEC_OBJECT_PINNED;
result = anv_bo_cache_import(device, &device->bo_cache,
pCreateInfo->fd, bo_flags, &mem->bo);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): autotools: add missing android file to package
Module: Mesa Branch: master Commit: 66c61797ada12e0e2b396affcc2dc495b6cc04ed URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=66c61797ada12e0e2b396affcc2dc495b6cc04ed Author: Eric Engestrom Date: Mon Jun 4 18:06:30 2018 +0100 autotools: add missing android file to package Bug: https://bugs.freedesktop.org/show_bug.cgi?id=106779 Fixes: ff904978a1d299a36b587 "gallium/util: Android backtrace support" Reviewed-by: Dylan Baker Signed-off-by: Eric Engestrom --- src/gallium/auxiliary/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 07856e5a52..6b048b8eeb 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -118,6 +118,7 @@ EXTRA_DIST = \ postprocess/ADDING \ rbug/README \ target-helpers \ + util/u_debug_stack_android.cpp \ util/u_format.csv \ util/u_format_pack.py \ util/u_format_parse.py \ ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): meson: fix platforms check for `-D egl=true`
Module: Mesa
Branch: master
Commit: 7c4423cce98f95c3ab7349b3f7abc4a558cb6c48
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c4423cce98f95c3ab7349b3f7abc4a558cb6c48
Author: Eric Engestrom
Date: Mon Jun 4 11:26:10 2018 +0100
meson: fix platforms check for `-D egl=true`
Fixes: 0ed6a87a106b6e2266e0 "meson: fix platforms=[]"
Reported-by: Christoph Haag
Reviewed-by: Dylan Baker
Signed-off-by: Eric Engestrom
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 7b7c118d77..1d1b2a979b 100644
--- a/meson.build
+++ b/meson.build
@@ -292,7 +292,7 @@ elif _egl == 'true'
error('EGL requires dri')
elif not with_shared_glapi
error('EGL requires shared-glapi')
- elif with_platforms
+ elif not with_platforms
error('No platforms specified, consider -Dplatforms=drm,x11 at least')
elif not ['disabled', 'dri'].contains(with_glx)
error('EGL requires dri, but a GLX is being built without dri')
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
