lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-20 20:55:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for variable shadowing warnings

Browse Source
This commit is contained in:
baldurk
2016-09-16 17:49:39 +02:00
parent 83f23150f2
commit ae1534d135
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_device.cpp
+10 -10
View File
@@ -1164,12 +1164,12 @@ bool WrappedID3D12Device::EndFrameCapture(void *dev, void *wnd)
float xf = float(x) / float(thwidth);
float yf = float(y) / float(thheight);
byte *src = &data[stride * uint32_t(xf * widthf) +
layout.Footprint.RowPitch * uint32_t(yf * heightf)];
byte *srcPixels = &data[stride * uint32_t(xf * widthf) +
layout.Footprint.RowPitch * uint32_t(yf * heightf)];
if(buf1010102)
{
uint32_t *src1010102 = (uint32_t *)src;
uint32_t *src1010102 = (uint32_t *)srcPixels;
Vec4f unorm = ConvertFromR10G10B10A2(*src1010102);
dstPixels[0] = (byte)(unorm.x * 255.0f);
dstPixels[1] = (byte)(unorm.y * 255.0f);
@@ -1177,13 +1177,13 @@ bool WrappedID3D12Device::EndFrameCapture(void *dev, void *wnd)
}
else if(bufBGRA)
{
dstPixels[0] = src[2];
dstPixels[1] = src[1];
dstPixels[2] = src[0];
dstPixels[0] = srcPixels[2];
dstPixels[1] = srcPixels[1];
dstPixels[2] = srcPixels[0];
}
else if(fmt.compByteWidth == 2) // R16G16B16A16 backbuffer
{
uint16_t *src16 = (uint16_t *)src;
uint16_t *src16 = (uint16_t *)srcPixels;
float linearR = RDCCLAMP(ConvertFromHalf(src16[0]), 0.0f, 1.0f);
float linearG = RDCCLAMP(ConvertFromHalf(src16[1]), 0.0f, 1.0f);
@@ -1206,9 +1206,9 @@ bool WrappedID3D12Device::EndFrameCapture(void *dev, void *wnd)
}
else
{
dstPixels[0] = src[0];
dstPixels[1] = src[1];
dstPixels[2] = src[2];
dstPixels[0] = srcPixels[0];
dstPixels[1] = srcPixels[1];
dstPixels[2] = srcPixels[2];
}
dstPixels += 3;