svn merge ^/branches/released .

6 files changed, 51 insertions, 2 deletions

diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp
index b320e6798..373c9008b 100644
--- a/mesalib/src/glsl/glsl_parser_extras.cpp
+++ b/mesalib/src/glsl/glsl_parser_extras.cpp
@@ -180,6 +180,15 @@ _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,
 	 state->ARB_draw_buffers_enable = (ext_mode != extension_disable);

 	 state->ARB_draw_buffers_warn = (ext_mode == extension_warn);

       }

+   } else if (strcmp(name, "GL_ARB_draw_instanced") == 0) {

+      /* This extension is only supported in vertex shaders.

+       */

+      if (state->target != vertex_shader) {

+	 unsupported = true;

+      } else {

+	 state->ARB_draw_instanced_enable = (ext_mode != extension_disable);

+	 state->ARB_draw_instanced_warn = (ext_mode == extension_warn);

+      }

    } else if (strcmp(name, "GL_ARB_explicit_attrib_location") == 0) {

       state->ARB_explicit_attrib_location_enable =

 	 (ext_mode != extension_disable);

diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h
index 0a0ca1685..a2fecd45c 100644
--- a/mesalib/src/glsl/glsl_parser_extras.h
+++ b/mesalib/src/glsl/glsl_parser_extras.h
@@ -136,6 +136,8 @@ struct _mesa_glsl_parse_state {
    /*@{*/

    unsigned ARB_draw_buffers_enable:1;

    unsigned ARB_draw_buffers_warn:1;

+   unsigned ARB_draw_instanced_enable:1;

+   unsigned ARB_draw_instanced_warn:1;

    unsigned ARB_explicit_attrib_location_enable:1;

    unsigned ARB_explicit_attrib_location_warn:1;

    unsigned ARB_fragment_coord_conventions_enable:1;

diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h
index f3a565f2e..643fbf7c5 100644
--- a/mesalib/src/glsl/ir.h
+++ b/mesalib/src/glsl/ir.h
@@ -225,6 +225,7 @@ enum ir_variable_mode {
    ir_var_in,

    ir_var_out,

    ir_var_inout,

+   ir_var_system_value, /**< Ex: front-face, instance-id, etc. */

    ir_var_temporary	/**< Temporary variable generated during compilation. */

 };

 

diff --git a/mesalib/src/glsl/ir_set_program_inouts.cpp b/mesalib/src/glsl/ir_set_program_inouts.cpp
index fc789913f..c5533c8cd 100644
--- a/mesalib/src/glsl/ir_set_program_inouts.cpp
+++ b/mesalib/src/glsl/ir_set_program_inouts.cpp
@@ -79,6 +79,8 @@ mark(struct gl_program *prog, ir_variable *var, int offset, int len)
    for (int i = 0; i < len; i++) {

       if (var->mode == ir_var_in)

 	 prog->InputsRead |= BITFIELD64_BIT(var->location + offset + i);

+      else if (var->mode == ir_var_system_value)

+         prog->SystemValuesRead |= (1 << (var->location + offset + i));

       else

 	 prog->OutputsWritten |= BITFIELD64_BIT(var->location + offset + i);

    }

@@ -134,7 +136,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);

    }

 

@@ -158,5 +161,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);

 }

diff --git a/mesalib/src/glsl/ir_variable.cpp b/mesalib/src/glsl/ir_variable.cpp
index f99632b48..1cf450e20 100644
--- a/mesalib/src/glsl/ir_variable.cpp
+++ b/mesalib/src/glsl/ir_variable.cpp
@@ -30,6 +30,11 @@ static void generate_ARB_draw_buffers_variables(exec_list *,
 						struct _mesa_glsl_parse_state *,

 						bool, _mesa_glsl_parser_targets);

 

+static void

+generate_ARB_draw_instanced_variables(exec_list *,

+                                      struct _mesa_glsl_parse_state *,

+                                      bool, _mesa_glsl_parser_targets);

+

 static ir_variable *

 add_variable(const char *name, enum ir_variable_mode mode, int slot,

 	     const glsl_type *type, exec_list *instructions,

@@ -41,6 +46,7 @@ add_variable(const char *name, enum ir_variable_mode mode, int slot,
    case ir_var_auto:

    case ir_var_in:

    case ir_var_uniform:

+   case ir_var_system_value:

       var->read_only = true;

       break;

    case ir_var_inout:

@@ -324,8 +330,13 @@ initialize_vs_variables(exec_list *instructions,
       generate_130_vs_variables(instructions, state);

       break;

    }

+

+   if (state->ARB_draw_instanced_enable)

+      generate_ARB_draw_instanced_variables(instructions, state, false,

+                                            vertex_shader);

 }

 

+

 /* This function should only be called for ES, not desktop GL. */

 static void

 generate_100ES_fs_variables(exec_list *instructions,

@@ -422,6 +433,27 @@ generate_ARB_draw_buffers_variables(exec_list *instructions,
    }

 }

 

+

+static void

+generate_ARB_draw_instanced_variables(exec_list *instructions,

+                                      struct _mesa_glsl_parse_state *state,

+                                      bool warn,

+                                      _mesa_glsl_parser_targets target)

+{

+   /* gl_InstanceIDARB is only available in the vertex shader.

+    */

+   if (target == vertex_shader) {

+      ir_variable *const inst =

+         add_variable("gl_InstanceIDARB", ir_var_system_value,

+                      SYSTEM_VALUE_INSTANCE_ID,

+                      glsl_type::int_type, instructions, state->symbols);

+

+      if (warn)

+         inst->warn_extension = "GL_ARB_draw_instanced";

+   }

+}

+

+

 static void

 generate_ARB_shader_stencil_export_variables(exec_list *instructions,

 					     struct _mesa_glsl_parse_state *state,

diff --git a/mesalib/src/glsl/main.cpp b/mesalib/src/glsl/main.cpp
index eac944a0d..a51062456 100644
--- a/mesalib/src/glsl/main.cpp
+++ b/mesalib/src/glsl/main.cpp
@@ -84,6 +84,7 @@ initialize_context(struct gl_context *ctx, gl_api api)
    ctx->API = api;

 

    ctx->Extensions.ARB_draw_buffers = GL_TRUE;

+   ctx->Extensions.ARB_draw_instanced = GL_TRUE;

    ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;

    ctx->Extensions.EXT_texture_array = GL_TRUE;

    ctx->Extensions.NV_texture_rectangle = GL_TRUE;

@@ -196,7 +197,7 @@ compile_shader(struct gl_context *ctx, struct gl_shader *shader)
 

    const char *source = shader->Source;

    state->error = preprocess(state, &source, &state->info_log,

-			     state->extensions, ctx->API);

+			     state->extensions, ctx->API) != 0;

 

    if (!state->error) {

       _mesa_glsl_lexer_ctor(state, source);