third_party
/
virglrenderer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gallium: remove TGSI opcodes PUSHA, POPA, SAD, TXQ_LZ

Browse Source 
Same as Mesa 44716655e6e

Signed-off-by: Elie Tournier <elie.tournier@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
macos/master
Elie Tournier 6 years ago committed by Dave Airlie
parent 346d36abc1
commit 4ea2c60553
4 changed files with 9 additions and 18 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 15
      src/gallium/auxiliary/tgsi/tgsi_info.c
  2. 3
      src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
  3. 1
      src/gallium/auxiliary/tgsi/tgsi_util.c
  4. 8
      src/gallium/include/pipe/p_shader_tokens.h

15
src/gallium/auxiliary/tgsi/tgsi_info.c
Unescape View File

@ -118,8 +118,8 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
{ 0, 0, 0, 0, 1, 0, NONE, "ENDIF", TGSI_OPCODE_ENDIF }, { 0, 0, 0, 0, 1, 0, NONE, "ENDIF", TGSI_OPCODE_ENDIF },
{ 1, 1, 0, 0, 0, 0, COMP, "DDX_FINE", TGSI_OPCODE_DDX_FINE }, { 1, 1, 0, 0, 0, 0, COMP, "DDX_FINE", TGSI_OPCODE_DDX_FINE },
{ 1, 1, 0, 0, 0, 0, COMP, "DDY_FINE", TGSI_OPCODE_DDY_FINE }, { 1, 1, 0, 0, 0, 0, COMP, "DDY_FINE", TGSI_OPCODE_DDY_FINE },
{ 0, 1, 0, 0, 0, 0, NONE, "PUSHA", TGSI_OPCODE_PUSHA }, { 0, 0, 0, 0, 0, 0, NONE, "", 81 }, /* removed */
{ 1, 0, 0, 0, 0, 0, NONE, "POPA", TGSI_OPCODE_POPA }, { 0, 0, 0, 0, 0, 0, NONE, "", 82 }, /* removed */
{ 1, 1, 0, 0, 0, 0, COMP, "CEIL", TGSI_OPCODE_CEIL }, { 1, 1, 0, 0, 0, 0, COMP, "CEIL", TGSI_OPCODE_CEIL },
{ 1, 1, 0, 0, 0, 0, COMP, "I2F", TGSI_OPCODE_I2F }, { 1, 1, 0, 0, 0, 0, COMP, "I2F", TGSI_OPCODE_I2F },
{ 1, 1, 0, 0, 0, 0, COMP, "NOT", TGSI_OPCODE_NOT }, { 1, 1, 0, 0, 0, 0, COMP, "NOT", TGSI_OPCODE_NOT },
@ -130,7 +130,7 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
{ 1, 2, 0, 0, 0, 0, COMP, "OR", TGSI_OPCODE_OR }, { 1, 2, 0, 0, 0, 0, COMP, "OR", TGSI_OPCODE_OR },
{ 1, 2, 0, 0, 0, 0, COMP, "MOD", TGSI_OPCODE_MOD }, { 1, 2, 0, 0, 0, 0, COMP, "MOD", TGSI_OPCODE_MOD },
{ 1, 2, 0, 0, 0, 0, COMP, "XOR", TGSI_OPCODE_XOR }, { 1, 2, 0, 0, 0, 0, COMP, "XOR", TGSI_OPCODE_XOR },
{ 1, 3, 0, 0, 0, 0, COMP, "SAD", TGSI_OPCODE_SAD }, { 0, 0, 0, 0, 0, 0, COMP, "", 93 }, /* removed */
{ 1, 2, 1, 0, 0, 0, OTHR, "TXF", TGSI_OPCODE_TXF }, { 1, 2, 1, 0, 0, 0, OTHR, "TXF", TGSI_OPCODE_TXF },
{ 1, 2, 1, 0, 0, 0, OTHR, "TXQ", TGSI_OPCODE_TXQ }, { 1, 2, 1, 0, 0, 0, OTHR, "TXQ", TGSI_OPCODE_TXQ },
{ 0, 0, 0, 0, 0, 0, NONE, "CONT", TGSI_OPCODE_CONT }, { 0, 0, 0, 0, 0, 0, NONE, "CONT", TGSI_OPCODE_CONT },
@ -140,7 +140,7 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
{ 0, 0, 0, 0, 0, 1, NONE, "BGNSUB", TGSI_OPCODE_BGNSUB }, { 0, 0, 0, 0, 0, 1, NONE, "BGNSUB", TGSI_OPCODE_BGNSUB },
{ 0, 0, 0, 1, 1, 0, NONE, "ENDLOOP", TGSI_OPCODE_ENDLOOP }, { 0, 0, 0, 1, 1, 0, NONE, "ENDLOOP", TGSI_OPCODE_ENDLOOP },
{ 0, 0, 0, 0, 1, 0, NONE, "ENDSUB", TGSI_OPCODE_ENDSUB }, { 0, 0, 0, 0, 1, 0, NONE, "ENDSUB", TGSI_OPCODE_ENDSUB },
{ 1, 1, 1, 0, 0, 0, OTHR, "TXQ_LZ", TGSI_OPCODE_TXQ_LZ }, { 0, 0, 0, 0, 0, 0, OTHR, "", 103 }, /* removed */
{ 1, 1, 1, 0, 0, 0, OTHR, "TXQS", TGSI_OPCODE_TXQS }, { 1, 1, 1, 0, 0, 0, OTHR, "TXQS", TGSI_OPCODE_TXQS },
{ 1, 1, 0, 0, 0, 0, OTHR, "RESQ", TGSI_OPCODE_RESQ }, { 1, 1, 0, 0, 0, 0, OTHR, "RESQ", TGSI_OPCODE_RESQ },
{ 0, 0, 0, 0, 0, 0, NONE, "", 106 }, /* removed */ { 0, 0, 0, 0, 0, 0, NONE, "", 106 }, /* removed */
@ -263,7 +263,7 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
{ 1, 1, 0, 0, 0, 0, COMP, "DROUND", TGSI_OPCODE_DROUND }, { 1, 1, 0, 0, 0, 0, COMP, "DROUND", TGSI_OPCODE_DROUND },
{ 1, 1, 0, 0, 0, 0, COMP, "DSSG", TGSI_OPCODE_DSSG }, { 1, 1, 0, 0, 0, 0, COMP, "DSSG", TGSI_OPCODE_DSSG },
{ 1, 2, 0, 0, 0, 0, COMP, "DDIV", TGSI_OPCODE_DDIV }, { 1, 2, 0, 0, 0, 0, COMP, "DDIV", TGSI_OPCODE_DDIV },
{ 1, 0, 0, 0, 0, 0, OTHR, "CLOCK", TGSI_OPCODE_CLOCK } { 1, 0, 0, 0, 0, 0, OTHR, "CLOCK", TGSI_OPCODE_CLOCK },
{ 1, 1, 0, 0, 0, 0, COMP, "I64ABS", TGSI_OPCODE_I64ABS }, { 1, 1, 0, 0, 0, 0, COMP, "I64ABS", TGSI_OPCODE_I64ABS },
{ 1, 1, 0, 0, 0, 0, COMP, "I64NEG", TGSI_OPCODE_I64NEG }, { 1, 1, 0, 0, 0, 0, COMP, "I64NEG", TGSI_OPCODE_I64NEG },
@ -297,7 +297,7 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
{ 1, 1, 0, 0, 0, 0, COMP, "F2U64", TGSI_OPCODE_F2U64 }, { 1, 1, 0, 0, 0, 0, COMP, "F2U64", TGSI_OPCODE_F2U64 },
{ 1, 1, 0, 0, 0, 0, COMP, "D2U64", TGSI_OPCODE_D2U64 }, { 1, 1, 0, 0, 0, 0, COMP, "D2U64", TGSI_OPCODE_D2U64 },
{ 1, 1, 0, 0, 0, 0, COMP, "U642F", TGSI_OPCODE_U642F }, { 1, 1, 0, 0, 0, 0, COMP, "U642F", TGSI_OPCODE_U642F },
{ 1, 1, 0, 0, 0, 0, COMP, "U642D", TGSI_OPCODE_U642D }, { 1, 1, 0, 0, 0, 0, COMP, "U642D", TGSI_OPCODE_U642D }
}; };
const struct tgsi_opcode_info * const struct tgsi_opcode_info *
@ -364,9 +364,7 @@ tgsi_opcode_infer_type( uint opcode )
case TGSI_OPCODE_AND: case TGSI_OPCODE_AND:
case TGSI_OPCODE_OR: case TGSI_OPCODE_OR:
case TGSI_OPCODE_XOR: case TGSI_OPCODE_XOR:
case TGSI_OPCODE_SAD: /* XXX some src args may be signed for SAD ? */
case TGSI_OPCODE_TXQ: case TGSI_OPCODE_TXQ:
case TGSI_OPCODE_TXQ_LZ:
case TGSI_OPCODE_TXQS: case TGSI_OPCODE_TXQS:
case TGSI_OPCODE_F2U: case TGSI_OPCODE_F2U:
case TGSI_OPCODE_UDIV: case TGSI_OPCODE_UDIV:
@ -508,7 +506,6 @@ tgsi_opcode_infer_src_type( uint opcode )
return TGSI_TYPE_SIGNED; return TGSI_TYPE_SIGNED;
case TGSI_OPCODE_ARL: case TGSI_OPCODE_ARL:
case TGSI_OPCODE_ARR: case TGSI_OPCODE_ARR:
case TGSI_OPCODE_TXQ_LZ:
case TGSI_OPCODE_F2D: case TGSI_OPCODE_F2D:
case TGSI_OPCODE_F2I: case TGSI_OPCODE_F2I:
case TGSI_OPCODE_F2U: case TGSI_OPCODE_F2U:

