From e06a01d03d546b6792a02ef3c3e685597a0b25c8 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 2 Feb 2022 16:13:25 +0000 Subject: [PATCH] Fix compilation on linux --- renderdoc/api/replay/renderdoc_replay.h | 4 ---- renderdoc/api/replay/shader_types.h | 6 ++++++ renderdoc/serialise/serialiser.cpp | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/renderdoc/api/replay/renderdoc_replay.h b/renderdoc/api/replay/renderdoc_replay.h index 8be3bb377..fa3177bc9 100644 --- a/renderdoc/api/replay/renderdoc_replay.h +++ b/renderdoc/api/replay/renderdoc_replay.h @@ -47,10 +47,6 @@ typedef void(RENDERDOC_CC *pRENDERDOC_FreeArrayMem)(void *mem); extern "C" RENDERDOC_API void *RENDERDOC_CC RENDERDOC_AllocArrayMem(uint64_t sz); typedef void *(RENDERDOC_CC *pRENDERDOC_AllocArrayMem)(uint64_t sz); - -// similarly these need to be pre-declared for use in rdhalf -extern "C" RENDERDOC_API float RENDERDOC_CC RENDERDOC_HalfToFloat(uint16_t half); -extern "C" RENDERDOC_API uint16_t RENDERDOC_CC RENDERDOC_FloatToHalf(float flt); #endif // declare base types and stringise interface diff --git a/renderdoc/api/replay/shader_types.h b/renderdoc/api/replay/shader_types.h index 8a9a7f323..f632d6f2a 100644 --- a/renderdoc/api/replay/shader_types.h +++ b/renderdoc/api/replay/shader_types.h @@ -109,6 +109,12 @@ struct BindpointIndex DECLARE_REFLECTION_STRUCT(BindpointIndex); +#if !defined(SWIG) +// similarly these need to be pre-declared for use in rdhalf +extern "C" RENDERDOC_API float RENDERDOC_CC RENDERDOC_HalfToFloat(uint16_t half); +extern "C" RENDERDOC_API uint16_t RENDERDOC_CC RENDERDOC_FloatToHalf(float flt); +#endif + struct rdhalf { #if !defined(SWIG) diff --git a/renderdoc/serialise/serialiser.cpp b/renderdoc/serialise/serialiser.cpp index 50a9e0e28..3f8e1699b 100644 --- a/renderdoc/serialise/serialiser.cpp +++ b/renderdoc/serialise/serialiser.cpp @@ -26,6 +26,7 @@ #define SERIALISER_IMPL #include "serialiser.h" +#include "api/replay/renderdoc_replay.h" #include "core/core.h" #include "strings/string_utils.h"