From c9f0ec90fc8095e143dcc3f1652038233678ef6a Mon Sep 17 00:00:00 2001 From: "Thomas H.P. Andersen" Date: Wed, 7 Sep 2022 23:01:40 +0200 Subject: [PATCH] nvk: delete commented code nvk_CmdClearColorImage first lived in nvk_cmd_copy, then moved to nvk_cmd_meta, and finally in nvk_cmd_clear I seems that this was left behind in one of the moves Part-of: --- src/nouveau/vulkan/nvk_cmd_copy.c | 120 ------------------------------ 1 file changed, 120 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_copy.c b/src/nouveau/vulkan/nvk_cmd_copy.c index f78b030b287..7460944c489 100644 --- a/src/nouveau/vulkan/nvk_cmd_copy.c +++ b/src/nouveau/vulkan/nvk_cmd_copy.c @@ -527,126 +527,6 @@ nvk_CmdCopyImage2(VkCommandBuffer commandBuffer, } } -#if 0 -VKAPI_ATTR void VKAPI_CALL -nvk_CmdClearColorImage(VkCommandBuffer commandBuffer, - VkImage image, - VkImageLayout imageLayout, - const VkClearColorValue *pColor, - uint32_t rangeCount, - const VkImageSubresourceRange *pRanges) -{ - VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer); - VK_FROM_HANDLE(nvk_image, dst, image); - struct nouveau_ws_push *p = cmd->push; - - P_IMMD(p, NV902D, SET_OPERATION, V_SRCCOPY); - - P_IMMD(p, NV902D, SET_CLIP_ENABLE, V_FALSE); - P_IMMD(p, NV902D, SET_COLOR_KEY_ENABLE, V_FALSE); - P_IMMD(p, NV902D, SET_RENDER_ENABLE_C, MODE_TRUE); - - uint32_t packed_color[4] = { }; - util_format_pack_rgba(vk_format_to_pipe_format(dst->vk.format), - packed_color, pColor, 1); - - switch (vk_format_get_blocksize(dst->vk.format)) { - case 1: - P_IMMD(p, NV902D, SET_DST_FORMAT, V_Y8); - P_IMMD(p, NV902D, SET_RENDER_SOLID_PRIM_COLOR_FORMAT, V_Y8); - break; - case 2: - P_IMMD(p, NV902D, SET_DST_FORMAT, V_Y16); - P_IMMD(p, NV902D, SET_RENDER_SOLID_PRIM_COLOR_FORMAT, V_Y16); - break; - case 4: - P_IMMD(p, NV902D, SET_DST_FORMAT, V_A8B8G8R8); - P_IMMD(p, NV902D, SET_RENDER_SOLID_PRIM_COLOR_FORMAT, V_A8B8G8R8); - break; - case 8: - P_IMMD(p, NV902D, SET_DST_FORMAT, V_RF16_GF16_BF16_AF16); - P_IMMD(p, NV902D, SET_RENDER_SOLID_PRIM_COLOR_FORMAT, V_RF16_GF16_BF16_AF16); - break; - case 16: - P_IMMD(p, NV902D, SET_DST_FORMAT, V_RF32_GF32_BF32_AF32); - P_IMMD(p, NV902D, SET_RENDER_SOLID_PRIM_COLOR_FORMAT, V_RF32_GF32_BF32_AF32); - break; - default: - unreachable("TODO: More formats in CmdClearColorImage"); - } - - P_MTHD(p, NV902D, SET_RENDER_SOLID_PRIM_COLOR0); - P_NV902D_SET_RENDER_SOLID_PRIM_COLOR0(p, packed_color[0]); - P_NV902D_SET_RENDER_SOLID_PRIM_COLOR1(p, packed_color[1]); - P_NV902D_SET_RENDER_SOLID_PRIM_COLOR2(p, packed_color[2]); - P_NV902D_SET_RENDER_SOLID_PRIM_COLOR3(p, packed_color[3]); - - P_IMMD(p, NV902D, RENDER_SOLID_PRIM_MODE, V_RECTS); - - for (uint32_t r = 0; r < rangeCount; r++) { - const uint32_t layer_count = - vk_image_subresource_layer_count(&dst->vk, &pRanges[r]); - const uint32_t level_count = - vk_image_subresource_level_count(&dst->vk, &pRanges[r]); - - for (uint32_t w = 0; w < layer_count; w++) { - const uint32_t layer = w + pRanges[r].baseArrayLayer; - - for (uint32_t l = 0; l < level_count; l++) { - const uint32_t level = l + pRanges[r].baseMipLevel; - - const struct nil_image_level *dst_level = &dst->nil.levels[level]; - const VkDeviceSize dst_addr = nvk_image_base_address(dst) + - layer * dst->nil.array_stride_B + - dst_level->offset_B; - - P_MTHD(p, NV902D, SET_DST_OFFSET_UPPER); - P_NV902D_SET_DST_OFFSET_UPPER(p, dst_addr >> 32); - P_NV902D_SET_DST_OFFSET_LOWER(p, dst_addr & 0xffffffff); - - if (dst_level->tiling.is_tiled) { - P_MTHD(p, NV902D, SET_DST_MEMORY_LAYOUT); - P_NV902D_SET_DST_MEMORY_LAYOUT(p, V_BLOCKLINEAR); - P_NV902D_SET_DST_BLOCK_SIZE(p, { - .height = dst_level->tiling.y_log2, - .depth = dst_level->tiling.z_log2, - }); - } else { - P_IMMD(p, NV902D, SET_DST_MEMORY_LAYOUT, V_PITCH); - } - - const VkExtent3D dst_level_extent = - vk_image_mip_level_extent(&dst->vk, level); - - P_MTHD(p, NV902D, SET_DST_DEPTH); - P_NV902D_SET_DST_DEPTH(p, dst_level_extent.depth); - - P_MTHD(p, NV902D, SET_DST_PITCH); - P_NV902D_SET_DST_PITCH(p, dst_level->row_stride_B); - P_NV902D_SET_DST_WIDTH(p, dst_level_extent.width); - P_NV902D_SET_DST_HEIGHT(p, dst_level_extent.height); - - for (uint32_t z = 0; z < dst_level_extent.depth; z++) { - P_MTHD(p, NV902D, SET_DST_LAYER); - P_NV902D_SET_DST_LAYER(p, z); - - const uint32_t x0 = 0; - const uint32_t y0 = 0; - const uint32_t x1 = dst_level_extent.width + 1; - const uint32_t y1 = dst_level_extent.height + 1; - - P_MTHD(p, NV902D, RENDER_SOLID_PRIM_POINT_SET_X(0)); - P_NV902D_RENDER_SOLID_PRIM_POINT_SET_X(p, 0, x0); - P_NV902D_RENDER_SOLID_PRIM_POINT_Y(p, 0, y0); - P_NV902D_RENDER_SOLID_PRIM_POINT_SET_X(p, 1, x1); - P_NV902D_RENDER_SOLID_PRIM_POINT_Y(p, 1, y1); - } - } - } - } -} -#endif - VKAPI_ATTR void VKAPI_CALL nvk_CmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer,