lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linux compile fix after updating catch2

Browse Source 
Add +#undef Always where it is required
This commit is contained in:
Jake Turner
2021-02-17 18:30:33 +00:00
committed by Baldur Karlsson
parent 0a7020b557
commit 85ab48750e
6 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/core/core.cpp
+1
View File
@@ -1912,6 +1912,7 @@ void RenderDoc::RemoveFrameCapturer(void *dev, void *wnd)
#if ENABLED(ENABLE_UNIT_TESTS)
#undef None
#undef Always
#include "catch/catch.hpp"
renderdoc/driver/gl/gl_common.cpp
+1
View File
@@ -2635,6 +2635,7 @@ Topology MakePrimitiveTopology(GLenum Topo)
#if ENABLED(ENABLE_UNIT_TESTS)
#undef None
#undef Always
#include "catch/catch.hpp"
renderdoc/driver/gl/wrappers/gl_emulated.cpp
+1
View File
@@ -3742,6 +3742,7 @@ void GLDispatchTable::DriverForEmulation(WrappedOpenGL *driver)
#if ENABLED(ENABLE_UNIT_TESTS)
#undef None
#undef Always
#include "../gl_shader_refl.h"
#include "catch/catch.hpp"
renderdoc/driver/vulkan/vk_common.cpp
+1
View File
@@ -1126,6 +1126,7 @@ void DescriptorSetSlot::AccumulateBindRefs(DescriptorBindRefs &refs, VulkanResou
#if ENABLED(ENABLE_UNIT_TESTS)
#undef None
#undef Always
#include "catch/catch.hpp"
renderdoc/driver/vulkan/vk_core.cpp
+1
View File
@@ -4642,6 +4642,7 @@ void WrappedVulkan::ReplayDraw(VkCommandBuffer cmd, const DrawcallDescription &d
#if ENABLED(ENABLE_UNIT_TESTS)
#undef None
#undef Always
#include "catch/catch.hpp"
renderdoc/driver/vulkan/vk_resources.cpp
+1
View File
@@ -4277,6 +4277,7 @@ FrameRefType MarkImageReferenced(rdcflatmap<ResourceId, ImageState> &imageStates
#if ENABLED(ENABLE_UNIT_TESTS)
#undef None
#undef Always
#include "catch/catch.hpp"