From 22e1d8832c90702b4cd972e48f0db809f7c7639f Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 10 Aug 2017 21:10:31 -0700 Subject: [PATCH] i965: Guard GetBufferSubData's streaming memcpy load with USE_SSE41 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should hopefully fix build issues on 32-bit Android-x86. v2: s/USE_SSE4_1/USE_SS41/, caught by Gražvydas Ignotas. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102050 Reviewed-by: Tapani Pälli Reviewed-by: Emil Velikov --- src/mesa/drivers/dri/i965/intel_buffer_objects.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.c b/src/mesa/drivers/dri/i965/intel_buffer_objects.c index ee591168283..658b1edf1c9 100644 --- a/src/mesa/drivers/dri/i965/intel_buffer_objects.c +++ b/src/mesa/drivers/dri/i965/intel_buffer_objects.c @@ -342,6 +342,7 @@ brw_get_buffer_subdata(struct gl_context *ctx, unsigned int map_flags = MAP_READ; mem_copy_fn memcpy_fn = memcpy; +#ifdef USE_SSE41 if (!intel_obj->buffer->cache_coherent && cpu_has_sse4_1) { /* Rather than acquire a new WB mmaping of the buffer object and pull * it into the CPU cache, keep using the WC mmap that we have for writes, @@ -350,6 +351,7 @@ brw_get_buffer_subdata(struct gl_context *ctx, map_flags |= MAP_COHERENT; memcpy_fn = (mem_copy_fn) _mesa_streaming_load_memcpy; } +#endif void *map = brw_bo_map(brw, intel_obj->buffer, map_flags); if (unlikely(!map)) {