Mesa (master): r600/sb: Fix constant logical operand in assert.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Nov 5 05:10:31 UTC 2018


Module: Mesa
Branch: master
Commit: 64a9ed8848ed5c2c909b59e0e4b600b2b01bba28
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=64a9ed8848ed5c2c909b59e0e4b600b2b01bba28

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Wed Oct 31 15:35:23 2018 -0700

r600/sb: Fix constant logical operand in assert.

Fixes: da977ad90747 ("r600/sb: start adding GDS support")
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-By: Gert Wollny <gert.wollny at collabora.com>

---

 src/gallium/drivers/r600/sb/sb_bc_builder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/sb/sb_bc_builder.cpp b/src/gallium/drivers/r600/sb/sb_bc_builder.cpp
index 5681fdc442..b7d87eac9f 100644
--- a/src/gallium/drivers/r600/sb/sb_bc_builder.cpp
+++ b/src/gallium/drivers/r600/sb/sb_bc_builder.cpp
@@ -567,7 +567,7 @@ int bc_builder::build_fetch_gds(fetch_node *n) {
 	const fetch_op_info *fop = bc.op_ptr;
 	unsigned gds_op = (ctx.fetch_opcode(bc.op) >> 8) & 0x3f;
 	unsigned mem_op = 4;
-	assert(fop->flags && FF_GDS);
+	assert(fop->flags & FF_GDS);
 
 	if (bc.op == FETCH_OP_TF_WRITE) {
 		mem_op = 5;




More information about the mesa-commit mailing list