From 97058e38d897ef351b9d8a49eaefc515244c438f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Sun, 15 Sep 2019 12:51:35 +0300 Subject: [PATCH] uxa: Get rid of -Wno-shift-negative-value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The minimum CS URB entry size is 1. Let's use that instead of 0 so that we don't end up left shifting a -1. Signed-off-by: Ville Syrjälä --- src/uxa/i965_render.c | 2 +- src/uxa/i965_video.c | 2 +- src/uxa/meson.build | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/uxa/i965_render.c b/src/uxa/i965_render.c index c1943fb6..32dbf2f9 100644 --- a/src/uxa/i965_render.c +++ b/src/uxa/i965_render.c @@ -277,7 +277,7 @@ i965_check_composite_texture(ScreenPtr screen, PicturePtr picture) /* Set up a default static partitioning of the URB, which is supposed to * allow anything we would want to do, at potentially lower performance. */ -#define URB_CS_ENTRY_SIZE 0 +#define URB_CS_ENTRY_SIZE 1 #define URB_CS_ENTRIES 0 #define URB_VS_ENTRY_SIZE 1 // each 512-bit row diff --git a/src/uxa/i965_video.c b/src/uxa/i965_video.c index 9b9203b6..fcd5657d 100644 --- a/src/uxa/i965_video.c +++ b/src/uxa/i965_video.c @@ -378,7 +378,7 @@ static void i965_post_draw_debug(ScrnInfoPtr scrn) #define URB_SF_ENTRY_SIZE 2 #define URB_CS_ENTRIES 0 -#define URB_CS_ENTRY_SIZE 0 +#define URB_CS_ENTRY_SIZE 1 static void i965_create_dst_surface_state(ScrnInfoPtr scrn, PixmapPtr pixmap, diff --git a/src/uxa/meson.build b/src/uxa/meson.build index 5f0929ae..f4a3302d 100644 --- a/src/uxa/meson.build +++ b/src/uxa/meson.build @@ -58,7 +58,6 @@ uxa = static_library('uxa', include_directories : inc, c_args : [ '-Wno-deprecated-declarations', - '-Wno-shift-negative-value', '-Wno-unused-parameter', '-Wno-sign-compare', ],