From 0777a87dee8835ac00af1b67e79b3d48bc91e837 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 26 Jan 2015 19:48:19 +0000 Subject: [PATCH] Fix mismatch between C# struct and C++ struct (was hidden in padding) --- renderdocui/Code/CommonPipelineState.cs | 2 +- renderdocui/Interop/GLPipelineState.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/renderdocui/Code/CommonPipelineState.cs b/renderdocui/Code/CommonPipelineState.cs index 0adc90f54..fe37d6b07 100644 --- a/renderdocui/Code/CommonPipelineState.cs +++ b/renderdocui/Code/CommonPipelineState.cs @@ -419,7 +419,7 @@ namespace renderdocui.Code ret[a].VertexBuffer = (int)attrs[i].BufferSlot; ret[a].RelativeByteOffset = attrs[i].RelativeOffset; - ret[a].PerInstance = m_GL.m_VtxIn.vbuffers[attrs[i].BufferSlot].PerInstance; + ret[a].PerInstance = m_GL.m_VtxIn.vbuffers[attrs[i].BufferSlot].Divisor > 0; ret[a].InstanceRate = (int)m_GL.m_VtxIn.vbuffers[attrs[i].BufferSlot].Divisor; ret[a].Format = attrs[i].Format; diff --git a/renderdocui/Interop/GLPipelineState.cs b/renderdocui/Interop/GLPipelineState.cs index 4bebd46f0..81e5e96da 100644 --- a/renderdocui/Interop/GLPipelineState.cs +++ b/renderdocui/Interop/GLPipelineState.cs @@ -52,7 +52,6 @@ namespace renderdoc public ResourceId Buffer; public UInt32 Stride; public UInt32 Offset; - public bool PerInstance; public UInt32 Divisor; }; [CustomMarshalAs(CustomUnmanagedType.TemplatedArray)]