diff options
| author | Marek Olšák <[email protected]> | 2013-04-11 15:29:41 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-05-15 20:20:32 +0200 |
| commit | 5a3fac4d2667b5d46058564151142fec158f5f82 (patch) | |
| tree | f8e511f280ad4edb547ad8e755ff261298e6e37a /src/gallium/drivers/r600/r600_shader.c | |
| parent | 61c995bc47b838317a4a62fba2ff2031bcb0c23e (diff) | |
r600g: cleanup MSAA texture support checking
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_shader.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_shader.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 4416ef0fde2..4e5af708bd7 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -962,7 +962,7 @@ static int r600_shader_from_tgsi(struct r600_screen *rscreen, ctx.native_integers = true; r600_bytecode_init(ctx.bc, rscreen->chip_class, rscreen->family, - rscreen->msaa_texture_support); + rscreen->has_compressed_msaa_texturing); ctx.tokens = tokens; tgsi_scan_shader(tokens, &ctx.info); shader->indirect_files = ctx.info.indirect_files; @@ -3794,10 +3794,11 @@ static int tgsi_tex(struct r600_shader_ctx *ctx) unsigned src_gpr; int r, i, j; int opcode; - bool read_compressed_msaa = ctx->bc->msaa_texture_mode == MSAA_TEXTURE_COMPRESSED && + bool read_compressed_msaa = ctx->bc->has_compressed_msaa_texturing && inst->Instruction.Opcode == TGSI_OPCODE_TXF && (inst->Texture.Texture == TGSI_TEXTURE_2D_MSAA || inst->Texture.Texture == TGSI_TEXTURE_2D_ARRAY_MSAA); + /* Texture fetch instructions can only use gprs as source. * Also they cannot negate the source or take the absolute value */ const boolean src_requires_loading = (inst->Instruction.Opcode != TGSI_OPCODE_TXQ_LZ && |