OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Delete now dead persample_2x FS program key flag.

Browse Source 
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>
This commit is contained in:
Kenneth Graunke
2016-04-05 19:33:04 -07:00
parent 57118a19da
commit de0a46a040
3 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/intel/vulkan/anv_pipeline.c
View File

@@ -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. * harmless to compute it and then let dead-code take care of it.
*/ */
key->persample_shading = info->pMultisampleState->sampleShadingEnable; 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_pos_offset = info->pMultisampleState->sampleShadingEnable;
key->compute_sample_id = info->pMultisampleState->sampleShadingEnable; key->compute_sample_id = info->pMultisampleState->sampleShadingEnable;
} }

1
src/mesa/drivers/dri/i965/brw_compiler.h
View File

@@ -243,7 +243,6 @@ struct brw_wm_prog_key {
bool stats_wm:1; bool stats_wm:1;
bool flat_shade:1; bool flat_shade:1;
bool persample_shading:1; bool persample_shading:1;
bool persample_2x:1;
unsigned nr_color_regions:5; unsigned nr_color_regions:5;
bool replicate_alpha:1; bool replicate_alpha:1;
bool render_to_fbo:1; bool render_to_fbo:1;

4
src/mesa/drivers/dri/i965/brw_wm.c
View File

@@ -252,8 +252,6 @@ brw_wm_debug_recompile(struct brw_context *brw,
old_key->flat_shade, key->flat_shade); old_key->flat_shade, key->flat_shade);
found |= key_debug(brw, "per-sample shading", found |= key_debug(brw, "per-sample shading",
old_key->persample_shading, key->persample_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", found |= key_debug(brw, "number of color buffers",
old_key->nr_color_regions, key->nr_color_regions); old_key->nr_color_regions, key->nr_color_regions);
found |= key_debug(brw, "MRT alpha test or alpha-to-coverage", 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. */ /* Ignore sample qualifier while computing this flag. */
key->persample_shading = key->persample_shading =
_mesa_get_min_invocations_per_fragment(ctx, &fp->program, true) > 1; _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 = key->compute_pos_offset =
_mesa_get_min_invocations_per_fragment(ctx, &fp->program, false) > 1 && _mesa_get_min_invocations_per_fragment(ctx, &fp->program, false) > 1 &&