fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

program: Remove RelAddr2 support.

Browse source 
Looks like more never-used crap from the first geometry shader attempt.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Acked-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Matt Turner 2016-02-27 13:44:50 -08:00
parent 6b1fb4862e
commit a0c3650ad3
5 changed files with 3 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/program/ir_to_mesa.cpp
View file

@ -2187,9 +2187,6 @@ mesa_src_reg_from_ir_src_reg(src_reg reg)
mesa_reg.RelAddr = reg.reladdr != NULL;
mesa_reg.Negate = reg.negate;
mesa_reg.Abs = 0;
mesa_reg.HasIndex2 = GL_FALSE;
mesa_reg.RelAddr2 = 0;
mesa_reg.Index2 = 0;
return mesa_reg;
}

16
src/mesa/program/prog_instruction.h
View file

@ -235,22 +235,6 @@ struct prog_src_register
* instruction which allows per-component negation.
*/
GLuint Negate:4;
/**
* Is the register two-dimensional.
* Two dimensional registers are of the
* REGISTER[index][index2] format.
* They are used by the geometry shaders where
* the first index is the index within an array
* and the second index is the semantic of the
* array, e.g. gl_PositionIn[index] would become
* INPUT[index][gl_PositionIn]
*/
GLuint HasIndex2:1;
GLuint RelAddr2:1;
GLint Index2:(INST_INDEX_BITS+1); /**< Extra bit here for sign bit.
* May be negative for relative
* addressing. */
};

2
src/mesa/program/prog_optimize.c
View file

@ -465,8 +465,6 @@ can_downward_mov_be_modifed(const struct prog_instruction *mov)
mov->SrcReg[0].RelAddr == 0 &&
mov->SrcReg[0].Negate == 0 &&
mov->SrcReg[0].Abs == 0 &&
mov->SrcReg[0].HasIndex2 == 0 &&
mov->SrcReg[0].RelAddr2 == 0 &&
mov->DstReg.RelAddr == 0 &&
mov->DstReg.CondMask == COND_TR;
}

14
src/mesa/program/prog_print.c
View file

@ -354,8 +354,7 @@ arb_output_attrib_string(GLuint index, GLenum progType)
*/
static const char *
reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode,
GLboolean relAddr, const struct gl_program *prog,
GLboolean hasIndex2, GLboolean relAddr2, GLint index2)
GLboolean relAddr, const struct gl_program *prog)
{
static char str[100];
const char *addr = relAddr ? "ADDR+" : "";
@ -366,11 +365,6 @@ reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode,
case PROG_PRINT_DEBUG:
sprintf(str, "%s[%s%d]",
_mesa_register_file_name(f), addr, index);
if (hasIndex2) {
int offset = strlen(str);
const char *addr2 = relAddr2 ? "ADDR+" : "";
sprintf(str+offset, "[%s%d]", addr2, index2);
}
break;
case PROG_PRINT_ARB:
@ -534,8 +528,7 @@ fprint_dst_reg(FILE * f,
{
fprintf(f, "%s%s",
reg_string((gl_register_file) dstReg->File,
dstReg->Index, mode, dstReg->RelAddr, prog,
GL_FALSE, GL_FALSE, 0),
dstReg->Index, mode, dstReg->RelAddr, prog),
_mesa_writemask_string(dstReg->WriteMask));
if (dstReg->CondMask != COND_TR) {
@ -565,8 +558,7 @@ fprint_src_reg(FILE *f,
fprintf(f, "%s%s%s%s",
abs,
reg_string((gl_register_file) srcReg->File,
srcReg->Index, mode, srcReg->RelAddr, prog,
srcReg->HasIndex2, srcReg->RelAddr2, srcReg->Index2),
srcReg->Index, mode, srcReg->RelAddr, prog),
_mesa_swizzle_string(srcReg->Swizzle,
srcReg->Negate, GL_FALSE),
abs);

9
src/mesa/state_tracker/st_mesa_to_tgsi.c
View file

@ -311,15 +311,6 @@ translate_src( struct st_translate *t,
{
struct ureg_src src = src_register( t, SrcReg->File, SrcReg->Index );
if (t->procType == TGSI_PROCESSOR_GEOMETRY && SrcReg->HasIndex2) {
src = src_register( t, SrcReg->File, SrcReg->Index2 );
if (SrcReg->RelAddr2)
src = ureg_src_dimension_indirect( src, ureg_src(t->address[0]),
SrcReg->Index);
else
src = ureg_src_dimension( src, SrcReg->Index);
}
src = ureg_swizzle( src,
GET_SWZ( SrcReg->Swizzle, 0 ) & 0x3,
GET_SWZ( SrcReg->Swizzle, 1 ) & 0x3,