svn merge ^/branches/released .

3 files changed, 295 insertions, 255 deletions

diff --git a/mesalib/src/mesa/program/program_parse.y b/mesalib/src/mesa/program/program_parse.y
index e63a9f1e1..292cd5ac1 100644
--- a/mesalib/src/mesa/program/program_parse.y
+++ b/mesalib/src/mesa/program/program_parse.y
@@ -2064,6 +2064,34 @@ optResultFaceType:
 	      ? VERT_RESULT_COL0

 	      : FRAG_RESULT_COLOR;

 	}

+	| '[' INTEGER ']'

+	{

+	   if (state->mode == ARB_vertex) {

+	      yyerror(& @1, state, "invalid program result name");

+	      YYERROR;

+	   } else {

+	      if (!state->option.DrawBuffers) {

+		 /* From the ARB_draw_buffers spec (same text exists

+		  * for ATI_draw_buffers):

+		  *

+		  *     If this option is not specified, a fragment

+		  *     program that attempts to bind

+		  *     "result.color[n]" will fail to load, and only

+		  *     "result.color" will be allowed.

+		  */

+		 yyerror(& @1, state,

+			 "result.color[] used without "

+			 "`OPTION ARB_draw_buffers' or "

+			 "`OPTION ATI_draw_buffers'");

+		 YYERROR;

+	      } else if ($2 >= state->MaxDrawBuffers) {

+		 yyerror(& @1, state,

+			 "result.color[] exceeds MAX_DRAW_BUFFERS_ARB");

+		 YYERROR;

+	      }

+	      $$ = FRAG_RESULT_DATA0 + $2;

+	   }

+	}

 	| FRONT

 	{

 	   if (state->mode == ARB_vertex) {

@@ -2681,6 +2709,7 @@ _mesa_parse_arb_program(struct gl_context *ctx, GLenum target, const GLubyte *st
    state->MaxClipPlanes = ctx->Const.MaxClipPlanes;

    state->MaxLights = ctx->Const.MaxLights;

    state->MaxProgramMatrices = ctx->Const.MaxProgramMatrices;

+   state->MaxDrawBuffers = ctx->Const.MaxDrawBuffers;

 

    state->state_param_enum = (target == GL_VERTEX_PROGRAM_ARB)

       ? STATE_VERTEX_PROGRAM : STATE_FRAGMENT_PROGRAM;

diff --git a/mesalib/src/mesa/program/program_parse_extra.c b/mesalib/src/mesa/program/program_parse_extra.c
index ae98b782b..67ab9b99d 100644
--- a/mesalib/src/mesa/program/program_parse_extra.c
+++ b/mesalib/src/mesa/program/program_parse_extra.c
@@ -1,255 +1,265 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <string.h>
-#include "main/mtypes.h"
-#include "prog_instruction.h"
-#include "program_parser.h"
-
-
-/**
- * Extra assembly-level parser routines
- *
- * \author Ian Romanick <ian.d.romanick@intel.com>
- */
-
-int
-_mesa_parse_instruction_suffix(const struct asm_parser_state *state,
-			       const char *suffix,
-			       struct prog_instruction *inst)
-{
-   inst->CondUpdate = 0;
-   inst->CondDst = 0;
-   inst->SaturateMode = SATURATE_OFF;
-   inst->Precision = FLOAT32;
-
-
-   /* The first possible suffix element is the precision specifier from
-    * NV_fragment_program_option.
-    */
-   if (state->option.NV_fragment) {
-      switch (suffix[0]) {
-      case 'H':
-	 inst->Precision = FLOAT16;
-	 suffix++;
-	 break;
-      case 'R':
-	 inst->Precision = FLOAT32;
-	 suffix++;
-	 break;
-      case 'X':
-	 inst->Precision = FIXED12;
-	 suffix++;
-	 break;
-      default:
-	 break;
-      }
-   }
-
-   /* The next possible suffix element is the condition code modifier selection
-    * from NV_fragment_program_option.
-    */
-   if (state->option.NV_fragment) {
-      if (suffix[0] == 'C') {
-	 inst->CondUpdate = 1;
-	 suffix++;
-      }
-   }
-
-
-   /* The final possible suffix element is the saturation selector from
-    * ARB_fragment_program.
-    */
-   if (state->mode == ARB_fragment) {
-      if (strcmp(suffix, "_SAT") == 0) {
-	 inst->SaturateMode = SATURATE_ZERO_ONE;
-	 suffix += 4;
-      }
-   }
-
-
-   /* It is an error for all of the suffix string not to be consumed.
-    */
-   return suffix[0] == '\0';
-}
-
-
-int
-_mesa_parse_cc(const char *s)
-{
-   int cond = 0;
-
-   switch (s[0]) {
-   case 'E':
-      if (s[1] == 'Q') {
-	 cond = COND_EQ;
-      }
-      break;
-
-   case 'F':
-      if (s[1] == 'L') {
-	 cond = COND_FL;
-      }
-      break;
-
-   case 'G':
-      if (s[1] == 'E') {
-	 cond = COND_GE;
-      } else if (s[1] == 'T') {
-	 cond = COND_GT;
-      }
-      break;
-
-   case 'L':
-      if (s[1] == 'E') {
-	 cond = COND_LE;
-      } else if (s[1] == 'T') {
-	 cond = COND_LT;
-      }
-      break;
-
-   case 'N':
-      if (s[1] == 'E') {
-	 cond = COND_NE;
-      }
-      break;
-
-   case 'T':
-      if (s[1] == 'R') {
-	 cond = COND_TR;
-      }
-      break;
-
-   default:
-      break;
-   }
-
-   return ((cond == 0) || (s[2] != '\0')) ? 0 : cond;
-}
-
-
-int
-_mesa_ARBvp_parse_option(struct asm_parser_state *state, const char *option)
-{
-   if (strcmp(option, "ARB_position_invariant") == 0) {
-      state->option.PositionInvariant = 1;
-      return 1;
-   }
-
-   return 0;
-}
-
-
-int
-_mesa_ARBfp_parse_option(struct asm_parser_state *state, const char *option)
-{
-   /* All of the options currently supported start with "ARB_".  The code is
-    * currently structured with nested if-statements because eventually options
-    * that start with "NV_" will be supported.  This structure will result in
-    * less churn when those options are added.
-    */
-   if (strncmp(option, "ARB_", 4) == 0) {
-      /* Advance the pointer past the "ARB_" prefix.
-       */
-      option += 4;
-
-
-      if (strncmp(option, "fog_", 4) == 0) {
-	 option += 4;
-
-	 if (state->option.Fog == OPTION_NONE) {
-	    if (strcmp(option, "exp") == 0) {
-	       state->option.Fog = OPTION_FOG_EXP;
-	       return 1;
-	    } else if (strcmp(option, "exp2") == 0) {
-	       state->option.Fog = OPTION_FOG_EXP2;
-	       return 1;
-	    } else if (strcmp(option, "linear") == 0) {
-	       state->option.Fog = OPTION_FOG_LINEAR;
-	       return 1;
-	    }
-	 }
-
-	 return 0;
-      } else if (strncmp(option, "precision_hint_", 15) == 0) {
-	 option += 15;
-
-	 if (state->option.PrecisionHint == OPTION_NONE) {
-	    if (strcmp(option, "nicest") == 0) {
-	       state->option.PrecisionHint = OPTION_NICEST;
-	       return 1;
-	    } else if (strcmp(option, "fastest") == 0) {
-	       state->option.PrecisionHint = OPTION_FASTEST;
-	       return 1;
-	    }
-	 }
-
-	 return 0;
-      } else if (strcmp(option, "draw_buffers") == 0) {
-	 /* Don't need to check extension availability because all Mesa-based
-	  * drivers support GL_ARB_draw_buffers.
-	  */
-	 state->option.DrawBuffers = 1;
-	 return 1;
-      } else if (strcmp(option, "fragment_program_shadow") == 0) {
-	 if (state->ctx->Extensions.ARB_fragment_program_shadow) {
-	    state->option.Shadow = 1;
-	    return 1;
-	 }
-      } else if (strncmp(option, "fragment_coord_", 15) == 0) {
-         option += 15;
-         if (state->ctx->Extensions.ARB_fragment_coord_conventions) {
-            if (strcmp(option, "origin_upper_left") == 0) {
-               state->option.OriginUpperLeft = 1;
-               return 1;
-            }
-            else if (strcmp(option, "pixel_center_integer") == 0) {
-               state->option.PixelCenterInteger = 1;
-               return 1;
-            }
-         }
-      }
-   } else if (strncmp(option, "NV_fragment_program", 19) == 0) {
-      option += 19;
-
-      /* Other NV_fragment_program strings may be supported later.
-       */
-      if (option[0] == '\0') {
-	 if (state->ctx->Extensions.NV_fragment_program_option) {
-	    state->option.NV_fragment = 1;
-	    return 1;
-	 }
-      }
-   } else if (strncmp(option, "MESA_", 5) == 0) {
-      option += 5;
-
-      if (strcmp(option, "texture_array") == 0) {
-	 if (state->ctx->Extensions.MESA_texture_array) {
-	    state->option.TexArray = 1;
-	    return 1;
-	 }
-      }
-   }
-
-   return 0;
-}
+/*

+ * Copyright © 2009 Intel Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#include <string.h>

+#include "main/mtypes.h"

+#include "prog_instruction.h"

+#include "program_parser.h"

+

+

+/**

+ * Extra assembly-level parser routines

+ *

+ * \author Ian Romanick <ian.d.romanick@intel.com>

+ */

+

+int

+_mesa_parse_instruction_suffix(const struct asm_parser_state *state,

+			       const char *suffix,

+			       struct prog_instruction *inst)

+{

+   inst->CondUpdate = 0;

+   inst->CondDst = 0;

+   inst->SaturateMode = SATURATE_OFF;

+   inst->Precision = FLOAT32;

+

+

+   /* The first possible suffix element is the precision specifier from

+    * NV_fragment_program_option.

+    */

+   if (state->option.NV_fragment) {

+      switch (suffix[0]) {

+      case 'H':

+	 inst->Precision = FLOAT16;

+	 suffix++;

+	 break;

+      case 'R':

+	 inst->Precision = FLOAT32;

+	 suffix++;

+	 break;

+      case 'X':

+	 inst->Precision = FIXED12;

+	 suffix++;

+	 break;

+      default:

+	 break;

+      }

+   }

+

+   /* The next possible suffix element is the condition code modifier selection

+    * from NV_fragment_program_option.

+    */

+   if (state->option.NV_fragment) {

+      if (suffix[0] == 'C') {

+	 inst->CondUpdate = 1;

+	 suffix++;

+      }

+   }

+

+

+   /* The final possible suffix element is the saturation selector from

+    * ARB_fragment_program.

+    */

+   if (state->mode == ARB_fragment) {

+      if (strcmp(suffix, "_SAT") == 0) {

+	 inst->SaturateMode = SATURATE_ZERO_ONE;

+	 suffix += 4;

+      }

+   }

+

+

+   /* It is an error for all of the suffix string not to be consumed.

+    */

+   return suffix[0] == '\0';

+}

+

+

+int

+_mesa_parse_cc(const char *s)

+{

+   int cond = 0;

+

+   switch (s[0]) {

+   case 'E':

+      if (s[1] == 'Q') {

+	 cond = COND_EQ;

+      }

+      break;

+

+   case 'F':

+      if (s[1] == 'L') {

+	 cond = COND_FL;

+      }

+      break;

+

+   case 'G':

+      if (s[1] == 'E') {

+	 cond = COND_GE;

+      } else if (s[1] == 'T') {

+	 cond = COND_GT;

+      }

+      break;

+

+   case 'L':

+      if (s[1] == 'E') {

+	 cond = COND_LE;

+      } else if (s[1] == 'T') {

+	 cond = COND_LT;

+      }

+      break;

+

+   case 'N':

+      if (s[1] == 'E') {

+	 cond = COND_NE;

+      }

+      break;

+

+   case 'T':

+      if (s[1] == 'R') {

+	 cond = COND_TR;

+      }

+      break;

+

+   default:

+      break;

+   }

+

+   return ((cond == 0) || (s[2] != '\0')) ? 0 : cond;

+}

+

+

+int

+_mesa_ARBvp_parse_option(struct asm_parser_state *state, const char *option)

+{

+   if (strcmp(option, "ARB_position_invariant") == 0) {

+      state->option.PositionInvariant = 1;

+      return 1;

+   }

+

+   return 0;

+}

+

+

+int

+_mesa_ARBfp_parse_option(struct asm_parser_state *state, const char *option)

+{

+   /* All of the options currently supported start with "ARB_".  The code is

+    * currently structured with nested if-statements because eventually options

+    * that start with "NV_" will be supported.  This structure will result in

+    * less churn when those options are added.

+    */

+   if (strncmp(option, "ARB_", 4) == 0) {

+      /* Advance the pointer past the "ARB_" prefix.

+       */

+      option += 4;

+

+

+      if (strncmp(option, "fog_", 4) == 0) {

+	 option += 4;

+

+	 if (state->option.Fog == OPTION_NONE) {

+	    if (strcmp(option, "exp") == 0) {

+	       state->option.Fog = OPTION_FOG_EXP;

+	       return 1;

+	    } else if (strcmp(option, "exp2") == 0) {

+	       state->option.Fog = OPTION_FOG_EXP2;

+	       return 1;

+	    } else if (strcmp(option, "linear") == 0) {

+	       state->option.Fog = OPTION_FOG_LINEAR;

+	       return 1;

+	    }

+	 }

+

+	 return 0;

+      } else if (strncmp(option, "precision_hint_", 15) == 0) {

+	 option += 15;

+

+	 if (state->option.PrecisionHint == OPTION_NONE) {

+	    if (strcmp(option, "nicest") == 0) {

+	       state->option.PrecisionHint = OPTION_NICEST;

+	       return 1;

+	    } else if (strcmp(option, "fastest") == 0) {

+	       state->option.PrecisionHint = OPTION_FASTEST;

+	       return 1;

+	    }

+	 }

+

+	 return 0;

+      } else if (strcmp(option, "draw_buffers") == 0) {

+	 /* Don't need to check extension availability because all Mesa-based

+	  * drivers support GL_ARB_draw_buffers.

+	  */

+	 state->option.DrawBuffers = 1;

+	 return 1;

+      } else if (strcmp(option, "fragment_program_shadow") == 0) {

+	 if (state->ctx->Extensions.ARB_fragment_program_shadow) {

+	    state->option.Shadow = 1;

+	    return 1;

+	 }

+      } else if (strncmp(option, "fragment_coord_", 15) == 0) {

+         option += 15;

+         if (state->ctx->Extensions.ARB_fragment_coord_conventions) {

+            if (strcmp(option, "origin_upper_left") == 0) {

+               state->option.OriginUpperLeft = 1;

+               return 1;

+            }

+            else if (strcmp(option, "pixel_center_integer") == 0) {

+               state->option.PixelCenterInteger = 1;

+               return 1;

+            }

+         }

+      }

+   } else if (strncmp(option, "ATI_", 4) == 0) {

+      option += 4;

+

+      if (strcmp(option, "draw_buffers") == 0) {

+	 /* Don't need to check extension availability because all Mesa-based

+	  * drivers support GL_ATI_draw_buffers.

+	  */

+	 state->option.DrawBuffers = 1;

+	 return 1;

+      }

+   } else if (strncmp(option, "NV_fragment_program", 19) == 0) {

+      option += 19;

+

+      /* Other NV_fragment_program strings may be supported later.

+       */

+      if (option[0] == '\0') {

+	 if (state->ctx->Extensions.NV_fragment_program_option) {

+	    state->option.NV_fragment = 1;

+	    return 1;

+	 }

+      }

+   } else if (strncmp(option, "MESA_", 5) == 0) {

+      option += 5;

+

+      if (strcmp(option, "texture_array") == 0) {

+	 if (state->ctx->Extensions.MESA_texture_array) {

+	    state->option.TexArray = 1;

+	    return 1;

+	 }

+      }

+   }

+

+   return 0;

+}

diff --git a/mesalib/src/mesa/program/program_parser.h b/mesalib/src/mesa/program/program_parser.h
index ff2f4f25f..cbbb2677d 100644
--- a/mesalib/src/mesa/program/program_parser.h
+++ b/mesalib/src/mesa/program/program_parser.h
@@ -173,6 +173,7 @@ struct asm_parser_state {
    unsigned MaxClipPlanes;

    unsigned MaxLights;

    unsigned MaxProgramMatrices;

+   unsigned MaxDrawBuffers;

    /*@}*/

 

    /**