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

Fix ambiguous QVariant casts from uint64_t on linux

Browse Source
This commit is contained in:
baldurk committed 2017-05-17 13:59:17 +01:00
1 parent 9831a8eb24
commit f8d10850f8
4 files changed
+28 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
+6 -5
View File
@@ -2415,7 +2415,8 @@ QVariantList D3D11PipelineStateViewer::exportViewHTML(D3D11Pipe::View &view, int
else
viewParams += lit(", ") + extraParams;
return {i, name, ToQStr(view.Type), typeName, w, h, d, a, viewFormat, format, viewParams};
return {i, name, ToQStr(view.Type), typeName, (qulonglong)w, h,
d, a, viewFormat, format, viewParams};
}
void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D11Pipe::IA &ia)
@@ -2469,7 +2470,7 @@ void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D11Pipe::IA &
}
}
rows.push_back({i, name, vb.Stride, vb.Offset, length});
rows.push_back({i, name, vb.Stride, vb.Offset, (qulonglong)length});
i++;
}
@@ -2507,7 +2508,7 @@ void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D11Pipe::IA &
ifmt = lit("R32_UINT");
m_Common.exportHTMLTable(xml, {tr("Buffer"), tr("Format"), tr("Offset"), tr("Byte Length")},
{name, ifmt, ia.ibuffer.Offset, length});
{name, ifmt, ia.ibuffer.Offset, (qulonglong)length});
}
xml.writeStartElement(lit("p"));
@@ -2703,7 +2704,7 @@ void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D11Pipe::Shad
}
rows.push_back({i, name, sh.ConstantBuffers[i].VecOffset, sh.ConstantBuffers[i].VecCount,
numvars, byteSize, length});
numvars, byteSize, (qulonglong)length});
}
m_Common.exportHTMLTable(xml,
@@ -2767,7 +2768,7 @@ void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D11Pipe::SO &
}
}
rows.push_back({i, name, o.Offset, length});
rows.push_back({i, name, o.Offset, (qulonglong)length});
i++;
}
qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
+8 -5
View File
@@ -2302,7 +2302,8 @@ QVariantList D3D12PipelineStateViewer::exportViewHTML(const D3D12Pipe::View &vie
else
viewParams += lit(", ") + extraParams;
return {name, ToQStr(view.Type), typeName, w, h, d, a, viewFormat, format, viewParams};
return {name, ToQStr(view.Type), typeName, (qulonglong)w, h, d,
a, viewFormat, format, viewParams};
}
void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::IA &ia)
@@ -2358,7 +2359,7 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::IA &
length = qMin(length, (uint64_t)vb.Size);
rows.push_back({i, name, vb.Stride, vb.Offset, length});
rows.push_back({i, name, vb.Stride, (qulonglong)vb.Offset, (qulonglong)length});
i++;
}
@@ -2398,7 +2399,7 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::IA &
ifmt = lit("R32_UINT");
m_Common.exportHTMLTable(xml, {tr("Buffer"), tr("Format"), tr("Offset"), tr("Byte Length")},
{name, ifmt, ia.ibuffer.Offset, length});
{name, ifmt, (qulonglong)ia.ibuffer.Offset, (qulonglong)length});
}
xml.writeStartElement(lit("p"));
@@ -2763,7 +2764,8 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::Shad
length = qMin(length, (uint64_t)bytesize);
rows.push_back({rootel, space, regname, name, offset, length, numvars});
rows.push_back(
{rootel, space, regname, name, (qulonglong)offset, (qulonglong)length, numvars});
}
}
}
@@ -2822,7 +2824,8 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, D3D12Pipe::Stre
length = qMin(length, o.Size);
rows.push_back({i, name, o.Offset, length, counterName, o.WrittenCountOffset, counterLength});
rows.push_back({i, name, (qulonglong)o.Offset, (qulonglong)length, counterName,
(qulonglong)o.WrittenCountOffset, (qulonglong)counterLength});
i++;
}
qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
+4 -3
View File
@@ -2359,7 +2359,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::VertexInpu
}
}
rows.push_back({i, name, vb.Stride, vb.Offset, vb.Divisor, length});
rows.push_back({i, name, vb.Stride, vb.Offset, vb.Divisor, (qulonglong)length});
i++;
}
@@ -2398,7 +2398,7 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::VertexInpu
ifmt = lit("R32_UINT");
m_Common.exportHTMLTable(xml, {tr("Buffer"), tr("Format"), tr("Byte Length")},
{name, ifmt, length});
{name, ifmt, (qulonglong)length});
}
xml.writeStartElement(tr("p"));
@@ -2951,7 +2951,8 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, GLPipe::Feedback &
}
}
rows.push_back({i, name, xfb.Offset[i], xfb.Size[i], length});
rows.push_back(
{(int)i, name, (qulonglong)xfb.Offset[i], (qulonglong)xfb.Size[i], (qulonglong)length});
}
m_Common.exportHTMLTable(
qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+10 -7
View File
@@ -2474,7 +2474,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Vertex
}
}
rows.push_back({i, name, vb.offset, length});
rows.push_back({i, name, (qulonglong)vb.offset, (qulonglong)length});
i++;
}
@@ -2510,7 +2510,8 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::InputA
m_Common.exportHTMLTable(
xml, {tr("Buffer"), tr("Format"), tr("Offset"), tr("Byte Length"), tr("Primitive Restart")},
{name, ifmt, ia.ibuffer.offs, length, ia.primitiveRestartEnable ? tr("Yes") : tr("No")});
{name, ifmt, (qulonglong)ia.ibuffer.offs, (qulonglong)length,
ia.primitiveRestartEnable ? tr("Yes") : tr("No")});
}
xml.writeStartElement(lit("p"));
@@ -2639,7 +2640,8 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader
// from SPIR-V side.
}
rows.push_back({setname, slotname, name, byteOffset, length, numvars, b.byteSize});
rows.push_back({setname, slotname, name, (qulonglong)byteOffset, (qulonglong)length,
numvars, b.byteSize});
}
}
@@ -2749,8 +2751,8 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader
}
if(bind.type != BindType::Sampler)
rows.push_back(
{setname, slotname, name, ToQStr(bind.type), w, h, d, arr, format, viewParams});
rows.push_back({setname, slotname, name, ToQStr(bind.type), (qulonglong)w, h, d, arr,
format, viewParams});
if(bind.type == BindType::ImageSampler || bind.type == BindType::Sampler)
{
@@ -2793,7 +2795,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader
const VKPipe::DescriptorBinding &bind =
set.bindings[sh.BindpointMapping.ReadWriteResources[i].bind];
QString setname = bindMap.bindset;
QString setname = QString::number(bindMap.bindset);
QString slotname = QFormatStr("%1: %2").arg(bindMap.bind).arg(ToQStr(b.name));
@@ -2872,7 +2874,8 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, VKPipe::Shader
tr("Byte Range: %1 - %2").arg(descriptorBind.offset).arg(descriptorBind.offset + length);
}
rows.push_back({setname, slotname, name, ToQStr(bind.type), w, h, d, arr, format, viewParams});
rows.push_back({setname, slotname, name, ToQStr(bind.type), (qulonglong)w, h, d, arr,
format, viewParams});
}
}