diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2016-04-05 19:33:04 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2016-04-20 16:18:47 -0700 |
| commit | de0a46a040cf1aa83d5b262064b00bd601c09437 (patch) | |
| tree | 31f5ebc61f9257ed685ef25c455d6aac2562653f | |
| parent | 57118a19da932b4b5756021a0d75e91f42a68d99 (diff) | |
| download | external_mesa3d-de0a46a040cf1aa83d5b262064b00bd601c09437.zip external_mesa3d-de0a46a040cf1aa83d5b262064b00bd601c09437.tar.gz external_mesa3d-de0a46a040cf1aa83d5b262064b00bd601c09437.tar.bz2 | |
i965: Delete now dead persample_2x FS program key flag.
This was only used by the old gl_SampleID calculations. The new code
doesn't need to handle 2x specially.
v2: Delete it from the Vulkan driver, too.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | src/intel/vulkan/anv_pipeline.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_compiler.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm.c | 4 |
3 files changed, 0 insertions, 8 deletions
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 007c58b..1f4e3fa 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -287,9 +287,6 @@ populate_wm_prog_key(const struct brw_device_info *devinfo, * harmless to compute it and then let dead-code take care of it. */ key->persample_shading = info->pMultisampleState->sampleShadingEnable; - if (key->persample_shading) - key->persample_2x = info->pMultisampleState->rasterizationSamples == 2; - key->compute_pos_offset = info->pMultisampleState->sampleShadingEnable; key->compute_sample_id = info->pMultisampleState->sampleShadingEnable; } diff --git a/src/mesa/drivers/dri/i965/brw_compiler.h b/src/mesa/drivers/dri/i965/brw_compiler.h index a42583b..0a14d5d 100644 --- a/src/mesa/drivers/dri/i965/brw_compiler.h +++ b/src/mesa/drivers/dri/i965/brw_compiler.h @@ -243,7 +243,6 @@ struct brw_wm_prog_key { bool stats_wm:1; bool flat_shade:1; bool persample_shading:1; - bool persample_2x:1; unsigned nr_color_regions:5; bool replicate_alpha:1; bool render_to_fbo:1; diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 78846dc..86e8cf4 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -252,8 +252,6 @@ brw_wm_debug_recompile(struct brw_context *brw, old_key->flat_shade, key->flat_shade); found |= key_debug(brw, "per-sample shading", old_key->persample_shading, key->persample_shading); - found |= key_debug(brw, "per-sample shading and 2x MSAA", - old_key->persample_2x, key->persample_2x); found |= key_debug(brw, "number of color buffers", old_key->nr_color_regions, key->nr_color_regions); found |= key_debug(brw, "MRT alpha test or alpha-to-coverage", @@ -527,8 +525,6 @@ brw_wm_populate_key(struct brw_context *brw, struct brw_wm_prog_key *key) /* Ignore sample qualifier while computing this flag. */ key->persample_shading = _mesa_get_min_invocations_per_fragment(ctx, &fp->program, true) > 1; - if (key->persample_shading) - key->persample_2x = _mesa_geometric_samples(ctx->DrawBuffer) == 2; key->compute_pos_offset = _mesa_get_min_invocations_per_fragment(ctx, &fp->program, false) > 1 && |