Browse Source

nvfx: remove src_native_swz, which was a no-op

src_native_swz was used to translate 0/1 swizzles back when Gallium
supported them.

That support was later removed from Gallium, and the function currently
always returns true.

Remove it.
tags/mesa-7.9-rc1
Luca Barbieri 15 years ago
parent
commit
9b3a908736
2 changed files with 0 additions and 88 deletions
  1. 0
    44
      src/gallium/drivers/nvfx/nvfx_fragprog.c
  2. 0
    44
      src/gallium/drivers/nvfx/nvfx_vertprog.c

+ 0
- 44
src/gallium/drivers/nvfx/nvfx_fragprog.c View File

@@ -298,39 +298,6 @@ tgsi_mask(uint tgsi)
return mask;
}

static boolean
src_native_swz(struct nvfx_fpc *fpc, const struct tgsi_full_src_register *fsrc,
struct nvfx_sreg *src)
{
const struct nvfx_sreg none = nvfx_sr(NVFXSR_NONE, 0);
struct nvfx_sreg tgsi = tgsi_src(fpc, fsrc);
uint mask = 0;
uint c;

for (c = 0; c < 4; c++) {
switch (tgsi_util_get_full_src_register_swizzle(fsrc, c)) {
case TGSI_SWIZZLE_X:
case TGSI_SWIZZLE_Y:
case TGSI_SWIZZLE_Z:
case TGSI_SWIZZLE_W:
mask |= (1 << c);
break;
default:
assert(0);
}
}

if (mask == NVFX_FP_MASK_ALL)
return TRUE;

*src = temp(fpc);

if (mask)
arith(fpc, 0, MOV, *src, mask, tgsi, none, none);

return FALSE;
}

static boolean
nvfx_fragprog_parse_instruction(struct nvfx_context* nvfx, struct nvfx_fpc *fpc,
const struct tgsi_full_instruction *finst)
@@ -358,17 +325,6 @@ nvfx_fragprog_parse_instruction(struct nvfx_context* nvfx, struct nvfx_fpc *fpc,

fsrc = &finst->Src[i];

switch (fsrc->Register.File) {
case TGSI_FILE_INPUT:
case TGSI_FILE_CONSTANT:
case TGSI_FILE_TEMPORARY:
if (!src_native_swz(fpc, fsrc, &src[i]))
continue;
break;
default:
break;
}

switch (fsrc->Register.File) {
case TGSI_FILE_INPUT:
if (ai == -1 || ai == fsrc->Register.Index) {

+ 0
- 44
src/gallium/drivers/nvfx/nvfx_vertprog.c View File

@@ -397,39 +397,6 @@ tgsi_mask(uint tgsi)
return mask;
}

static boolean
src_native_swz(struct nvfx_context* nvfx, struct nvfx_vpc *vpc, const struct tgsi_full_src_register *fsrc,
struct nvfx_sreg *src)
{
const struct nvfx_sreg none = nvfx_sr(NVFXSR_NONE, 0);
struct nvfx_sreg tgsi = tgsi_src(vpc, fsrc);
uint mask = 0;
uint c;

for (c = 0; c < 4; c++) {
switch (tgsi_util_get_full_src_register_swizzle(fsrc, c)) {
case TGSI_SWIZZLE_X:
case TGSI_SWIZZLE_Y:
case TGSI_SWIZZLE_Z:
case TGSI_SWIZZLE_W:
mask |= tgsi_mask(1 << c);
break;
default:
assert(0);
}
}

if (mask == NVFX_VP_MASK_ALL)
return TRUE;

*src = temp(vpc);

if (mask)
arith(vpc, VEC, MOV, *src, mask, tgsi, none, none);

return FALSE;
}

static boolean
nvfx_vertprog_parse_instruction(struct nvfx_context* nvfx, struct nvfx_vpc *vpc,
const struct tgsi_full_instruction *finst)
@@ -457,17 +424,6 @@ nvfx_vertprog_parse_instruction(struct nvfx_context* nvfx, struct nvfx_vpc *vpc,

fsrc = &finst->Src[i];

switch (fsrc->Register.File) {
case TGSI_FILE_INPUT:
case TGSI_FILE_CONSTANT:
case TGSI_FILE_TEMPORARY:
if (!src_native_swz(nvfx, vpc, fsrc, &src[i]))
continue;
break;
default:
break;
}

switch (fsrc->Register.File) {
case TGSI_FILE_INPUT:
if (ai == -1 || ai == fsrc->Register.Index) {

Loading…
Cancel
Save