Fix compile error

This commit is contained in:
baldurk
2022-02-09 18:54:21 +00:00
parent e332b43abb
commit 38fa7a1ac7
4 changed files with 10 additions and 4 deletions
+5
View File
@@ -49,6 +49,11 @@
RDOC_DEBUG_CONFIG(bool, Capture_Debug_SnapshotDiagnosticLog, false,
"Snapshot the diagnostic log at capture time and embed in the capture.");
// this is declared centrally so it can be shared with any backend - the name is a misnomer but kept
// for backwards compatibility reasons.
RDOC_CONFIG(rdcarray<rdcstr>, DXBC_Debug_SearchDirPaths, {},
"Paths to search for separated shader debug PDBs.");
void LogReplayOptions(const ReplayOptions &opts)
{
RDCLOG("%s API validation during replay", (opts.apiValidation ? "Enabling" : "Not enabling"));
@@ -37,8 +37,8 @@
#include "driver/dx/official/d3dcompiler.h"
RDOC_CONFIG(rdcarray<rdcstr>, DXBC_Debug_SearchDirPaths, {},
"Paths to search for separated shader debug PDBs.");
// this is extern so that it can be shared with vulkan
RDOC_EXTERN_CONFIG(rdcarray<rdcstr>, DXBC_Debug_SearchDirPaths);
namespace DXBC
{
+1 -1
View File
@@ -267,7 +267,7 @@ struct VulkanQuadOverdrawCallback : public VulkanActionCallback
// don't care
}
bool SplitSecondary() { return false; }
bool ForceLoadRPs() override { return false; }
bool ForceLoadRPs() { return false; }
void PreCmdExecute(uint32_t baseEid, uint32_t secondaryFirst, uint32_t secondaryLast,
VkCommandBuffer cmd)
{
@@ -2220,7 +2220,8 @@ bool WrappedVulkan::Serialise_vkDebugMarkerSetObjectNameEXT(
break;
}
if(ObjDisp(m_Device)->DebugMarkerSetObjectNameEXT && type != VK_OBJECT_TYPE_UNKNOWN)
if(ObjDisp(m_Device)->DebugMarkerSetObjectNameEXT &&
type != VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT)
{
name.objectType = type;
ObjDisp(m_Device)->DebugMarkerSetObjectNameEXT(Unwrap(m_Device), &name);