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

nvk: Manually offset array and Z slices in BeginRendering

Browse Source 
We can't trust the hardware above about 4095 so we're better off just
offsetting manually now that we have the code to do so.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10655
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28103>
This commit is contained in:
Faith Ekstrand
2024-03-11 09:40:11 -05:00
committed by Marge Bot
parent 81db82bd8c
commit edd3379c09
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/ci/zink-nvk-fails.txt
-1
View File
@@ -21,7 +21,6 @@ dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_two
dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_two_samples.multisample_texture_8,Fail
dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bits_unique_per_two_samples.multisample_texture_4,Fail
dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bits_unique_per_two_samples.multisample_texture_8,Fail
KHR-GL46.direct_state_access.framebuffers_texture_layer_attachment,Fail
glx@glx-multi-window-single-context,Fail
glx@glx-visuals-depth,Crash
src/gallium/drivers/zink/ci/zink-nvk-skips.txt
-1
View File
@@ -1 +0,0 @@
KHR-GL46.direct_state_access.framebuffers_texture_layer_attachment
src/nouveau/vulkan/nvk_cmd_draw.c
+11 -3
View File
@@ -683,6 +683,15 @@ nvk_CmdBeginRendering(VkCommandBuffer commandBuffer,
uint64_t addr = nvk_image_base_address(image, ip) + level->offset_B;
if (nil_image->dim == NIL_IMAGE_DIM_3D) {
addr += nil_image_level_z_offset_B(nil_image,
iview->vk.base_mip_level,
iview->vk.base_array_layer);
} else {
addr += iview->vk.base_array_layer *
(uint64_t)nil_image->array_stride_B;
}
P_MTHD(p, NV9097, SET_COLOR_TARGET_A(i));
P_NV9097_SET_COLOR_TARGET_A(p, i, addr >> 32);
P_NV9097_SET_COLOR_TARGET_B(p, i, addr);
@@ -712,11 +721,10 @@ nvk_CmdBeginRendering(VkCommandBuffer commandBuffer,
THIRD_DIMENSION_CONTROL_THIRD_DIMENSION_DEFINES_ARRAY_SIZE,
});
P_NV9097_SET_COLOR_TARGET_THIRD_DIMENSION(p, i,
iview->vk.base_array_layer + layer_count);
P_NV9097_SET_COLOR_TARGET_THIRD_DIMENSION(p, i, layer_count);
P_NV9097_SET_COLOR_TARGET_ARRAY_PITCH(p, i,
nil_image->array_stride_B >> 2);
P_NV9097_SET_COLOR_TARGET_LAYER(p, i, iview->vk.base_array_layer);
P_NV9097_SET_COLOR_TARGET_LAYER(p, i, 0);
} else {
/* NVIDIA can only render to 2D linear images */
assert(nil_image->dim == NIL_IMAGE_DIM_2D);