diff options
Diffstat (limited to 'src/gallium/drivers/svga')
| -rw-r--r-- | src/gallium/drivers/svga/svga_shader.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_shader.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_tgsi_vgpu10.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/drivers/svga/svga_shader.c b/src/gallium/drivers/svga/svga_shader.c index 78eb3f65b61..d56cce49de5 100644 --- a/src/gallium/drivers/svga/svga_shader.c +++ b/src/gallium/drivers/svga/svga_shader.c @@ -195,7 +195,6 @@ svga_init_shader_key_common(const struct svga_context *svga, unsigned shader, } } - key->tex[i].texture_msaa = view->texture->nr_samples > 1; if (!svga->curr.sampler[shader][i]->normalized_coords) { assert(idx < (1 << 5)); /* width_height_idx:5 bitfield */ key->tex[i].width_height_idx = idx++; diff --git a/src/gallium/drivers/svga/svga_shader.h b/src/gallium/drivers/svga/svga_shader.h index 3f915740b1f..b53a4bf514c 100644 --- a/src/gallium/drivers/svga/svga_shader.h +++ b/src/gallium/drivers/svga/svga_shader.h @@ -99,7 +99,6 @@ struct svga_compile_key unsigned unnormalized:1; unsigned width_height_idx:5; /**< texture unit */ unsigned is_array:1; - unsigned texture_msaa:1; /**< A multisample texture? */ unsigned sprite_texgen:1; unsigned swizzle_r:3; unsigned swizzle_g:3; diff --git a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c index 0d5628251df..f8f615e7651 100644 --- a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c +++ b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c @@ -5439,7 +5439,7 @@ emit_txf(struct svga_shader_emitter_v10 *emit, const struct tgsi_full_instruction *inst) { const uint unit = inst->Src[1].Register.Index; - const unsigned msaa = emit->key.tex[unit].texture_msaa; + const boolean msaa = tgsi_is_msaa_target(inst->Texture.Texture); int offsets[3]; struct tex_swizzle_info swz_info; |