3
src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
Unescape View File

@ -122,8 +122,6 @@ OP01_LBL(IF)
OP01_LBL(UIF) OP01_LBL(UIF)
OP00_LBL(ELSE) OP00_LBL(ELSE)
OP00(ENDIF) OP00(ENDIF)
OP01(PUSHA)
OP10(POPA)
OP11(CEIL) OP11(CEIL)
OP11(I2F) OP11(I2F)
OP11(NOT) OP11(NOT)
@ -133,7 +131,6 @@ OP12(AND)
OP12(OR) OP12(OR)
OP12(MOD) OP12(MOD)
OP12(XOR) OP12(XOR)
OP13(SAD)
OP12_TEX(TXF) OP12_TEX(TXF)
OP12_TEX(TXQ) OP12_TEX(TXQ)
OP00(CONT) OP00(CONT)

1
src/gallium/auxiliary/tgsi/tgsi_util.c
Unescape View File

@ -215,7 +215,6 @@ tgsi_util_get_inst_usage_mask(const struct tgsi_full_instruction *inst,
case TGSI_OPCODE_AND: case TGSI_OPCODE_AND:
case TGSI_OPCODE_OR: case TGSI_OPCODE_OR:
case TGSI_OPCODE_XOR: case TGSI_OPCODE_XOR:
case TGSI_OPCODE_SAD:
case TGSI_OPCODE_FSEQ: case TGSI_OPCODE_FSEQ:
case TGSI_OPCODE_FSGE: case TGSI_OPCODE_FSGE:
case TGSI_OPCODE_FSLT: case TGSI_OPCODE_FSLT:

8
src/gallium/include/pipe/p_shader_tokens.h
Unescape View File

@ -409,9 +409,7 @@ struct tgsi_property_data {
#define TGSI_OPCODE_DDX_FINE 79 #define TGSI_OPCODE_DDX_FINE 79
#define TGSI_OPCODE_DDY_FINE 80 #define TGSI_OPCODE_DDY_FINE 80
/* gap */
#define TGSI_OPCODE_PUSHA 81
#define TGSI_OPCODE_POPA 82
#define TGSI_OPCODE_CEIL 83 #define TGSI_OPCODE_CEIL 83
#define TGSI_OPCODE_I2F 84 #define TGSI_OPCODE_I2F 84
#define TGSI_OPCODE_NOT 85 #define TGSI_OPCODE_NOT 85
@ -422,7 +420,7 @@ struct tgsi_property_data {
#define TGSI_OPCODE_OR 90 #define TGSI_OPCODE_OR 90
#define TGSI_OPCODE_MOD 91 #define TGSI_OPCODE_MOD 91
#define TGSI_OPCODE_XOR 92 #define TGSI_OPCODE_XOR 92
#define TGSI_OPCODE_SAD 93 /* gap */
#define TGSI_OPCODE_TXF 94 #define TGSI_OPCODE_TXF 94
#define TGSI_OPCODE_TXQ 95 #define TGSI_OPCODE_TXQ 95
#define TGSI_OPCODE_CONT 96 #define TGSI_OPCODE_CONT 96
@ -432,7 +430,7 @@ struct tgsi_property_data {
#define TGSI_OPCODE_BGNSUB 100 #define TGSI_OPCODE_BGNSUB 100
#define TGSI_OPCODE_ENDLOOP 101 #define TGSI_OPCODE_ENDLOOP 101
#define TGSI_OPCODE_ENDSUB 102 #define TGSI_OPCODE_ENDSUB 102
#define TGSI_OPCODE_TXQ_LZ 103 /* TXQ for mipmap level 0 */ /* gap */
#define TGSI_OPCODE_TXQS 104 #define TGSI_OPCODE_TXQS 104
#define TGSI_OPCODE_RESQ 105 #define TGSI_OPCODE_RESQ 105
/* gap */ /* gap */

Write Preview
Loading…
Cancel
Save