From 7e816c7feb8cffa878546eee363240b1b66d5c42 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Wed, 18 Mar 2015 15:24:06 +0200 Subject: [PATCH] i965/vec4: Fix signedness of dst_reg::writemask. Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_ir_vec4.h | 5 +++-- src/mesa/drivers/dri/i965/brw_vec4.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_ir_vec4.h b/src/mesa/drivers/dri/i965/brw_ir_vec4.h index 8b26e48..2ac189b 100644 --- a/src/mesa/drivers/dri/i965/brw_ir_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_ir_vec4.h @@ -111,7 +111,8 @@ public: dst_reg(); dst_reg(register_file file, int reg); - dst_reg(register_file file, int reg, const glsl_type *type, int writemask); + dst_reg(register_file file, int reg, const glsl_type *type, + unsigned writemask); dst_reg(struct brw_reg reg); dst_reg(class vec4_visitor *v, const struct glsl_type *type); @@ -119,7 +120,7 @@ public: bool equals(const dst_reg &r) const; - int writemask; /**< Bitfield of WRITEMASK_[XYZW] */ + unsigned writemask; /**< Bitfield of WRITEMASK_[XYZW] */ src_reg *reladdr; }; diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index b13dd58..ee3ac15 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -195,7 +195,7 @@ dst_reg::dst_reg(register_file file, int reg) } dst_reg::dst_reg(register_file file, int reg, const glsl_type *type, - int writemask) + unsigned writemask) { init(); -- 2.7.4