Mesa (main): zink: move alphaToOne warning to a dynamic warning
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Aug 31 19:44:17 UTC 2021
Module: Mesa
Branch: main
Commit: 25fe7971042358c6e317813b9533e3f78b36cc56
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=25fe7971042358c6e317813b9533e3f78b36cc56
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Tue Aug 31 12:23:10 2021 -0400
zink: move alphaToOne warning to a dynamic warning
stop spamming these if they aren't even being used
Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12647>
---
src/gallium/drivers/zink/zink_pipeline.c | 2 ++
src/gallium/drivers/zink/zink_screen.c | 2 --
src/gallium/drivers/zink/zink_screen.h | 12 ++++++++++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/zink/zink_pipeline.c b/src/gallium/drivers/zink/zink_pipeline.c
index 9b41198f71c..58ff40bd6e2 100644
--- a/src/gallium/drivers/zink/zink_pipeline.c
+++ b/src/gallium/drivers/zink/zink_pipeline.c
@@ -117,6 +117,8 @@ zink_create_gfx_pipeline(struct zink_screen *screen,
ms_state.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
ms_state.rasterizationSamples = state->rast_samples + 1;
ms_state.alphaToCoverageEnable = state->blend_state->alpha_to_coverage;
+ if (state->blend_state->alpha_to_one && !screen->info.feats.features.alphaToOne)
+ warn_missing_feature("alphaToOne");
ms_state.alphaToOneEnable = state->blend_state->alpha_to_one;
ms_state.pSampleMask = state->sample_mask ? &state->sample_mask : NULL;
if (hw_rast_state->force_persample_interp) {
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 915673aff1e..b9df400fc15 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1705,7 +1705,6 @@ check_base_requirements(struct zink_screen *screen)
!screen->info.feats.features.fillModeNonSolid ||
!screen->info.feats.features.wideLines ||
!screen->info.feats.features.largePoints ||
- !screen->info.feats.features.alphaToOne ||
!screen->info.feats.features.shaderClipDistance ||
!(screen->info.feats12.scalarBlockLayout ||
screen->info.have_EXT_scalar_block_layout) ||
@@ -1722,7 +1721,6 @@ check_base_requirements(struct zink_screen *screen)
CHECK_OR_PRINT(feats.features.fillModeNonSolid);
CHECK_OR_PRINT(feats.features.wideLines);
CHECK_OR_PRINT(feats.features.largePoints);
- CHECK_OR_PRINT(feats.features.alphaToOne);
CHECK_OR_PRINT(feats.features.shaderClipDistance);
if (!screen->info.feats12.scalarBlockLayout && !screen->info.have_EXT_scalar_block_layout)
printf("scalarBlockLayout OR EXT_scalar_block_layout ");
diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h
index 4f7a22094f4..dff16008f70 100644
--- a/src/gallium/drivers/zink/zink_screen.h
+++ b/src/gallium/drivers/zink/zink_screen.h
@@ -266,4 +266,16 @@ zink_screen_init_descriptor_funcs(struct zink_screen *screen, bool fallback);
void
zink_stub_function_not_loaded(void);
+
+#define warn_missing_feature(feat) \
+ do { \
+ static bool warned = false; \
+ if (!warned) { \
+ fprintf(stderr, "WARNING: Incorrect rendering will happen, " \
+ "because the Vulkan device doesn't support " \
+ "the %s feature\n", feat); \
+ warned = true; \
+ } \
+ } while (0)
+
#endif
More information about the mesa-commit
mailing list