AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvk: Add support for VK_EXT_depth_clamp_control

Browse Source 
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31411>
This commit is contained in:
Jules Blok
2024-07-22 13:21:07 +02:00
committed by Marge Bot
parent 4994c5a243
commit 6e39d56252
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/vulkan/nvk_cmd_draw.c
+11 -4
View File
@@ -1614,7 +1614,8 @@ nvk_flush_vp_state(struct nvk_cmd_buffer *cmd)
/* Nothing to do for MESA_VK_DYNAMIC_VP_VIEWPORT_COUNT */
if (BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_VP_VIEWPORTS) ||
BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_VP_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE)) {
BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_VP_DEPTH_CLIP_NEGATIVE_ONE_TO_ONE) ||
BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_VP_DEPTH_CLAMP_RANGE)) {
for (uint32_t i = 0; i < dyn->vp.viewport_count; i++) {
const VkViewport *vp = &dyn->vp.viewports[i];
@@ -1642,13 +1643,19 @@ nvk_flush_vp_state(struct nvk_cmd_buffer *cmd)
P_NV9097_SET_VIEWPORT_OFFSET_Y(p, i, fui(o_y));
P_NV9097_SET_VIEWPORT_OFFSET_Z(p, i, fui(o_z));
const bool user_defined_range =
dyn->vp.depth_clamp_mode == VK_DEPTH_CLAMP_MODE_USER_DEFINED_RANGE_EXT;
float xmin = vp->x;
float xmax = vp->x + vp->width;
float ymin = MIN2(vp->y, vp->y + vp->height);
float ymax = MAX2(vp->y, vp->y + vp->height);
float zmin = MIN2(vp->minDepth, vp->maxDepth);
float zmax = MAX2(vp->minDepth, vp->maxDepth);
assert(xmin <= xmax && ymin <= ymax);
float zmin = user_defined_range ?
dyn->vp.depth_clamp_range.minDepthClamp :
MIN2(vp->minDepth, vp->maxDepth);
float zmax = user_defined_range ?
dyn->vp.depth_clamp_range.maxDepthClamp :
MAX2(vp->minDepth, vp->maxDepth);
assert(xmin <= xmax && ymin <= ymax && zmin <= zmax);
const float max_dim = (float)0xffff;
xmin = CLAMP(xmin, 0, max_dim);
src/nouveau/vulkan/nvk_physical_device.c
+4
View File
@@ -187,6 +187,7 @@ nvk_get_device_extensions(const struct nvk_instance *instance,
.EXT_color_write_enable = true,
.EXT_custom_border_color = true,
.EXT_depth_bias_control = true,
.EXT_depth_clamp_control = true,
.EXT_depth_clip_control = true,
.EXT_depth_clip_enable = true,
.EXT_depth_range_unrestricted = info->cls_eng3d >= VOLTA_A,
@@ -506,6 +507,9 @@ nvk_get_device_features(const struct nv_device_info *info,
.floatRepresentation = false,
.depthBiasExact = true,
/* VK_EXT_depth_clamp_control */
.depthClampControl = true,
/* VK_EXT_depth_clip_control */
.depthClipControl = true,