Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk
2025-07-23 01:06:19 +03:00
committed by Konstantin Pastbin
parent 580209f7ea
commit c4599f4889
9 changed files with 161 additions and 161 deletions

View File

@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.22.1)
project(omim C CXX) project(omim C CXX)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 23)
set(CMAKE_C_STANDARD 17) set(CMAKE_C_STANDARD 23)
# Our code does not rely on gnu extensions. # Our code does not rely on gnu extensions.
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_C_EXTENSIONS OFF) set(CMAKE_C_EXTENSIONS OFF)
@@ -39,12 +39,12 @@ if (APPLE AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))
# https://gitlab.kitware.com/cmake/cmake/-/issues/21963 # https://gitlab.kitware.com/cmake/cmake/-/issues/21963
enable_language(OBJC) enable_language(OBJC)
set(CMAKE_OBJC_EXTENSIONS OFF) set(CMAKE_OBJC_EXTENSIONS OFF)
set(CMAKE_OBJC_STANDARD 11) set(CMAKE_OBJC_STANDARD 23)
set(CMAKE_OBJC_FLAGS -fobjc-arc) set(CMAKE_OBJC_FLAGS -fobjc-arc)
set(CMAKE_OBJC_VISIBILITY_PRESET hidden) set(CMAKE_OBJC_VISIBILITY_PRESET hidden)
enable_language(OBJCXX) enable_language(OBJCXX)
set(CMAKE_OBJCXX_EXTENSIONS OFF) set(CMAKE_OBJCXX_EXTENSIONS OFF)
set(CMAKE_OBJCXX_STANDARD 20) set(CMAKE_OBJCXX_STANDARD 23)
set(CMAKE_OBJCXX_FLAGS -fobjc-arc) set(CMAKE_OBJCXX_FLAGS -fobjc-arc)
set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden) set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
endif() endif()
@@ -87,7 +87,7 @@ if (MSVC)
add_compile_options(/utf-8) add_compile_options(/utf-8)
add_link_options(/INCREMENTAL:NO) add_link_options(/INCREMENTAL:NO)
else() else()
add_compile_options(-ffast-math) add_compile_options(-ffast-math $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>)
endif() endif()
if (PLATFORM_WIN) if (PLATFORM_WIN)

View File

@@ -159,8 +159,8 @@ function(add_precompiled_headers header pch_target_name)
export_directory_flags("${pch_flags_file}") export_directory_flags("${pch_flags_file}")
set(compiler_flags "@${pch_flags_file}") set(compiler_flags "@${pch_flags_file}")
# CMAKE_CXX_STANDARD 20 flags: # CMAKE_CXX_STANDARD 23 flags:
set(c_standard_flags "-std=c++20") set(c_standard_flags "-std=c++23")
get_filename_component(pch_file_name ${header} NAME) get_filename_component(pch_file_name ${header} NAME)
add_pic_pch_target(${header} ${pch_target_name} ${pch_file_name} lib "-fPIC") add_pic_pch_target(${header} ${pch_target_name} ${pch_file_name} lib "-fPIC")

View File

@@ -2,6 +2,7 @@
#include "base/assert.hpp" #include "base/assert.hpp"
#include <bit>
#include <cstdint> #include <cstdint>
#include <limits> #include <limits>
#include <type_traits> #include <type_traits>

View File

@@ -13,6 +13,7 @@
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <system_error>
#include <type_traits> #include <type_traits>
#include <utf8/unchecked.h> #include <utf8/unchecked.h>

View File

@@ -47,8 +47,6 @@ struct VulkanObject
} }
}; };
class VulkanStagingBuffer;
class VulkanObjectManager class VulkanObjectManager
{ {
public: public:

View File

@@ -1,6 +1,5 @@
#include "drape/vulkan/vulkan_texture.hpp" #include "drape/vulkan/vulkan_texture.hpp"
#include "drape/vulkan/vulkan_base_context.hpp" #include "drape/vulkan/vulkan_base_context.hpp"
#include "drape/vulkan/vulkan_staging_buffer.hpp"
drape_ptr<dp::HWTextureAllocator> CreateVulkanAllocator() drape_ptr<dp::HWTextureAllocator> CreateVulkanAllocator()
{ {

View File

@@ -3,6 +3,7 @@
#include "drape/hw_texture.hpp" #include "drape/hw_texture.hpp"
#include "drape/pointers.hpp" #include "drape/pointers.hpp"
#include "drape/vulkan/vulkan_object_manager.hpp" #include "drape/vulkan/vulkan_object_manager.hpp"
#include "drape/vulkan/vulkan_staging_buffer.hpp"
#include "drape/vulkan/vulkan_utils.hpp" #include "drape/vulkan/vulkan_utils.hpp"
#include <cstdint> #include <cstdint>
@@ -11,8 +12,6 @@ namespace dp
{ {
namespace vulkan namespace vulkan
{ {
class VulkanStagingBuffer;
class VulkanTextureAllocator : public HWTextureAllocator class VulkanTextureAllocator : public HWTextureAllocator
{ {
public: public:

File diff suppressed because it is too large Load Diff

View File

@@ -69,7 +69,7 @@ GCC_WARN_UNUSED_VARIABLE = YES
ALWAYS_SEARCH_USER_PATHS = NO ALWAYS_SEARCH_USER_PATHS = NO
CLANG_ADDRESS_SANITIZER_CONTAINER_OVERFLOW = YES CLANG_ADDRESS_SANITIZER_CONTAINER_OVERFLOW = YES
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES
CLANG_CXX_LANGUAGE_STANDARD = c++20 CLANG_CXX_LANGUAGE_STANDARD = c++23
CLANG_CXX_LIBRARY = libc++ CLANG_CXX_LIBRARY = libc++
CLANG_ENABLE_MODULES = YES CLANG_ENABLE_MODULES = YES
CLANG_ENABLE_OBJC_ARC = YES CLANG_ENABLE_OBJC_ARC = YES
@@ -82,7 +82,7 @@ DEBUG_INFORMATION_FORMAT = dwarf
ENABLE_CODE_COVERAGE = NO ENABLE_CODE_COVERAGE = NO
ENABLE_STRICT_OBJC_MSGSEND = YES ENABLE_STRICT_OBJC_MSGSEND = YES
ENABLE_USER_SCRIPT_SANDBOXING = YES ENABLE_USER_SCRIPT_SANDBOXING = YES
GCC_C_LANGUAGE_STANDARD = c17 GCC_C_LANGUAGE_STANDARD = c23
GCC_DYNAMIC_NO_PIC = NO GCC_DYNAMIC_NO_PIC = NO
GCC_FAST_MATH = YES GCC_FAST_MATH = YES
// -fvisibility-inlines-hidden // -fvisibility-inlines-hidden