birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clang compile fixes (#1876)

Browse Source 
* Fix compile error from -Wwritable-strings

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix flags used to build MaskedOcclusionCulling with clang

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix class that has a final destructor, but the class itself was not final

Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
Chris Burel
2021-07-07 14:34:45 -07:00
committed by GitHub
parent af8e6afc6a
commit 80bdd4e17b
6 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/Tests/Platform/Windows/Tests/IO/Streamer/StorageDriveTests_Windows.cpp
+1 -1
View File
@@ -1155,7 +1155,7 @@ namespace Benchmark
class StorageDriveWindowsFixture : public benchmark::Fixture
{
public:
constexpr static char* TestFileName = "StreamerBenchmark.bin";
constexpr static const char* TestFileName = "StreamerBenchmark.bin";
constexpr static size_t FileSize = 64_mib;
void SetupStreamer(bool enableFileSharing)
Gems/Atom/RPI/Code/CMakeLists.txt
+2
View File
@@ -25,6 +25,8 @@ ly_add_target(
../Assets/atom_rpi_asset_files.cmake
${pal_source_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
${MASKED_OCCLUSION_CULLING_FILES}
PLATFORM_INCLUDE_FILES
${CMAKE_CURRENT_LIST_DIR}/Source/Platform/Common/${PAL_TRAIT_COMPILER_ID}/atom_rpi_public_${PAL_TRAIT_COMPILER_ID_LOWERCASE}.cmake
INCLUDE_DIRECTORIES
PRIVATE
Source
Gems/Atom/RPI/Code/Source/Platform/Common/Clang/atom_rpi_public_clang.cmake
+18
View File
@@ -0,0 +1,18 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#
ly_add_source_properties(
SOURCES External/MaskedOcclusionCulling/MaskedOcclusionCullingAVX2.cpp
PROPERTY COMPILE_OPTIONS
VALUES -mavx2 -mfma -msse4.1
)
ly_add_source_properties(
SOURCES External/MaskedOcclusionCulling/MaskedOcclusionCulling.cpp
PROPERTY COMPILE_OPTIONS
VALUES -mno-avx
)
Gems/Atom/RPI/Code/Source/Platform/Common/MSVC/atom_rpi_public_msvc.cmake
+19
View File
@@ -0,0 +1,19 @@
#
# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#
ly_add_source_properties(
SOURCES External/MaskedOcclusionCulling/MaskedOcclusionCullingAVX2.cpp
PROPERTY COMPILE_OPTIONS
VALUES /arch:AVX2 /W3
)
ly_add_source_properties(
SOURCES
External/MaskedOcclusionCulling/MaskedOcclusionCullingAVX512.cpp
External/MaskedOcclusionCulling/MaskedOcclusionCulling.cpp
PROPERTY COMPILE_OPTIONS
VALUES /W3
)
Gems/Atom/RPI/Code/Source/Platform/Windows/PAL_windows.cmake
-13
View File
@@ -7,16 +7,3 @@
set (PAL_TRAIT_BUILD_ATOM_RPI_ASSETS_SUPPORTED TRUE)
set (PAL_TRAIT_BUILD_ATOM_RPI_MASKED_OCCLUSION_CULLING_SUPPORTED TRUE)
ly_add_source_properties(
SOURCES External/MaskedOcclusionCulling/MaskedOcclusionCullingAVX2.cpp
PROPERTY COMPILE_OPTIONS
VALUES /arch:AVX2 /W3
)
ly_add_source_properties(
SOURCES
External/MaskedOcclusionCulling/MaskedOcclusionCullingAVX512.cpp
External/MaskedOcclusionCulling/MaskedOcclusionCulling.cpp
PROPERTY COMPILE_OPTIONS
VALUES /W3
)
Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionMetaDataRule.h
+2 -2
View File
@@ -37,7 +37,7 @@ namespace EMotionFX::Pipeline::Rule
AZStd::unique_ptr<EMotionFX::MotionEventTable> m_motionEventTable;
};
class MotionMetaDataRule
class MotionMetaDataRule final
: public ExternalToolRule<AZStd::shared_ptr<MotionMetaData>>
{
public:
@@ -46,7 +46,7 @@ namespace EMotionFX::Pipeline::Rule
MotionMetaDataRule();
MotionMetaDataRule(const AZStd::shared_ptr<MotionMetaData>& data);
~MotionMetaDataRule() final = default;
~MotionMetaDataRule() = default;
const AZStd::shared_ptr<MotionMetaData>& GetData() const override { return m_data; }
void SetData(const AZStd::shared_ptr<MotionMetaData>& data) override { m_data = data; }