diff options
| author | Kenneth Graunke <[email protected]> | 2014-12-01 13:44:04 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-12-03 17:45:16 -0800 |
| commit | bcc7eb115ed6e74b87566bbc3a51c444814f1ebe (patch) | |
| tree | febee7305cff602bdf12609cd04e3bcdd4f13cd9 | |
| parent | b5b18e46877d16877053c68e013c8217bb6a7b83 (diff) | |
i965: Add var->location != -1 assertions.
We shouldn't receive variables with invalid locations set - adding these
assertions should help catch problems before they cause crashes later.
Inspired by similar code in st_glsl_to_tgsi.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index cc12e482be9..62ef8537e4a 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -57,6 +57,7 @@ fs_visitor::visit(ir_variable *ir) return; if (ir->data.mode == ir_var_shader_in) { + assert(ir->data.location != -1); if (!strcmp(ir->name, "gl_FragCoord")) { reg = emit_fragcoord_interpolation(ir); } else if (!strcmp(ir->name, "gl_FrontFacing")) { diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index 61af3258cec..ded7b8cee5e 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -1020,10 +1020,12 @@ vec4_visitor::visit(ir_variable *ir) switch (ir->data.mode) { case ir_var_shader_in: + assert(ir->data.location != -1); reg = new(mem_ctx) dst_reg(ATTR, ir->data.location); break; case ir_var_shader_out: + assert(ir->data.location != -1); reg = new(mem_ctx) dst_reg(this, ir->type); for (int i = 0; i < type_size(ir->type); i++) { |