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

[dxvk] Clean up misc. code

Browse Source
This commit is contained in:
Philip Rebohle 2022-07-18 14:51:26 +02:00
parent 37f31ae1e7
commit a1ace8ef21
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dxvk/dxvk_barrier.cpp
View File

@ -104,9 +104,7 @@ namespace dxvk {
if (access.test(DxvkAccess::Write)) if (access.test(DxvkAccess::Write))
m_dstAccess |= dstAccess; m_dstAccess |= dstAccess;
} else { } else {
VkImageMemoryBarrier barrier; VkImageMemoryBarrier barrier = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER };
barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
barrier.pNext = nullptr;
barrier.srcAccessMask = srcAccess & AccessWriteMask; barrier.srcAccessMask = srcAccess & AccessWriteMask;
barrier.dstAccessMask = dstAccess; barrier.dstAccessMask = dstAccess;
barrier.oldLayout = srcLayout; barrier.oldLayout = srcLayout;
@ -138,9 +136,7 @@ namespace dxvk {
release.m_srcStages |= srcStages; release.m_srcStages |= srcStages;
acquire.m_dstStages |= dstStages; acquire.m_dstStages |= dstStages;
VkBufferMemoryBarrier barrier; VkBufferMemoryBarrier barrier = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER };
barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
barrier.pNext = nullptr;
barrier.srcAccessMask = srcAccess & AccessWriteMask; barrier.srcAccessMask = srcAccess & AccessWriteMask;
barrier.dstAccessMask = 0; barrier.dstAccessMask = 0;
barrier.srcQueueFamilyIndex = srcQueue; barrier.srcQueueFamilyIndex = srcQueue;
@ -248,9 +244,7 @@ namespace dxvk {
if (!srcFlags) srcFlags = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; if (!srcFlags) srcFlags = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
if (!dstFlags) dstFlags = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT; if (!dstFlags) dstFlags = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
VkMemoryBarrier memBarrier; VkMemoryBarrier memBarrier = { VK_STRUCTURE_TYPE_MEMORY_BARRIER };
memBarrier.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
memBarrier.pNext = nullptr;
memBarrier.srcAccessMask = m_srcAccess; memBarrier.srcAccessMask = m_srcAccess;
memBarrier.dstAccessMask = m_dstAccess; memBarrier.dstAccessMask = m_dstAccess;

22
src/dxvk/dxvk_context.cpp
View File

@ -23,11 +23,7 @@ namespace dxvk {
m_state.om.framebufferInfo = makeFramebufferInfo(m_state.om.renderTargets); m_state.om.framebufferInfo = makeFramebufferInfo(m_state.om.renderTargets);
for (uint32_t i = 0; i < MaxNumActiveBindings; i++) { for (uint32_t i = 0; i < MaxNumActiveBindings; i++) {
m_descriptorWrites[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; m_descriptorWrites[i] = { VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET };
m_descriptorWrites[i].pNext = nullptr;
m_descriptorWrites[i].dstSet = VK_NULL_HANDLE;
m_descriptorWrites[i].dstBinding = 0;
m_descriptorWrites[i].dstArrayElement = 0;
m_descriptorWrites[i].descriptorCount = 1; m_descriptorWrites[i].descriptorCount = 1;
m_descriptorWrites[i].descriptorType = VK_DESCRIPTOR_TYPE_MAX_ENUM; m_descriptorWrites[i].descriptorType = VK_DESCRIPTOR_TYPE_MAX_ENUM;
m_descriptorWrites[i].pImageInfo = &m_descriptors[i].image; m_descriptorWrites[i].pImageInfo = &m_descriptors[i].image;
@ -326,16 +322,12 @@ namespace dxvk {
VkDescriptorSet descriptorSet = m_descriptorPool->alloc(pipeInfo.dsetLayout); VkDescriptorSet descriptorSet = m_descriptorPool->alloc(pipeInfo.dsetLayout);
VkWriteDescriptorSet descriptorWrite; VkWriteDescriptorSet descriptorWrite = { VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET };
descriptorWrite.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
descriptorWrite.pNext = nullptr;
descriptorWrite.dstSet = descriptorSet; descriptorWrite.dstSet = descriptorSet;
descriptorWrite.dstBinding = 0; descriptorWrite.dstBinding = 0;
descriptorWrite.dstArrayElement = 0; descriptorWrite.dstArrayElement = 0;
descriptorWrite.descriptorCount = 1; descriptorWrite.descriptorCount = 1;
descriptorWrite.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; descriptorWrite.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
descriptorWrite.pImageInfo = nullptr;
descriptorWrite.pBufferInfo = nullptr;
descriptorWrite.pTexelBufferView = &viewObject; descriptorWrite.pTexelBufferView = &viewObject;
m_cmd->updateDescriptorSets(1, &descriptorWrite); m_cmd->updateDescriptorSets(1, &descriptorWrite);
@ -3163,17 +3155,13 @@ namespace dxvk {
viewInfo.imageView = imageView->handle(); viewInfo.imageView = imageView->handle();
viewInfo.imageLayout = imageView->imageInfo().layout; viewInfo.imageLayout = imageView->imageInfo().layout;
VkWriteDescriptorSet descriptorWrite; VkWriteDescriptorSet descriptorWrite = { VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET };
descriptorWrite.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
descriptorWrite.pNext = nullptr;
descriptorWrite.dstSet = descriptorSet; descriptorWrite.dstSet = descriptorSet;
descriptorWrite.dstBinding = 0; descriptorWrite.dstBinding = 0;
descriptorWrite.dstArrayElement = 0; descriptorWrite.dstArrayElement = 0;
descriptorWrite.descriptorCount = 1; descriptorWrite.descriptorCount = 1;
descriptorWrite.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; descriptorWrite.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
descriptorWrite.pImageInfo = &viewInfo; descriptorWrite.pImageInfo = &viewInfo;
descriptorWrite.pBufferInfo = nullptr;
descriptorWrite.pTexelBufferView = nullptr;
m_cmd->updateDescriptorSets(1, &descriptorWrite); m_cmd->updateDescriptorSets(1, &descriptorWrite);
// Prepare shader arguments // Prepare shader arguments
@ -5681,9 +5669,7 @@ namespace dxvk {
VkAccessFlags srcAccess, VkAccessFlags srcAccess,
VkPipelineStageFlags dstStages, VkPipelineStageFlags dstStages,
VkAccessFlags dstAccess) { VkAccessFlags dstAccess) {
VkMemoryBarrier barrier; VkMemoryBarrier barrier = { VK_STRUCTURE_TYPE_MEMORY_BARRIER };
barrier.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
barrier.pNext = nullptr;
barrier.srcAccessMask = srcAccess; barrier.srcAccessMask = srcAccess;
barrier.dstAccessMask = dstAccess; barrier.dstAccessMask = dstAccess;

10
src/dxvk/dxvk_image.cpp
View File

@ -41,13 +41,11 @@ namespace dxvk {
m_shared = canShareImage(info, createInfo.sharing); m_shared = canShareImage(info, createInfo.sharing);
VkExternalMemoryImageCreateInfo externalInfo; VkExternalMemoryImageCreateInfo externalInfo = { VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO };
if (m_shared) {
externalInfo.sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO;
externalInfo.pNext = nullptr;
externalInfo.handleTypes = createInfo.sharing.type;
formatList.pNext = &externalInfo; if (m_shared) {
externalInfo.pNext = std::exchange(info.pNext, &externalInfo);
externalInfo.handleTypes = createInfo.sharing.type;
} }
if (m_vkd->vkCreateImage(m_vkd->device(), if (m_vkd->vkCreateImage(m_vkd->device(),