From 48d6e948913ef616f2fd416a451eab38177e2f71 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 9 Jan 2019 11:04:12 +0000 Subject: [PATCH] Fix D3D11InitialContents overloads so wrong types don't get cast * ID3D11DeviceChild* is too broad and can accept a RTV or DSV if there's a bug. --- renderdoc/driver/d3d11/d3d11_manager.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/d3d11/d3d11_manager.h b/renderdoc/driver/d3d11/d3d11_manager.h index 69d775aae..261416b68 100644 --- a/renderdoc/driver/d3d11/d3d11_manager.h +++ b/renderdoc/driver/d3d11/d3d11_manager.h @@ -202,11 +202,12 @@ struct D3D11InitialContents ClearDSV, UAVCount, }; - D3D11InitialContents(D3D11ResourceType t, ID3D11DeviceChild *r) + D3D11InitialContents(D3D11ResourceType t, ID3D11Resource *r) : resourceType(t), tag(Copy), resource(r), resource2(NULL), uavCount(0) { } - D3D11InitialContents(D3D11ResourceType t, ID3D11RenderTargetView *r, ID3D11RenderTargetView *r2) + D3D11InitialContents(D3D11ResourceType t, ID3D11RenderTargetView *r, + ID3D11RenderTargetView *r2 = NULL) : resourceType(t), tag(ClearRTV), resource(r), resource2(r2), uavCount(0) { }