rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-14 22:29:15 +01:00
Code Issues Projects Releases Wiki Activity

[d3d11] Minor formatting + doc improvements

Browse Source
This commit is contained in:
Philip Rebohle 2017-12-31 00:25:19 +01:00
parent 4412f2f5ff
commit 91a5eb963b
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/d3d11/d3d11_context.cpp
View File

@ -386,17 +386,15 @@ namespace dxvk {
dstFormatInfo->aspectMask & srcFormatInfo->aspectMask, dstFormatInfo->aspectMask & srcFormatInfo->aspectMask,
srcTextureInfo.image->info().mipLevels, SrcSubresource); srcTextureInfo.image->info().mipLevels, SrcSubresource);
VkImageSubresourceLayers dstLayers; const VkImageSubresourceLayers dstLayers = {
dstLayers.aspectMask = dstSubresource.aspectMask; dstSubresource.aspectMask,
dstLayers.mipLevel = dstSubresource.mipLevel; dstSubresource.mipLevel,
dstLayers.baseArrayLayer = dstSubresource.arrayLayer; dstSubresource.arrayLayer, 1 };
dstLayers.layerCount = 1;
VkImageSubresourceLayers srcLayers; const VkImageSubresourceLayers srcLayers = {
srcLayers.aspectMask = srcSubresource.aspectMask; srcSubresource.aspectMask,
srcLayers.mipLevel = srcSubresource.mipLevel; srcSubresource.mipLevel,
srcLayers.baseArrayLayer = srcSubresource.arrayLayer; srcSubresource.arrayLayer, 1 };
srcLayers.layerCount = 1;
m_context->copyImage( m_context->copyImage(
dstTextureInfo.image, dstLayers, dstOffset, dstTextureInfo.image, dstLayers, dstOffset,
@ -725,14 +723,20 @@ namespace dxvk {
void STDMETHODCALLTYPE D3D11DeviceContext::DrawIndexedInstancedIndirect( void STDMETHODCALLTYPE D3D11DeviceContext::DrawIndexedInstancedIndirect(
ID3D11Buffer* pBufferForArgs, ID3D11Buffer* pBufferForArgs,
UINT AlignedByteOffsetForArgs) { UINT AlignedByteOffsetForArgs) {
Logger::err("D3D11DeviceContext::DrawIndexedInstancedIndirect: Not implemented"); static bool errorShown = false;
if (!std::exchange(errorShown, true))
Logger::err("D3D11DeviceContext::DrawIndexedInstancedIndirect: Not implemented");
} }
void STDMETHODCALLTYPE D3D11DeviceContext::DrawInstancedIndirect( void STDMETHODCALLTYPE D3D11DeviceContext::DrawInstancedIndirect(
ID3D11Buffer* pBufferForArgs, ID3D11Buffer* pBufferForArgs,
UINT AlignedByteOffsetForArgs) { UINT AlignedByteOffsetForArgs) {
Logger::err("D3D11DeviceContext::DrawInstancedIndirect: Not implemented"); static bool errorShown = false;
if (!std::exchange(errorShown, true))
Logger::err("D3D11DeviceContext::DrawInstancedIndirect: Not implemented");
} }
@ -750,7 +754,10 @@ namespace dxvk {
void STDMETHODCALLTYPE D3D11DeviceContext::DispatchIndirect( void STDMETHODCALLTYPE D3D11DeviceContext::DispatchIndirect(
ID3D11Buffer* pBufferForArgs, ID3D11Buffer* pBufferForArgs,
UINT AlignedByteOffsetForArgs) { UINT AlignedByteOffsetForArgs) {
Logger::err("D3D11DeviceContext::DispatchIndirect: Not implemented"); static bool errorShown = false;
if (!std::exchange(errorShown, true))
Logger::err("D3D11DeviceContext::DispatchIndirect: Not implemented");
} }

8
src/d3d11/d3d11_texture.h
View File

@ -173,6 +173,14 @@ namespace dxvk {
ID3D11Resource* pResource, ID3D11Resource* pResource,
D3D11TextureInfo* pTextureInfo); D3D11TextureInfo* pTextureInfo);
/**
* \brief Computes image subresource from subresource index
*
* \param [in] Aspect Image aspect mask
* \param [in] MipLevels Total number of mip levels that the image has
* \param [in] Subresource The D3D11 subresource index
* \returns Vulkan image subresource info
*/
VkImageSubresource GetSubresourceFromIndex( VkImageSubresource GetSubresourceFromIndex(
VkImageAspectFlags Aspect, VkImageAspectFlags Aspect,
UINT MipLevels, UINT MipLevels,