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

Pass data to FillBuffer as const void* so we can fill with overdrawRamp

Browse Source
This commit is contained in:
baldurk
2016-11-18 16:31:17 +01:00
parent ee1853b139
commit 9d09d11905
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_debug.cpp
+9 -5
View File
@@ -274,11 +274,15 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
samp.ptr += sizeof(D3D12Descriptor);
m_WrappedDevice->CreateSampler(&sampDesc, samp);
m_GenericVSCbuffer = MakeCBuffer(1024);
m_GenericPSCbuffer = MakeCBuffer(sizeof(DebugPixelCBufferData));
static const UINT64 bufsize = 2048;
RDCCOMPILE_ASSERT(sizeof(DebugVertexCBuffer) < 1024, "CBuffer isn't large enough");
RDCCOMPILE_ASSERT(sizeof(HistogramCBufferData) < 1024, "CBuffer isn't large enough");
m_GenericVSCbuffer = MakeCBuffer(bufsize);
m_GenericPSCbuffer = MakeCBuffer(bufsize);
RDCCOMPILE_ASSERT(sizeof(DebugVertexCBuffer) <= bufsize, "CBuffer isn't large enough");
RDCCOMPILE_ASSERT(sizeof(DebugPixelCBufferData) <= bufsize, "CBuffer isn't large enough");
RDCCOMPILE_ASSERT(sizeof(HistogramCBufferData) <= bufsize, "CBuffer isn't large enough");
RDCCOMPILE_ASSERT(sizeof(overdrawRamp) <= bufsize, "CBuffer isn't large enough");
RenderDoc::Inst().SetProgress(DebugManagerInit, 0.4f);
@@ -1630,7 +1634,7 @@ void D3D12DebugManager::FlipOutputWindow(uint64_t id)
outw.bbIdx %= 2;
}
void D3D12DebugManager::FillBuffer(ID3D12Resource *buf, void *data, size_t size)
void D3D12DebugManager::FillBuffer(ID3D12Resource *buf, const void *data, size_t size)
{
void *ptr = NULL;
HRESULT hr = buf->Map(0, NULL, &ptr);
renderdoc/driver/d3d12/d3d12_debug.h
+1 -1
View File
@@ -127,7 +127,7 @@ private:
};
ID3D12Resource *MakeCBuffer(UINT64 size);
void FillBuffer(ID3D12Resource *buf, void *data, size_t size);
void FillBuffer(ID3D12Resource *buf, const void *data, size_t size);
static const int FONT_TEX_WIDTH = 256;
static const int FONT_TEX_HEIGHT = 128;