[Mesa-dev] [PATCH] r600/sb: remove superfluos assert

Gert Wollny gw.fossdev at gmail.com
Mon Sep 11 14:39:27 UTC 2017


The assert checks whether pshader->num_arrays != 0, but the code
after the assert actually branches based on the same check.

Removing this assert fixes:
  piglit spec at arb_gpu_shader5@execution at samplemaskin-indirect
---
 src/gallium/drivers/r600/sb/sb_bc_parser.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gallium/drivers/r600/sb/sb_bc_parser.cpp b/src/gallium/drivers/r600/sb/sb_bc_parser.cpp
index ae92a767b4..52ee3f620b 100644
--- a/src/gallium/drivers/r600/sb/sb_bc_parser.cpp
+++ b/src/gallium/drivers/r600/sb/sb_bc_parser.cpp
@@ -127,8 +127,6 @@ int bc_parser::parse_decls() {
 
 	if (pshader->indirect_files & ~((1 << TGSI_FILE_CONSTANT) | (1 << TGSI_FILE_SAMPLER))) {
 
-		assert(pshader->num_arrays);
-
 		if (pshader->num_arrays) {
 			for (unsigned i = 0; i < pshader->num_arrays; ++i) {
 				r600_shader_array &a = pshader->arrays[i];
-- 
2.13.5



More information about the mesa-dev mailing list