[Mesa-dev] [PATCH 13/15] program: Remove NV_fragment_program opcode parsing.

[Ian Romanick]

On 02/29/2016 03:34 PM, Matt Turner wrote:
> ---
>  src/mesa/program/program_lexer.l  | 8 --------
>  src/mesa/program/program_parser.h | 1 -
>  2 files changed, 9 deletions(-)
> 
> diff --git a/src/mesa/program/program_lexer.l b/src/mesa/program/program_lexer.l
> index 2fcd71f..baaa58a 100644
> --- 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)
> @@ -191,8 +190,6 @@ ARL                { return_opcode(require_ARB_vp, ARL, ARL, 3); }
>  CMP{sat}           { return_opcode(require_ARB_fp, TRI_OP, CMP, 3); }
>  COS{szf}{cc}{sat}  { return_opcode(require_ARB_fp, SCALAR_OP, COS, 3); }

I think all of the {cc} business can go too.  I think that's for parsing
the condition codes that you remove in patch 6.

> -DDX{szf}{cc}{sat}  { return_opcode(require_NV_fp,  VECTOR_OP, DDX, 3); }
> -DDY{szf}{cc}{sat}  { return_opcode(require_NV_fp,  VECTOR_OP, DDY, 3); }
>  DP3{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, DP3, 3); }
>  DP4{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, DP4, 3); }
>  DPH{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, DPH, 3); }
> @@ -223,19 +220,14 @@ RCP{szf}{cc}{sat}  { return_opcode(             1, SCALAR_OP, RCP, 3); }
>  RSQ{szf}{cc}{sat}  { return_opcode(             1, SCALAR_OP, RSQ, 3); }
>  
>  SCS{sat}           { return_opcode(require_ARB_fp, SCALAR_OP, SCS, 3); }
> -SEQ{sz}{cc}{sat}   { return_opcode(require_NV_fp,  BIN_OP, SEQ, 3); }
>  SGE{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, SGE, 3); }
> -SGT{sz}{cc}{sat}   { return_opcode(require_NV_fp,  BIN_OP, SGT, 3); }
>  SIN{szf}{cc}{sat}  { return_opcode(require_ARB_fp, SCALAR_OP, SIN, 3); }
> -SLE{sz}{cc}{sat}   { return_opcode(require_NV_fp,  BIN_OP, SLE, 3); }
>  SLT{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, SLT, 3); }
> -SNE{sz}{cc}{sat}   { return_opcode(require_NV_fp,  BIN_OP, SNE, 3); }
>  SUB{sz}{cc}{sat}   { return_opcode(             1, BIN_OP, SUB, 3); }
>  SWZ{sat}           { return_opcode(             1, SWZ, SWZ, 3); }
>  
>  TEX{cc}{sat}       { return_opcode(require_ARB_fp, SAMPLE_OP, TEX, 3); }
>  TXB{cc}{sat}       { return_opcode(require_ARB_fp, SAMPLE_OP, TXB, 3); }
> -TXD{cc}{sat}       { return_opcode(require_NV_fp,  TXD_OP, TXD, 3); }
>  TXP{cc}{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 d5a1e22..af7b2a0 100644
> --- 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;
>