diff options
Diffstat (limited to 'src/gallium/drivers/svga')
| -rw-r--r-- | src/gallium/drivers/svga/svga_tgsi_insn.c | 22 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_tgsi_vgpu10.c | 24 |
2 files changed, 23 insertions, 23 deletions
diff --git a/src/gallium/drivers/svga/svga_tgsi_insn.c b/src/gallium/drivers/svga/svga_tgsi_insn.c index bedda2ecf71..f0ef65f3d71 100644 --- a/src/gallium/drivers/svga/svga_tgsi_insn.c +++ b/src/gallium/drivers/svga/svga_tgsi_insn.c @@ -1826,11 +1826,11 @@ emit_tex_swizzle(struct svga_shader_emitter *emit, /* build writemasks and srcSwizzle terms */ for (i = 0; i < 4; i++) { - if (swizzleIn[i] == PIPE_SWIZZLE_ZERO) { + if (swizzleIn[i] == PIPE_SWIZZLE_0) { srcSwizzle[i] = TGSI_SWIZZLE_X + i; zeroWritemask |= (1 << i); } - else if (swizzleIn[i] == PIPE_SWIZZLE_ONE) { + else if (swizzleIn[i] == PIPE_SWIZZLE_1) { srcSwizzle[i] = TGSI_SWIZZLE_X + i; oneWritemask |= (1 << i); } @@ -1897,10 +1897,10 @@ emit_tex(struct svga_shader_emitter *emit, PIPE_TEX_COMPARE_R_TO_TEXTURE); /* texture swizzle */ - boolean swizzle = (emit->key.tex[unit].swizzle_r != PIPE_SWIZZLE_RED || - emit->key.tex[unit].swizzle_g != PIPE_SWIZZLE_GREEN || - emit->key.tex[unit].swizzle_b != PIPE_SWIZZLE_BLUE || - emit->key.tex[unit].swizzle_a != PIPE_SWIZZLE_ALPHA); + boolean swizzle = (emit->key.tex[unit].swizzle_r != PIPE_SWIZZLE_X || + emit->key.tex[unit].swizzle_g != PIPE_SWIZZLE_Y || + emit->key.tex[unit].swizzle_b != PIPE_SWIZZLE_Z || + emit->key.tex[unit].swizzle_a != PIPE_SWIZZLE_W); boolean saturate = insn->Instruction.Saturate; @@ -3633,12 +3633,12 @@ needs_to_create_common_immediate(const struct svga_shader_emitter *emit) if (emit->inverted_texcoords) return TRUE; - /* look for any PIPE_SWIZZLE_ZERO/ONE terms */ + /* look for any PIPE_SWIZZLE_0/ONE terms */ for (i = 0; i < emit->key.num_textures; i++) { - if (emit->key.tex[i].swizzle_r > PIPE_SWIZZLE_ALPHA || - emit->key.tex[i].swizzle_g > PIPE_SWIZZLE_ALPHA || - emit->key.tex[i].swizzle_b > PIPE_SWIZZLE_ALPHA || - emit->key.tex[i].swizzle_a > PIPE_SWIZZLE_ALPHA) + if (emit->key.tex[i].swizzle_r > PIPE_SWIZZLE_W || + emit->key.tex[i].swizzle_g > PIPE_SWIZZLE_W || + emit->key.tex[i].swizzle_b > PIPE_SWIZZLE_W || + emit->key.tex[i].swizzle_a > PIPE_SWIZZLE_W) return TRUE; } diff --git a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c index f8f615e7651..a899c47cd7f 100644 --- a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c +++ b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c @@ -5049,20 +5049,20 @@ end_tex_swizzle(struct svga_shader_emitter_v10 *emit, /* Swizzle w/out zero/one terms */ struct tgsi_full_src_register src_swizzled = swizzle_src(&swz->tmp_src, - swz_r < PIPE_SWIZZLE_ZERO ? swz_r : PIPE_SWIZZLE_RED, - swz_g < PIPE_SWIZZLE_ZERO ? swz_g : PIPE_SWIZZLE_GREEN, - swz_b < PIPE_SWIZZLE_ZERO ? swz_b : PIPE_SWIZZLE_BLUE, - swz_a < PIPE_SWIZZLE_ZERO ? swz_a : PIPE_SWIZZLE_ALPHA); + swz_r < PIPE_SWIZZLE_0 ? swz_r : PIPE_SWIZZLE_X, + swz_g < PIPE_SWIZZLE_0 ? swz_g : PIPE_SWIZZLE_Y, + swz_b < PIPE_SWIZZLE_0 ? swz_b : PIPE_SWIZZLE_Z, + swz_a < PIPE_SWIZZLE_0 ? swz_a : PIPE_SWIZZLE_W); /* MOV dst, color(tmp).<swizzle> */ emit_instruction_op1(emit, VGPU10_OPCODE_MOV, swz->inst_dst, &src_swizzled, FALSE); /* handle swizzle zero terms */ - writemask_0 = (((swz_r == PIPE_SWIZZLE_ZERO) << 0) | - ((swz_g == PIPE_SWIZZLE_ZERO) << 1) | - ((swz_b == PIPE_SWIZZLE_ZERO) << 2) | - ((swz_a == PIPE_SWIZZLE_ZERO) << 3)); + writemask_0 = (((swz_r == PIPE_SWIZZLE_0) << 0) | + ((swz_g == PIPE_SWIZZLE_0) << 1) | + ((swz_b == PIPE_SWIZZLE_0) << 2) | + ((swz_a == PIPE_SWIZZLE_0) << 3)); if (writemask_0) { struct tgsi_full_src_register zero = int_tex ? @@ -5077,10 +5077,10 @@ end_tex_swizzle(struct svga_shader_emitter_v10 *emit, } /* handle swizzle one terms */ - writemask_1 = (((swz_r == PIPE_SWIZZLE_ONE) << 0) | - ((swz_g == PIPE_SWIZZLE_ONE) << 1) | - ((swz_b == PIPE_SWIZZLE_ONE) << 2) | - ((swz_a == PIPE_SWIZZLE_ONE) << 3)); + writemask_1 = (((swz_r == PIPE_SWIZZLE_1) << 0) | + ((swz_g == PIPE_SWIZZLE_1) << 1) | + ((swz_b == PIPE_SWIZZLE_1) << 2) | + ((swz_a == PIPE_SWIZZLE_1) << 3)); if (writemask_1) { struct tgsi_full_src_register one = int_tex ? |