summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-11-05 13:18:57 +1000
committerDylan Baker <dylan.c.baker@intel.com>2020-11-13 10:05:37 -0800
commitbc3e92a1df137710f7d258d534a478f38533e428 (patch)
treea85d02856ae1ccc7c3052bc781a710b9df4ad75c
parent0e4e0a0d09adc4e31cde547c17b97227aa9997da (diff)
lavapipe: disable SNORM blending for now
dEQP-VK.pipeline.blend.dual_source.format.r16g16b16a16_snorm.states.color_1msc_1ms1a_add_alpha_1mdc_1msa_sub-color_dc_1ms1c_rsub_alpha_z_1mdc_sub-color_ca_1ms1c_min_alpha_sas_ca_rsub-color_1ms1c_s1c_add_alpha_z_1mda_add,Fail dEQP-VK.pipeline.blend.dual_source.format.r8g8_snorm.states.color_z_sc_add_alpha_1ms1c_sa_min-color_dc_1mca_add_alpha_z_1mca_max-color_1ms1c_sa_max_alpha_1mcc_sc_sub-color_s1c_1mda_add_alpha_s1c_1mda_add,Fail dEQP-VK.pipeline.blend.dual_source.format.r8g8b8a8_snorm.states.color_1msc_1ms1a_add_alpha_1mdc_1msa_sub-color_dc_1ms1c_rsub_alpha_z_1mdc_sub-color_ca_1ms1c_min_alpha_sas_ca_rsub-color_1ms1c_s1c_add_alpha_z_1mda_add,Fail dEQP-VK.pipeline.blend.dual_source.format.r8g8b8a8_snorm.states.color_z_sc_add_alpha_1ms1c_sa_min-color_dc_1mca_add_alpha_z_1mca_max-color_1ms1c_sa_max_alpha_1mcc_sc_sub-color_s1c_1mda_add_alpha_s1c_1mda_add,Fail dEQP-VK.pipeline.blend.format.r16g16b16a16_snorm.states.color_ca_1mca_rsub_alpha_1mda_z_sub-color_sc_sc_add_alpha_1mca_sa_max-color_sa_1msa_min_alpha_1msc_sa_sub-color_dc_sc_add_alpha_1mdc_1mca_add,Fail dEQP-VK.pipeline.blend.format.r8g8b8a8_snorm.states.color_ca_1mca_rsub_alpha_1mda_z_sub-color_sc_sc_add_alpha_1mca_sa_max-color_sa_1msa_min_alpha_1msc_sa_sub-color_dc_sc_add_alpha_1mdc_1mca_add,Fail All fail due to the 1 - mdc or 1 - mca alpha channel in the last quadrant. Cc: 20.3 <mesa-stable> Reviewed-by: Roland Scheidegger <sroland@vmware.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7499> (cherry picked from commit 01c4bac36e767dc96aef87fa7445a34c7c8f9132)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/frontends/lavapipe/lvp_formats.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index aa41ec4ff98..c087cb240b1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -958,7 +958,7 @@
"description": "lavapipe: disable SNORM blending for now",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": null
},
diff --git a/src/gallium/frontends/lavapipe/lvp_formats.c b/src/gallium/frontends/lavapipe/lvp_formats.c
index b5123306e8b..be5da7c1f00 100644
--- a/src/gallium/frontends/lavapipe/lvp_formats.c
+++ b/src/gallium/frontends/lavapipe/lvp_formats.c
@@ -208,7 +208,9 @@ lvp_physical_device_get_format_properties(struct lvp_physical_device *physical_d
if (physical_device->pscreen->is_format_supported(physical_device->pscreen, pformat,
PIPE_TEXTURE_2D, 0, 0, PIPE_BIND_RENDER_TARGET)) {
features |= VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT;
- features |= VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT;
+ /* SNORM blending on llvmpipe fails CTS - disable for now */
+ if (!util_format_is_snorm(pformat))
+ features |= VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT;
features |= VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT;
}