summaryrefslogtreecommitdiffstats
path: root/src/intel
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2016-04-05 19:35:46 -0700
committerKenneth Graunke <[email protected]>2016-04-20 16:18:47 -0700
commit81407531e0b8d2e6a7f9c39cb44ed6a72dc61e77 (patch)
tree66aa30a4f4d1b97c551020192cf2ef0f44f80a0f /src/intel
parentde0a46a040cf1aa83d5b262064b00bd601c09437 (diff)
i965: Generalize wm_key->compute_sample_id to wm_key->multisample_fbo.
I'm going to need a key entry meaning "we have a multisample FBO, and multisampling is enabled" in an upcoming patch. This is basically wm_key->compute_sample_id, except that it also checks that the SAMPLE_ID system value is read. The only use of wm_key->compute_sample_id is in emit_sampleid_setup(), which is only called when handling the SAMPLE_ID system value. So we can just eliminate the check and generalize the field. v2: Also update the Vulkan driver. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/intel')
-rw-r--r--src/intel/vulkan/anv_pipeline.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 1f4e3fae9cb..ba088b6e852 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -288,7 +288,7 @@ populate_wm_prog_key(const struct brw_device_info *devinfo,
*/
key->persample_shading = info->pMultisampleState->sampleShadingEnable;
key->compute_pos_offset = info->pMultisampleState->sampleShadingEnable;
- key->compute_sample_id = info->pMultisampleState->sampleShadingEnable;
+ key->multisample_fbo = true;
}
}