lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-30 19:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a case where descriptor bind length wasn't being checked for ~0U

Browse Source
This commit is contained in:
baldurk
2017-04-27 19:47:48 +01:00
parent a9c500a3bf
commit 0f8e25a103
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+3 -3
View File
@@ -798,6 +798,8 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
TextureDescription *tex = NULL;
BufferDescription *buf = NULL;
uint64_t descriptorLen = descriptorBind ? descriptorBind->size : 0;
if(filledSlot && descriptorBind != NULL)
{
name = "Object " + ToQStr(descriptorBind->res);
@@ -831,8 +833,6 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
name = buf->name;
restype = TextureDim::Buffer;
ulong descriptorLen = descriptorBind->size;
if(descriptorLen == 0xFFFFFFFFFFFFFFFFULL)
descriptorLen = len - descriptorBind->offset;
@@ -867,7 +867,7 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
{
QString range = "-";
if(descriptorBind != NULL)
range = QString("%1 - %2").arg(descriptorBind->offset).arg(descriptorBind->size);
range = QString("%1 - %2").arg(descriptorBind->offset).arg(descriptorLen);
node = new RDTreeWidgetItem({
"", bindset, slotname, ToQStr(bindType), name, QString("%1 bytes").arg(len), range,
renderdocui/Windows/PipelineState/VulkanPipelineStateViewer.cs
+7 -3
View File
@@ -514,6 +514,11 @@ namespace renderdocui.Windows.PipelineState
object tag = null;
bool viewDetails = false;
ulong descriptorLen = 0;
if(descriptorBind != null)
descriptorLen = descriptorBind.size;
if (filledSlot && descriptorBind != null)
{
name = "Object " + descriptorBind.res.ToString();
@@ -558,8 +563,6 @@ namespace renderdocui.Windows.PipelineState
name = bufs[t].name;
restype = ShaderResourceType.Buffer;
ulong descriptorLen = descriptorBind.size;
if(descriptorLen == ulong.MaxValue)
descriptorLen = len - descriptorBind.offset;
@@ -601,7 +604,8 @@ namespace renderdocui.Windows.PipelineState
{
string range = "-";
if (descriptorBind != null)
range = String.Format("{0} - {1}", descriptorBind.offset, descriptorBind.size);
range = String.Format("{0} - {1}", descriptorBind.offset, descriptorLen);
node = parentNodes.Add(new object[] {
"", bindset, slotname, bindType,
name,