From c1088724f15ee050fa41e6837cb2d39a15e7bf70 Mon Sep 17 00:00:00 2001 From: Maximilien Dagois Date: Thu, 7 Nov 2024 16:25:22 +0900 Subject: [PATCH] Added #undef to avoid any warnings --- filament/backend/src/opengl/OpenGLDriver.cpp | 3 +++ filament/backend/src/vulkan/VulkanConstants.h | 1 + 2 files changed, 4 insertions(+) diff --git a/filament/backend/src/opengl/OpenGLDriver.cpp b/filament/backend/src/opengl/OpenGLDriver.cpp index 1005fe1a9d2..1592b99fd82 100644 --- a/filament/backend/src/opengl/OpenGLDriver.cpp +++ b/filament/backend/src/opengl/OpenGLDriver.cpp @@ -108,6 +108,9 @@ // Override the debug markers if we are forcing profiling mode #if defined(FILAMENT_FORCE_PROFILING_MODE) +# undef DEBUG_GROUP_MARKER_LEVEL +# undef DEBUG_MARKER_LEVEL + # define DEBUG_GROUP_MARKER_LEVEL DEBUG_GROUP_MARKER_NONE # define DEBUG_MARKER_LEVEL DEBUG_MARKER_PROFILE #endif diff --git a/filament/backend/src/vulkan/VulkanConstants.h b/filament/backend/src/vulkan/VulkanConstants.h index 4c20d070f38..5a7479abd13 100644 --- a/filament/backend/src/vulkan/VulkanConstants.h +++ b/filament/backend/src/vulkan/VulkanConstants.h @@ -100,6 +100,7 @@ // Override the debug flags if we are forcing profiling mode #if defined(FILAMENT_FORCE_PROFILING_MODE) +#undef FVK_DEBUG_FLAGS #define FVK_DEBUG_FLAGS (FVK_DEBUG_PROFILING) #endif