diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-10-08 15:34:08 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-10-08 15:34:08 +0000 |
| commit | fe5f872c2e8113cc845f943810634d3307133614 (patch) | |
| tree | 06ea4037ab59bf24877a1c19e096645cbeeb2869 /Graphics/GraphicsEngineVulkan | |
| parent | Couple of minor updates to D3D12 and Vulkan device context implementations (diff) | |
| download | DiligentCore-fe5f872c2e8113cc845f943810634d3307133614.tar.gz DiligentCore-fe5f872c2e8113cc845f943810634d3307133614.zip | |
Cosmetic changes
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp | 11 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp index c8f5e220..538467d1 100644 --- a/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp @@ -802,7 +802,6 @@ namespace Diligent auto vkCmdBuff = m_CommandBuffer.GetVkCmdBuffer(); if (vkCmdBuff != VK_NULL_HANDLE ) { - VERIFY(!m_bIsDeferred, "Deferred contexts cannot execute command lists directly"); if (m_State.NumCommands != 0) { if (m_CommandBuffer.GetState().RenderPass != VK_NULL_HANDLE) @@ -1226,9 +1225,11 @@ namespace Diligent VERIFY( (Allocation.AlignedOffset % BufferOffsetAlignment) == 0, "Allocation offset must be at least 32-bit algined"); #ifdef _DEBUG - VERIFY(SrcStride >= CopyInfo.RowSize, "Source data stride (", SrcStride, ") is below the image row size (", CopyInfo.RowSize, ")"); - const Uint32 PlaneSize = SrcStride * CopyInfo.RowCount; - VERIFY(UpdateRegionDepth == 1 || SrcDepthStride >= PlaneSize, "Source data depth stride (", SrcDepthStride, ") is below the image plane size (", PlaneSize, ")"); + { + VERIFY(SrcStride >= CopyInfo.RowSize, "Source data stride (", SrcStride, ") is below the image row size (", CopyInfo.RowSize, ")"); + const Uint32 PlaneSize = SrcStride * CopyInfo.RowCount; + VERIFY(UpdateRegionDepth == 1 || SrcDepthStride >= PlaneSize, "Source data depth stride (", SrcDepthStride, ") is below the image plane size (", PlaneSize, ")"); + } #endif for(Uint32 DepthSlice = 0; DepthSlice < UpdateRegionDepth; ++DepthSlice) { @@ -1385,7 +1386,7 @@ namespace Diligent auto vkCmdBuff = m_CommandBuffer.GetVkCmdBuffer(); auto err = vkEndCommandBuffer(vkCmdBuff); - VERIFY(err == VK_SUCCESS, "Failed to end command buffer"); + DEV_CHECK_ERR(err == VK_SUCCESS, "Failed to end command buffer"); auto* pDeviceVkImpl = m_pDevice.RawPtr<RenderDeviceVkImpl>(); CommandListVkImpl *pCmdListVk( NEW_RC_OBJ(m_CmdListAllocator, "CommandListVkImpl instance", CommandListVkImpl) diff --git a/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp index b4a98d4d..89d5f912 100644 --- a/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp @@ -22,7 +22,6 @@ */ #include "pch.h" -#include <sstream> #include "RenderDeviceVkImpl.h" #include "PipelineStateVkImpl.h" #include "ShaderVkImpl.h" |