glsl: add support for system values and GL_ARB_draw_instanced

1 files changed, 7 insertions, 2 deletions

diff --git a/src/glsl/ir_set_program_inouts.cpp b/src/glsl/ir_set_program_inouts.cpp
index b3f1cc0d8b5..31a122c6bb9 100644
--- a/src/glsl/ir_set_program_inouts.cpp
+++ b/src/glsl/ir_set_program_inouts.cpp
@@ -90,7 +90,10 @@ mark(struct gl_program *prog, ir_variable *var, int index)
 
    index *= element_size;
    for (int i = 0; i < element_size; i++) {
-      if (var->mode == ir_var_in)
+      if (var->mode == ir_var_system_value) {
+         prog->SystemValuesRead |= (1 << (var->location + index + i));
+      }
+      else if (var->mode == ir_var_in)
 	 prog->InputsRead |= BITFIELD64_BIT(var->location + index + i);
       else
 	 prog->OutputsWritten |= BITFIELD64_BIT(var->location + index + i);
@@ -139,7 +142,8 @@ ir_visitor_status
 ir_set_program_inouts_visitor::visit(ir_variable *ir)
 {
    if (ir->mode == ir_var_in ||
-       ir->mode == ir_var_out) {
+       ir->mode == ir_var_out ||
+       ir->mode == ir_var_system_value) {
       hash_table_insert(this->ht, ir, ir);
    }
 
@@ -163,5 +167,6 @@ do_set_program_inouts(exec_list *instructions, struct gl_program *prog)
 
    prog->InputsRead = 0;
    prog->OutputsWritten = 0;
+   prog->SystemValuesRead = 0;
    visit_list_elements(&v, instructions);
 }