xkeyboard libxcb pixman mesa git update 2 May 2011

3 files changed, 32 insertions, 0 deletions

diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp
index 5bb3a6f25..18bff88de 100644
--- a/mesalib/src/glsl/glsl_parser_extras.cpp
+++ b/mesalib/src/glsl/glsl_parser_extras.cpp
@@ -255,6 +255,16 @@ _mesa_glsl_process_extension(const char *name, YYLTYPE *name_locp,
       state->AMD_conservative_depth_enable = (ext_mode != extension_disable);
       state->AMD_conservative_depth_warn = (ext_mode == extension_warn);
       unsupported = !state->extensions->AMD_conservative_depth;
+   } else if (strcmp(name, "GL_AMD_shader_stencil_export") == 0) {
+      state->AMD_shader_stencil_export_enable = (ext_mode != extension_disable);
+      state->AMD_shader_stencil_export_warn = (ext_mode == extension_warn);
+
+      /* This extension is only supported in fragment shaders.
+       * Both the ARB and AMD variants share the same ARB flag
+       * in gl_extensions.
+       */
+      unsupported = (state->target != fragment_shader)
+	 || !state->extensions->ARB_shader_stencil_export;
    } else if (strcmp(name, "GL_OES_texture_3D") == 0 && state->es_shader) {
       state->OES_texture_3D_enable = (ext_mode != extension_disable);
       state->OES_texture_3D_warn = (ext_mode == extension_warn);
diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h
index 6df0e160a..f9147653f 100644
--- a/mesalib/src/glsl/glsl_parser_extras.h
+++ b/mesalib/src/glsl/glsl_parser_extras.h
@@ -172,6 +172,8 @@ struct _mesa_glsl_parse_state {
    unsigned ARB_shader_stencil_export_warn:1;
    unsigned AMD_conservative_depth_enable:1;
    unsigned AMD_conservative_depth_warn:1;
+   unsigned AMD_shader_stencil_export_enable:1;
+   unsigned AMD_shader_stencil_export_warn:1;
    unsigned OES_texture_3D_enable:1;
    unsigned OES_texture_3D_warn:1;
    /*@}*/
diff --git a/mesalib/src/glsl/ir_variable.cpp b/mesalib/src/glsl/ir_variable.cpp
index f35771756..b8487694c 100644
--- a/mesalib/src/glsl/ir_variable.cpp
+++ b/mesalib/src/glsl/ir_variable.cpp
@@ -767,6 +767,22 @@ generate_ARB_shader_stencil_export_variables(exec_list *instructions,
 }
 
 static void
+generate_AMD_shader_stencil_export_variables(exec_list *instructions,
+					     struct _mesa_glsl_parse_state *state,
+					     bool warn)
+{
+   /* gl_FragStencilRefAMD is only available in the fragment shader.
+    */
+   ir_variable *const fd =
+      add_variable(instructions, state->symbols,
+		   "gl_FragStencilRefAMD", glsl_type::int_type,
+		   ir_var_out, FRAG_RESULT_STENCIL);
+
+   if (warn)
+      fd->warn_extension = "GL_AMD_shader_stencil_export";
+}
+
+static void
 generate_120_fs_variables(exec_list *instructions,
 			  struct _mesa_glsl_parse_state *state)
 {
@@ -818,6 +834,10 @@ initialize_fs_variables(exec_list *instructions,
    if (state->ARB_shader_stencil_export_enable)
       generate_ARB_shader_stencil_export_variables(instructions, state,
 						   state->ARB_shader_stencil_export_warn);
+
+   if (state->AMD_shader_stencil_export_enable)
+      generate_AMD_shader_stencil_export_variables(instructions, state,
+						   state->AMD_shader_stencil_export_warn);
 }
 
 void