NV fp: Parse 'OPTION NV_fragment_program' in ARB assembly shaders

diff --git a/src/mesa/shader/program_parse_extra.c b/src/mesa/shader/program_parse_extra.c
index 8e4be606f1695be49ecf1749e582ac448f9b0343..79e80c54d7131827524f399933b497dc7237d1e8 100644 (file)
--- a/src/mesa/shader/program_parse_extra.c
+++ b/src/mesa/shader/program_parse_extra.c
@@ -102,6 +102,17 @@ _mesa_ARBfp_parse_option(struct asm_parser_state *state, const char *option)
            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;
 

diff --git a/src/mesa/shader/program_parser.h b/src/mesa/shader/program_parser.h
index fa47d84565a1ad815fd321ef9e08ec7e56ee89df..be32a1bed158e63420526b6ab47401821902731f 100644 (file)
--- a/src/mesa/shader/program_parser.h
+++ b/src/mesa/shader/program_parser.h
@@ -202,6 +202,7 @@ struct asm_parser_state {
       unsigned Shadow:1;
       unsigned TexRect:1;
       unsigned TexArray:1;
+      unsigned NV_fragment:1;
    } option;
 
    struct {