rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-04-01 09:25:24 +02:00
Code Issues Projects Releases Wiki Activity

[dxvk] Add command list parameter to dispatch-related functions

Browse Source
This commit is contained in:
Philip Rebohle 2024-10-01 14:52:37 +02:00 committed by Philip Rebohle
parent 7d31a7f16f
commit 46f10c8fd5
3 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dxvk/dxvk_cmdlist.h
View File

@ -489,9 +489,10 @@ namespace dxvk {
void cmdBindPipeline( void cmdBindPipeline(
DxvkCmdBuffer cmdBuffer,
VkPipelineBindPoint pipelineBindPoint, VkPipelineBindPoint pipelineBindPoint,
VkPipeline pipeline) { VkPipeline pipeline) {
m_vkd->vkCmdBindPipeline(m_cmd.execBuffer, m_vkd->vkCmdBindPipeline(getCmdBuffer(cmdBuffer),
pipelineBindPoint, pipeline); pipelineBindPoint, pipeline);
} }
@ -627,22 +628,23 @@ namespace dxvk {
void cmdDispatch( void cmdDispatch(
DxvkCmdBuffer cmdBuffer,
uint32_t x, uint32_t x,
uint32_t y, uint32_t y,
uint32_t z) { uint32_t z) {
m_cmd.usedFlags.set(DxvkCmdBuffer::ExecBuffer); m_cmd.usedFlags.set(cmdBuffer);
m_vkd->vkCmdDispatch(m_cmd.execBuffer, x, y, z); m_vkd->vkCmdDispatch(getCmdBuffer(cmdBuffer), x, y, z);
} }
void cmdDispatchIndirect( void cmdDispatchIndirect(
DxvkCmdBuffer cmdBuffer,
VkBuffer buffer, VkBuffer buffer,
VkDeviceSize offset) { VkDeviceSize offset) {
m_cmd.usedFlags.set(DxvkCmdBuffer::ExecBuffer); m_cmd.usedFlags.set(cmdBuffer);
m_vkd->vkCmdDispatchIndirect( m_vkd->vkCmdDispatchIndirect(getCmdBuffer(cmdBuffer), buffer, offset);
m_cmd.execBuffer, buffer, offset);
} }

72
src/dxvk/dxvk_context.cpp
View File

@ -307,19 +307,16 @@ namespace dxvk {
VkExtent3D workgroups = util::computeBlockCount( VkExtent3D workgroups = util::computeBlockCount(
pushArgs.extent, pipeInfo.workgroupSize); pushArgs.extent, pipeInfo.workgroupSize);
m_cmd->cmdBindPipeline( m_cmd->cmdBindPipeline(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_COMPUTE, VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeline);
pipeInfo.pipeline);
m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer, m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeLayout, VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeLayout,
descriptorSet, 0, nullptr); descriptorSet, 0, nullptr);
m_cmd->cmdPushConstants(DxvkCmdBuffer::ExecBuffer, m_cmd->cmdPushConstants(DxvkCmdBuffer::ExecBuffer,
pipeInfo.pipeLayout, VK_SHADER_STAGE_COMPUTE_BIT, pipeInfo.pipeLayout, VK_SHADER_STAGE_COMPUTE_BIT,
0, sizeof(pushArgs), &pushArgs); 0, sizeof(pushArgs), &pushArgs);
m_cmd->cmdDispatch( m_cmd->cmdDispatch(DxvkCmdBuffer::ExecBuffer,
workgroups.width, workgroups.width, workgroups.height, workgroups.depth);
workgroups.height,
workgroups.depth);
m_execBarriers.accessBuffer(bufferSlice, m_execBarriers.accessBuffer(bufferSlice,
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
@ -811,9 +808,8 @@ namespace dxvk {
args.dstOffset = dstOffset; args.dstOffset = dstOffset;
args.dstExtent = dstExtent; args.dstExtent = dstExtent;
m_cmd->cmdBindPipeline( m_cmd->cmdBindPipeline(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_COMPUTE, VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeHandle);
pipeInfo.pipeHandle);
m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer, m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeLayout, VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeLayout,
@ -823,7 +819,7 @@ namespace dxvk {
pipeInfo.pipeLayout, VK_SHADER_STAGE_COMPUTE_BIT, pipeInfo.pipeLayout, VK_SHADER_STAGE_COMPUTE_BIT,
0, sizeof(args), &args); 0, sizeof(args), &args);
m_cmd->cmdDispatch( m_cmd->cmdDispatch(DxvkCmdBuffer::ExecBuffer,
(srcExtent.width + 7) / 8, (srcExtent.width + 7) / 8,
(srcExtent.height + 7) / 8, (srcExtent.height + 7) / 8,
srcSubresource.layerCount); srcSubresource.layerCount);
@ -977,9 +973,8 @@ namespace dxvk {
args.dstSize = { dstSize.width, dstSize.height }; args.dstSize = { dstSize.width, dstSize.height };
args.srcSize = { srcSize.width, srcSize.height }; args.srcSize = { srcSize.width, srcSize.height };
m_cmd->cmdBindPipeline( m_cmd->cmdBindPipeline(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_COMPUTE, VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeHandle);
pipeInfo.pipeHandle);
m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer, m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeLayout, VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeLayout,
@ -989,7 +984,7 @@ namespace dxvk {
pipeInfo.pipeLayout, VK_SHADER_STAGE_COMPUTE_BIT, pipeInfo.pipeLayout, VK_SHADER_STAGE_COMPUTE_BIT,
0, sizeof(args), &args); 0, sizeof(args), &args);
m_cmd->cmdDispatch( m_cmd->cmdDispatch(DxvkCmdBuffer::ExecBuffer,
(extent.width + 7) / 8, (extent.width + 7) / 8,
(extent.height + 7) / 8, (extent.height + 7) / 8,
extent.depth); extent.depth);
@ -1117,9 +1112,8 @@ namespace dxvk {
args.dstOffset = VkOffset2D { 0, 0 }; args.dstOffset = VkOffset2D { 0, 0 };
args.dstExtent = dstExtent; args.dstExtent = dstExtent;
m_cmd->cmdBindPipeline( m_cmd->cmdBindPipeline(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_COMPUTE, VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeHandle);
pipeInfo.pipeHandle);
m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer, m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeLayout, VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeLayout,
@ -1129,7 +1123,7 @@ namespace dxvk {
pipeInfo.pipeLayout, VK_SHADER_STAGE_COMPUTE_BIT, pipeInfo.pipeLayout, VK_SHADER_STAGE_COMPUTE_BIT,
0, sizeof(args), &args); 0, sizeof(args), &args);
m_cmd->cmdDispatch( m_cmd->cmdDispatch(DxvkCmdBuffer::ExecBuffer,
(dstExtent.width + 63) / 64, (dstExtent.width + 63) / 64,
dstExtent.height, dstExtent.height,
dstSubresource.layerCount); dstSubresource.layerCount);
@ -1263,7 +1257,7 @@ namespace dxvk {
m_queryManager.beginQueries(m_cmd, m_queryManager.beginQueries(m_cmd,
VK_QUERY_TYPE_PIPELINE_STATISTICS); VK_QUERY_TYPE_PIPELINE_STATISTICS);
m_cmd->cmdDispatch(x, y, z); m_cmd->cmdDispatch(DxvkCmdBuffer::ExecBuffer, x, y, z);
m_queryManager.endQueries(m_cmd, m_queryManager.endQueries(m_cmd,
VK_QUERY_TYPE_PIPELINE_STATISTICS); VK_QUERY_TYPE_PIPELINE_STATISTICS);
@ -1288,9 +1282,8 @@ namespace dxvk {
m_queryManager.beginQueries(m_cmd, m_queryManager.beginQueries(m_cmd,
VK_QUERY_TYPE_PIPELINE_STATISTICS); VK_QUERY_TYPE_PIPELINE_STATISTICS);
m_cmd->cmdDispatchIndirect( m_cmd->cmdDispatchIndirect(DxvkCmdBuffer::ExecBuffer,
bufferSlice.handle, bufferSlice.handle, bufferSlice.offset);
bufferSlice.offset);
m_queryManager.endQueries(m_cmd, m_queryManager.endQueries(m_cmd,
VK_QUERY_TYPE_PIPELINE_STATISTICS); VK_QUERY_TYPE_PIPELINE_STATISTICS);
@ -1803,7 +1796,8 @@ namespace dxvk {
} }
m_cmd->cmdBeginRendering(&renderingInfo); m_cmd->cmdBeginRendering(&renderingInfo);
m_cmd->cmdBindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeHandle); m_cmd->cmdBindPipeline(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeHandle);
m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer, m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeLayout, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeLayout,
descriptorWrite.dstSet, 0, nullptr); descriptorWrite.dstSet, 0, nullptr);
@ -3178,7 +3172,8 @@ namespace dxvk {
dstView->info().viewType, dstView->info().format, dstView->info().viewType, dstView->info().format,
dstView->image()->info().sampleCount); dstView->image()->info().sampleCount);
m_cmd->cmdBindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeHandle); m_cmd->cmdBindPipeline(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeHandle);
// Set up viewport // Set up viewport
VkViewport viewport; VkViewport viewport;
@ -3660,19 +3655,16 @@ namespace dxvk {
else if (imageView->type() == VK_IMAGE_VIEW_TYPE_2D_ARRAY) else if (imageView->type() == VK_IMAGE_VIEW_TYPE_2D_ARRAY)
workgroups.depth = imageView->subresources().layerCount; workgroups.depth = imageView->subresources().layerCount;
m_cmd->cmdBindPipeline( m_cmd->cmdBindPipeline(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_COMPUTE, VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeline);
pipeInfo.pipeline);
m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer, m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeLayout, VK_PIPELINE_BIND_POINT_COMPUTE, pipeInfo.pipeLayout,
descriptorSet, 0, nullptr); descriptorSet, 0, nullptr);
m_cmd->cmdPushConstants(DxvkCmdBuffer::ExecBuffer, m_cmd->cmdPushConstants(DxvkCmdBuffer::ExecBuffer,
pipeInfo.pipeLayout, VK_SHADER_STAGE_COMPUTE_BIT, pipeInfo.pipeLayout, VK_SHADER_STAGE_COMPUTE_BIT,
0, sizeof(pushArgs), &pushArgs); 0, sizeof(pushArgs), &pushArgs);
m_cmd->cmdDispatch( m_cmd->cmdDispatch(DxvkCmdBuffer::ExecBuffer,
workgroups.width, workgroups.width, workgroups.height, workgroups.depth);
workgroups.height,
workgroups.depth);
m_execBarriers.accessImage( m_execBarriers.accessImage(
imageView->image(), imageView->image(),
@ -3966,7 +3958,8 @@ namespace dxvk {
// Perform the actual copy operation // Perform the actual copy operation
m_cmd->cmdBeginRendering(&renderingInfo); m_cmd->cmdBeginRendering(&renderingInfo);
m_cmd->cmdBindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeHandle); m_cmd->cmdBindPipeline(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeHandle);
m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer, m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeLayout, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeLayout,
descriptorSet, 0, nullptr); descriptorSet, 0, nullptr);
@ -4633,7 +4626,8 @@ namespace dxvk {
region.srcOffset.y - region.dstOffset.y }; region.srcOffset.y - region.dstOffset.y };
m_cmd->cmdBeginRendering(&renderingInfo); m_cmd->cmdBeginRendering(&renderingInfo);
m_cmd->cmdBindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeHandle); m_cmd->cmdBindPipeline(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeHandle);
m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer, m_cmd->cmdBindDescriptorSet(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeLayout, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeInfo.pipeLayout,
descriptorSet, 0, nullptr); descriptorSet, 0, nullptr);
@ -5110,9 +5104,8 @@ namespace dxvk {
if (unlikely(!pipelineHandle)) if (unlikely(!pipelineHandle))
return false; return false;
m_cmd->cmdBindPipeline( m_cmd->cmdBindPipeline(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_COMPUTE, VK_PIPELINE_BIND_POINT_COMPUTE, pipelineHandle);
pipelineHandle);
// Mark compute resources and push constants as dirty // Mark compute resources and push constants as dirty
m_descriptorState.dirtyStages(VK_SHADER_STAGE_COMPUTE_BIT); m_descriptorState.dirtyStages(VK_SHADER_STAGE_COMPUTE_BIT);
@ -5227,9 +5220,8 @@ namespace dxvk {
if (unlikely(!pipelineInfo.first)) if (unlikely(!pipelineInfo.first))
return false; return false;
m_cmd->cmdBindPipeline( m_cmd->cmdBindPipeline(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_GRAPHICS, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineInfo.first);
pipelineInfo.first);
// For pipelines created from graphics pipeline libraries, we need to // For pipelines created from graphics pipeline libraries, we need to
// apply a bunch of dynamic state that is otherwise static or unused // apply a bunch of dynamic state that is otherwise static or unused

3
src/dxvk/dxvk_swapchain_blitter.cpp
View File

@ -121,7 +121,8 @@ namespace dxvk {
ctx.cmd->cmdSetViewport(1, &viewport); ctx.cmd->cmdSetViewport(1, &viewport);
ctx.cmd->cmdSetScissor(1, &dstRect); ctx.cmd->cmdSetScissor(1, &dstRect);
ctx.cmd->cmdBindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline); ctx.cmd->cmdBindPipeline(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
VkDescriptorSet set = ctx.descriptorPool->alloc(m_setLayout); VkDescriptorSet set = ctx.descriptorPool->alloc(m_setLayout);