From e7b1c37d8e831463b8712c9aa7dde47bdb8f1edc Mon Sep 17 00:00:00 2001 From: korenkonder Date: Tue, 14 Feb 2023 00:46:14 +0300 Subject: [PATCH] Fix defines --- src/CRE/Glitter/particle_manager.cpp | 2 ++ src/CRE/render_manager.cpp | 2 ++ src/CRE/shader_dev.cpp | 2 +- src/CRE/shader_dev.hpp | 2 +- src/ReDIVA/render.cpp | 28 ---------------------------- 5 files changed, 6 insertions(+), 30 deletions(-) diff --git a/src/CRE/Glitter/particle_manager.cpp b/src/CRE/Glitter/particle_manager.cpp index c127c2a0..3e9f3ef7 100644 --- a/src/CRE/Glitter/particle_manager.cpp +++ b/src/CRE/Glitter/particle_manager.cpp @@ -165,9 +165,11 @@ namespace Glitter { return hash_utf8_fnv1a64m(str); } +#if defined(CRE_DEV) bool GltParticleManager::CheckHasLocalEffect() { return!!(flags & PARTICLE_MANAGER_LOCAL); } +#endif bool GltParticleManager::CheckHasFileReader(uint64_t hash) { for (FileReader*& i : file_readers) diff --git a/src/CRE/render_manager.cpp b/src/CRE/render_manager.cpp index fb69f77f..45a95b86 100644 --- a/src/CRE/render_manager.cpp +++ b/src/CRE/render_manager.cpp @@ -653,6 +653,7 @@ namespace rndr { mdl::OBJ_TYPE_TRANSPARENT_ALPHA_ORDER_1, mdl::OBJ_TYPE_TRANSLUCENT_ALPHA_ORDER_1); +#if defined(CRE_DEV) if (Glitter::glt_particle_manager->CheckHasLocalEffect()) { // X camera* cam = rctx->camera; double_t fov = cam->get_fov(); @@ -681,6 +682,7 @@ namespace rndr { cam->set_fov(fov); draw_pass_set_camera(rctx); } +#endif if (effect_texture) gl_state_active_bind_texture_2d(14, 0); diff --git a/src/CRE/shader_dev.cpp b/src/CRE/shader_dev.cpp index f36fa381..e8b9f88a 100644 --- a/src/CRE/shader_dev.cpp +++ b/src/CRE/shader_dev.cpp @@ -3,7 +3,7 @@ GitHub/GitLab: korenkonder */ -#if CRE_DEV +#if defined(CRE_DEV) #include "shader_dev.hpp" #include "../KKdLib/str_utils.hpp" #include "gl_state.hpp" diff --git a/src/CRE/shader_dev.hpp b/src/CRE/shader_dev.hpp index f7c56d2e..39550b3c 100644 --- a/src/CRE/shader_dev.hpp +++ b/src/CRE/shader_dev.hpp @@ -5,7 +5,7 @@ #pragma once -#if CRE_DEV +#if defined(CRE_DEV) #include "../KKdLib/default.hpp" #include "shader.hpp" diff --git a/src/ReDIVA/render.cpp b/src/ReDIVA/render.cpp index 2eb6eebf..6a19893d 100644 --- a/src/ReDIVA/render.cpp +++ b/src/ReDIVA/render.cpp @@ -179,12 +179,6 @@ static void render_imgui_context_menu(classes_data* classes, #if RENDER_DEBUG static void APIENTRY render_debug_output(GLenum source, GLenum type, uint32_t id, GLenum severity, GLsizei length, const char* message, const void* userParam); - -static VkResult vkGetInstanceProcAddrCreateDebugUtilsMessengerEXT(VkInstance instance, - const VkDebugUtilsMessengerCreateInfoEXT* pCreateInfo, - const VkAllocationCallbacks* pAllocator, VkDebugUtilsMessengerEXT* pDebugMessenger); -static void vkGetInstanceProcAddrDestroyDebugUtilsMessengerEXT(VkInstance instance, - VkDebugUtilsMessengerEXT messenger, const VkAllocationCallbacks* pAllocator); #endif bool close; @@ -1406,26 +1400,4 @@ static void APIENTRY render_debug_output(GLenum source, GLenum type, uint32_t id printf_debug("Debug message (%d): %s\n", id, message); printf_debug("########################################\n\n"); } - -static VkResult vkGetInstanceProcAddrCreateDebugUtilsMessengerEXT(VkInstance instance, - const VkDebugUtilsMessengerCreateInfoEXT* pCreateInfo, - const VkAllocationCallbacks* pAllocator, VkDebugUtilsMessengerEXT* pDebugMessenger) { - static PFN_vkCreateDebugUtilsMessengerEXT _vkCreateDebugUtilsMessengerEXT; - if (!_vkCreateDebugUtilsMessengerEXT) - _vkCreateDebugUtilsMessengerEXT = (PFN_vkCreateDebugUtilsMessengerEXT) - vkGetInstanceProcAddr(instance, "vkCreateDebugUtilsMessengerEXT"); - if (_vkCreateDebugUtilsMessengerEXT) - return _vkCreateDebugUtilsMessengerEXT(instance, pCreateInfo, pAllocator, pDebugMessenger); - return VK_ERROR_EXTENSION_NOT_PRESENT; -} - -static void vkGetInstanceProcAddrDestroyDebugUtilsMessengerEXT(VkInstance instance, - VkDebugUtilsMessengerEXT messenger, const VkAllocationCallbacks* pAllocator) { - static PFN_vkDestroyDebugUtilsMessengerEXT _vkDestroyDebugUtilsMessengerEXT; - if (!_vkDestroyDebugUtilsMessengerEXT) - _vkDestroyDebugUtilsMessengerEXT = (PFN_vkDestroyDebugUtilsMessengerEXT) - vkGetInstanceProcAddr(instance, "vkDestroyDebugUtilsMessengerEXT"); - if (_vkDestroyDebugUtilsMessengerEXT) - _vkDestroyDebugUtilsMessengerEXT(instance, messenger, pAllocator); -} #endif