Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ option_if_not_defined(GPGMM_ENABLE_ALLOCATOR_LEAK_CHECKS "Enables checking of al
option_if_not_defined(GPGMM_ENABLE_ASSERT_ON_WARNING "Enables ASSERT on severity functionality" OFF)
option_if_not_defined(GPGMM_DISABLE_SIZE_CACHE "Enables warming of caches with common resource sizes" OFF)
option_if_not_defined(GPGMM_ENABLE_MEMORY_ALIGN_CHECKS "Enables checking of resource alignment." OFF)
option_if_not_defined(GPGMM_ENABLE_LOGGING_INTERNAL_OBJECTS "Enables log messages for internal objects." OFF)
option_if_not_defined(GPGMM_ENABLE_LOGGING_INTERNAL "Enables log messages for internal objects." OFF)

if(GPGMM_ENABLE_TESTS)
# Vulkan tests require static linking.
Expand Down
4 changes: 2 additions & 2 deletions build_overrides/gpgmm_features.gni
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ declare_args() {
gpgmm_vk_dynamic_functions = false

# Enables log messages for internal objects.
# Sets -dGPGMM_ENABLE_LOGGING_INTERNAL_OBJECTS
gpgmm_enable_logging_internal_objects = false
# Sets -dGPGMM_ENABLE_LOGGING_INTERNAL
gpgmm_enable_logging_internal = false
}
4 changes: 2 additions & 2 deletions src/gpgmm/common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ config("gpgmm_common_config") {
defines += [ "GPGMM_ENABLE_MEMORY_ALIGN_CHECKS" ]
}

if (gpgmm_enable_logging_internal_objects) {
defines += [ "GPGMM_ENABLE_LOGGING_INTERNAL_OBJECTS" ]
if (gpgmm_enable_logging_internal) {
defines += [ "GPGMM_ENABLE_LOGGING_INTERNAL" ]
}

# Only internal build targets can use this config, this means only targets in
Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/utils/Log.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ namespace gpgmm {
}

// Ignore internal objects being logged unless the build is enabled for it.
#if !defined(GPGMM_ENABLE_LOGGING_INTERNAL_OBJECTS)
#if !defined(GPGMM_ENABLE_LOGGING_INTERNAL)
if (!mIsExternal) {
return;
}
Expand Down