program: Remove NV_fragment_program opcode parsing.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Acked-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/program/program_lexer.l b/src/mesa/program/program_lexer.l
index 11c7a61268402eb87c07f3f1333d24e62db88c12..bb169b930ce2cc8f7ebf7ac1457ad81708a3df73 100644 (file)
--- a/src/mesa/program/program_lexer.l
+++ b/src/mesa/program/program_lexer.l
@@ -32,7 +32,6 @@
 
 #define require_ARB_vp (yyextra->mode == ARB_vertex)
 #define require_ARB_fp (yyextra->mode == ARB_fragment)
-#define require_NV_fp  (yyextra->option.NV_fragment)
 #define require_shadow (yyextra->option.Shadow)
 #define require_rect   (yyextra->option.TexRect)
 #define require_texarray        (yyextra->option.TexArray)
@@ -188,8 +187,6 @@ ARL                { return_opcode(require_ARB_vp, ARL, ARL, 3); }
 CMP{sat}           { return_opcode(require_ARB_fp, TRI_OP, CMP, 3); }
 COS{sat}           { return_opcode(require_ARB_fp, SCALAR_OP, COS, 3); }
 
-DDX{sat}           { return_opcode(require_NV_fp,  VECTOR_OP, DDX, 3); }
-DDY{sat}           { return_opcode(require_NV_fp,  VECTOR_OP, DDY, 3); }
 DP3{sat}           { return_opcode(             1, BIN_OP, DP3, 3); }
 DP4{sat}           { return_opcode(             1, BIN_OP, DP4, 3); }
 DPH{sat}           { return_opcode(             1, BIN_OP, DPH, 3); }
@@ -220,19 +217,14 @@ RCP{sat}           { return_opcode(             1, SCALAR_OP, RCP, 3); }
 RSQ{sat}           { return_opcode(             1, SCALAR_OP, RSQ, 3); }
 
 SCS{sat}           { return_opcode(require_ARB_fp, SCALAR_OP, SCS, 3); }
-SEQ{sat}           { return_opcode(require_NV_fp,  BIN_OP, SEQ, 3); }
 SGE{sat}           { return_opcode(             1, BIN_OP, SGE, 3); }
-SGT{sat}           { return_opcode(require_NV_fp,  BIN_OP, SGT, 3); }
 SIN{sat}           { return_opcode(require_ARB_fp, SCALAR_OP, SIN, 3); }
-SLE{sat}           { return_opcode(require_NV_fp,  BIN_OP, SLE, 3); }
 SLT{sat}           { return_opcode(             1, BIN_OP, SLT, 3); }
-SNE{sat}           { return_opcode(require_NV_fp,  BIN_OP, SNE, 3); }
 SUB{sat}           { return_opcode(             1, BIN_OP, SUB, 3); }
 SWZ{sat}           { return_opcode(             1, SWZ, SWZ, 3); }
 
 TEX{sat}           { return_opcode(require_ARB_fp, SAMPLE_OP, TEX, 3); }
 TXB{sat}           { return_opcode(require_ARB_fp, SAMPLE_OP, TXB, 3); }
-TXD{sat}           { return_opcode(require_NV_fp,  TXD_OP, TXD, 3); }
 TXP{sat}           { return_opcode(require_ARB_fp, SAMPLE_OP, TXP, 3); }
 
 XPD{sat}           { return_opcode(             1, BIN_OP, XPD, 3); }

diff --git a/src/mesa/program/program_parser.h b/src/mesa/program/program_parser.h
index d5a1e229de45265cbc667248e76baa4935aa27e3..af7b2a0be3e39114d69600986e24f4d121db2af2 100644 (file)
--- a/src/mesa/program/program_parser.h
+++ b/src/mesa/program/program_parser.h
@@ -207,7 +207,6 @@ struct asm_parser_state {
       unsigned Shadow:1;
       unsigned TexRect:1;
       unsigned TexArray:1;
-      unsigned NV_fragment:1;
       unsigned OriginUpperLeft:1;
       unsigned PixelCenterInteger:1;
    } option;