mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21 from libcg/stadium2 

[dxvk] fix missing renderPassEnd calls
This commit is contained in:
Philip Rebohle 2018-01-21 09:03:50 +01:00 committed by GitHub
parent 952ac5d5f9 f88a1d5dce
commit 45108a8724
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 74 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dxvk/dxvk_context.cpp
View File

@ -259,7 +259,9 @@ namespace dxvk {
const Rc<DxvkBuffer>& srcBuffer, const Rc<DxvkBuffer>& srcBuffer,
VkDeviceSize srcOffset, VkDeviceSize srcOffset,
VkDeviceSize numBytes) { VkDeviceSize numBytes) {
if (numBytes != 0) { if (numBytes == 0)
return;
this->renderPassEnd(); this->renderPassEnd();
auto dstSlice = dstBuffer->subSlice(dstOffset, numBytes); auto dstSlice = dstBuffer->subSlice(dstOffset, numBytes);
@ -292,7 +294,6 @@ namespace dxvk {
m_cmd->trackResource(dstBuffer->resource()); m_cmd->trackResource(dstBuffer->resource());
m_cmd->trackResource(srcBuffer->resource()); m_cmd->trackResource(srcBuffer->resource());
} }
}
void DxvkContext::copyBufferToImage( void DxvkContext::copyBufferToImage(
@ -616,6 +617,8 @@ namespace dxvk {
if (subresources.levelCount <= 1) if (subresources.levelCount <= 1)
return; return;
this->renderPassEnd();
// The top-most level will only be read. We can // The top-most level will only be read. We can
// discard the contents of all the lower levels // discard the contents of all the lower levels
// since we're going to override them anyway. // since we're going to override them anyway.
@ -757,6 +760,8 @@ namespace dxvk {
const VkImageSubresourceLayers& dstSubresources, const VkImageSubresourceLayers& dstSubresources,
const Rc<DxvkImage>& srcImage, const Rc<DxvkImage>& srcImage,
const VkImageSubresourceLayers& srcSubresources) { const VkImageSubresourceLayers& srcSubresources) {
this->renderPassEnd();
VkImageSubresourceRange dstSubresourceRange = { VkImageSubresourceRange dstSubresourceRange = {
dstSubresources.aspectMask, dstSubresources.aspectMask,
dstSubresources.mipLevel, 1, dstSubresources.mipLevel, 1,
@ -828,9 +833,11 @@ namespace dxvk {
VkDeviceSize offset, VkDeviceSize offset,
VkDeviceSize size, VkDeviceSize size,
const void* data) { const void* data) {
if (size == 0)
return;
this->renderPassEnd(); this->renderPassEnd();
if (size != 0) {
auto physicalSlice = buffer->subSlice(offset, size); auto physicalSlice = buffer->subSlice(offset, size);
// Vulkan specifies that small amounts of data (up to 64kB) can // Vulkan specifies that small amounts of data (up to 64kB) can
@ -865,7 +872,6 @@ namespace dxvk {
m_cmd->trackResource(buffer->resource()); m_cmd->trackResource(buffer->resource());
} }
}
void DxvkContext::updateImage( void DxvkContext::updateImage(