Mesa (master): i965/fs: Ignore compute shaders in brw_nir_lower_inputs
Jordan Justen
jljusten at kemper.freedesktop.org
Wed Oct 14 20:26:46 UTC 2015
Module: Mesa
Branch: master
Commit: 0d1eef536bc744f5c4dcdf854ad6adfdfe4f4dcb
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d1eef536bc744f5c4dcdf854ad6adfdfe4f4dcb
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Wed Oct 14 11:33:03 2015 -0700
i965/fs: Ignore compute shaders in brw_nir_lower_inputs
The commit shown below caused compute shaders to hit the unreachable
in the default of the switch block. Since compute shaders don't have
any inputs, we can make brw_nir_lower_inputs a no-op for CS.
commit 2953c3d76178d7589947e6ea1dbd902b7b02b3d4
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri Aug 14 15:15:11 2015 -0700
i965/vs: Map scalar VS input locations properly; avoid tons of MOVs.
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i965/brw_nir.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c
index 5459ab5..af9d041 100644
--- a/src/mesa/drivers/dri/i965/brw_nir.c
+++ b/src/mesa/drivers/dri/i965/brw_nir.c
@@ -100,6 +100,10 @@ brw_nir_lower_inputs(nir_shader *nir, bool is_scalar)
nir_assign_var_locations(&nir->inputs, &nir->num_inputs,
type_size_scalar);
break;
+ case MESA_SHADER_COMPUTE:
+ /* Compute shaders have no inputs. */
+ assert(exec_list_is_empty(&nir->inputs));
+ break;
default:
unreachable("unsupported shader stage");
}
More information about the mesa-commit
mailing list