Mesa (main): radv: Add named constants for max framebuffer width/height.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Dec 5 17:56:09 UTC 2021
Module: Mesa
Branch: main
Commit: 6968c87e97b1b484f33f628643f516ce2df48556
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6968c87e97b1b484f33f628643f516ce2df48556
Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date: Sun Nov 21 02:01:46 2021 +0100
radv: Add named constants for max framebuffer width/height.
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13721>
---
src/amd/vulkan/radv_constants.h | 2 ++
src/amd/vulkan/radv_device.c | 4 ++--
src/amd/vulkan/si_cmd_buffer.c | 10 ++++++----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/amd/vulkan/radv_constants.h b/src/amd/vulkan/radv_constants.h
index c3f057d8ff6..0fdb628ed3d 100644
--- a/src/amd/vulkan/radv_constants.h
+++ b/src/amd/vulkan/radv_constants.h
@@ -55,6 +55,8 @@
#define NUM_DEPTH_CLEAR_PIPELINES 2
#define NUM_DEPTH_DECOMPRESS_PIPELINES 3
+#define MAX_FRAMEBUFFER_WIDTH (1u << 14)
+#define MAX_FRAMEBUFFER_HEIGHT (1u << 14)
/*
* This is the point we switch from using CP to compute shader
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 7f4604c2baf..59898ee656a 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -1771,8 +1771,8 @@ radv_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,
.minInterpolationOffset = -2,
.maxInterpolationOffset = 2,
.subPixelInterpolationOffsetBits = 8,
- .maxFramebufferWidth = (1 << 14),
- .maxFramebufferHeight = (1 << 14),
+ .maxFramebufferWidth = MAX_FRAMEBUFFER_WIDTH,
+ .maxFramebufferHeight = MAX_FRAMEBUFFER_HEIGHT,
.maxFramebufferLayers = (1 << 10),
.framebufferColorSampleCounts = sample_counts,
.framebufferDepthSampleCounts = sample_counts,
diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c
index 567d857eaae..f801d9171ac 100644
--- a/src/amd/vulkan/si_cmd_buffer.c
+++ b/src/amd/vulkan/si_cmd_buffer.c
@@ -234,11 +234,13 @@ si_emit_graphics(struct radv_device *device, struct radeon_cmdbuf *cs)
S_028204_WINDOW_OFFSET_DISABLE(1));
radeon_set_context_reg(cs, R_028240_PA_SC_GENERIC_SCISSOR_TL,
S_028240_WINDOW_OFFSET_DISABLE(1));
- radeon_set_context_reg(cs, R_028244_PA_SC_GENERIC_SCISSOR_BR,
- S_028244_BR_X(16384) | S_028244_BR_Y(16384));
+ radeon_set_context_reg(
+ cs, R_028244_PA_SC_GENERIC_SCISSOR_BR,
+ S_028244_BR_X(MAX_FRAMEBUFFER_WIDTH) | S_028244_BR_Y(MAX_FRAMEBUFFER_HEIGHT));
radeon_set_context_reg(cs, R_028030_PA_SC_SCREEN_SCISSOR_TL, 0);
- radeon_set_context_reg(cs, R_028034_PA_SC_SCREEN_SCISSOR_BR,
- S_028034_BR_X(16384) | S_028034_BR_Y(16384));
+ radeon_set_context_reg(
+ cs, R_028034_PA_SC_SCREEN_SCISSOR_BR,
+ S_028034_BR_X(MAX_FRAMEBUFFER_WIDTH) | S_028034_BR_Y(MAX_FRAMEBUFFER_HEIGHT));
}
if (!has_clear_state) {
More information about the mesa-commit
mailing list