From 4c67de2995eb7e0daaa61bea31b5af19abe7a001 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 22 Nov 2017 11:50:37 +0000 Subject: [PATCH] Fix copy-paste errors reported by Coverity Scan --- qrenderdoc/Windows/BufferViewer.cpp | 2 +- qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp | 2 +- renderdoc/driver/d3d11/d3d11_device_wrap.cpp | 4 +++- renderdoc/driver/gl/gl_common.cpp | 2 +- renderdoc/replay/entry_points.cpp | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp index 01ff3cfe4..e7e77044e 100644 --- a/qrenderdoc/Windows/BufferViewer.cpp +++ b/qrenderdoc/Windows/BufferViewer.cpp @@ -2147,7 +2147,7 @@ void BufferViewer::updatePreviewColumns() m_VSInSecondary.buf = vbs[el.buffer].Buffer; m_VSInSecondary.stride = vbs[el.buffer].ByteStride; m_VSInSecondary.offset = - vbs[el.buffer].ByteOffset + el.offset + draw->vertexOffset * m_VSInPosition.stride; + vbs[el.buffer].ByteOffset + el.offset + draw->vertexOffset * m_VSInSecondary.stride; } else { diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp index dafd4d878..a9d8fb5f1 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp @@ -1765,7 +1765,7 @@ void D3D12PipelineStateViewer::resource_itemActivated(RDTreeWidgetItem *item, in const rdcarray &bindArray = view.space == D3D12ViewTag::SRV ? stage->BindpointMapping.ReadOnlyResources - : stage->BindpointMapping.ReadOnlyResources; + : stage->BindpointMapping.ReadWriteResources; for(int i = 0; i < bindArray.count(); i++) { diff --git a/renderdoc/driver/d3d11/d3d11_device_wrap.cpp b/renderdoc/driver/d3d11/d3d11_device_wrap.cpp index 11f051014..f00a18fd2 100644 --- a/renderdoc/driver/d3d11/d3d11_device_wrap.cpp +++ b/renderdoc/driver/d3d11/d3d11_device_wrap.cpp @@ -2727,8 +2727,10 @@ bool WrappedID3D11Device::Serialise_OpenSharedResource(SerialiserType &ser, HAND { ID3D11Buffer *stage = NULL; + UINT byteSize = Descriptor.ByteWidth; + RDCEraseEl(Descriptor); - Descriptor.ByteWidth = Descriptor.ByteWidth; + Descriptor.ByteWidth = byteSize; Descriptor.MiscFlags = 0; Descriptor.StructureByteStride = 0; // We don't need to bind this, but IMMUTABLE requires at least one diff --git a/renderdoc/driver/gl/gl_common.cpp b/renderdoc/driver/gl/gl_common.cpp index 1a7c647a6..cbe416b82 100644 --- a/renderdoc/driver/gl/gl_common.cpp +++ b/renderdoc/driver/gl/gl_common.cpp @@ -1060,7 +1060,7 @@ TextureFilter MakeFilter(GLenum minf, GLenum magf, bool shadowSampler, float max } else if(minf == eGL_NEAREST_MIPMAP_NEAREST || minf == eGL_LINEAR_MIPMAP_NEAREST) { - ret.minify = (minf == eGL_LINEAR_MIPMAP_LINEAR) ? FilterMode::Linear : FilterMode::Point; + ret.minify = (minf == eGL_LINEAR_MIPMAP_NEAREST) ? FilterMode::Linear : FilterMode::Point; ret.mip = FilterMode::Point; } diff --git a/renderdoc/replay/entry_points.cpp b/renderdoc/replay/entry_points.cpp index b9a8d0f78..ee877ec08 100644 --- a/renderdoc/replay/entry_points.cpp +++ b/renderdoc/replay/entry_points.cpp @@ -504,7 +504,7 @@ static std::string ResourceFormatName(const ResourceFormat &fmt) break; case ResourceFormatType::R11G11B10: return "R11G11B10_FLOAT"; case ResourceFormatType::R5G6B5: return fmt.bgraOrder ? "R5G6B5_UNORM" : "B5G6R5_UNORM"; - case ResourceFormatType::R5G5B5A1: return fmt.bgraOrder ? "R5G5B5A1_UNORM" : "R5G5B5A1_UNORM"; + case ResourceFormatType::R5G5B5A1: return fmt.bgraOrder ? "R5G5B5A1_UNORM" : "B5G5R5A1_UNORM"; case ResourceFormatType::R9G9B9E5: return "R9G9B9E5_FLOAT"; case ResourceFormatType::R4G4B4A4: return fmt.bgraOrder ? "R4G4B4A4_UNORM" : "B4G4R4A4_UNORM"; case ResourceFormatType::R4G4: return "R4G4_UNORM";