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

PALify RenderDoc module name

Browse Source 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
This commit is contained in:
Jeremy Ong
2021-07-31 18:30:49 -06:00
parent f9303a2eaa
commit 06cef942a9
18 changed files with 162 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RHI/Code/CMakeLists.txt
+3
View File
@@ -7,6 +7,7 @@
#
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
ly_get_list_relative_pal_filename(pal_source_dir ${CMAKE_CURRENT_LIST_DIR}/Source/Platform/${PAL_PLATFORM_NAME})
include(${pal_dir}/AtomRHITests_traits_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
@@ -50,9 +51,11 @@ ly_add_target(
NAMESPACE Gem
FILES_CMAKE
atom_rhi_public_files.cmake
${pal_source_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
INCLUDE_DIRECTORIES
PRIVATE
Source
${pal_source_dir}
PUBLIC
Include
BUILD_DEPENDENCIES
Gems/Atom/RHI/Code/Include/Atom/RHI/Factory.h
-11
View File
@@ -13,7 +13,6 @@
#if defined(USE_RENDERDOC)
#include <renderdoc_app.h>
#include <AzCore/AzCore_Traits_Platform.h>
#endif
namespace AZ
@@ -99,16 +98,6 @@ namespace AZ
static Factory& Get();
#if defined(USE_RENDERDOC)
#if defined(AZ_PLATFORM_WINDOWS)
static const char* RENDERDOC_MODULE = "renderdoc.dll";
#elif defined(AZ_PLATFORM_LINUX)
static const char* RENDERDOC_MODULE = "librenderdoc.so";
#elif defined(AZ_PLATFORM_ANDROID)
static const char* RENDERDOC_MODULE = "libVkLayer_GLES_RenderDoc.so"
#else
static const char* RENDERDOC_MODULE = nullptr;
#endif
/// Access the RenderDoc API pointer if available.
/// The availability of the render doc API at runtime depends on the following:
/// - You must not be building a packaged game/product (LY_MONOLITHIC_GAME not enabled in CMake)
Gems/Atom/RHI/Code/Source/Platform/Android/Atom_RHI_Traits_Android.h
+10
View File
@@ -0,0 +1,10 @@
/*
* 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
*
*/
#pragma once
#define AZ_TRAIT_RENDERDOC_MODULE "libVkLayer_GLES_RenderDoc.so"
Gems/Atom/RHI/Code/Source/Platform/Android/Atom_RHI_Traits_Platform.h
+10
View File
@@ -0,0 +1,10 @@
/*
* 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
*
*/
#pragma once
#include "Atom_RHI_Traits_Android.h"
Gems/Atom/RHI/Code/Source/Platform/Android/platform_android_files.cmake
+12
View File
@@ -0,0 +1,12 @@
#
# 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
#
#
set(FILES
Atom_RHI_Traits_Platform.h
Atom_RHI_Traits_Android.h
)
Gems/Atom/RHI/Code/Source/Platform/Linux/Atom_RHI_Traits_Linux.h
+10
View File
@@ -0,0 +1,10 @@
/*
* 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
*
*/
#pragma once
#define AZ_TRAIT_RENDERDOC_MODULE "librenderdoc.so"
Gems/Atom/RHI/Code/Source/Platform/Linux/Atom_RHI_Traits_Platform.h
+10
View File
@@ -0,0 +1,10 @@
/*
* 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
*
*/
#pragma once
#include "Atom_RHI_Traits_Linux.h"
Gems/Atom/RHI/Code/Source/Platform/Linux/platform_linux_files.cmake
+12
View File
@@ -0,0 +1,12 @@
#
# 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
#
#
set(FILES
Atom_RHI_Traits_Platform.h
Atom_RHI_Traits_Linux.h
)
Gems/Atom/RHI/Code/Source/Platform/Mac/Atom_RHI_Traits_Mac.h
+8
View File
@@ -0,0 +1,8 @@
/*
* 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
*
*/
#pragma once
Gems/Atom/RHI/Code/Source/Platform/Mac/Atom_RHI_Traits_Platform.h
+10
View File
@@ -0,0 +1,10 @@
/*
* 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
*
*/
#pragma once
#include "Atom_RHI_Traits_Mac.h"
Gems/Atom/RHI/Code/Source/Platform/Mac/platform_mac_files.cmake
+12
View File
@@ -0,0 +1,12 @@
#
# 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
#
#
set(FILES
Atom_RHI_Traits_Platform.h
Atom_RHI_Traits_Mac.h
)
Gems/Atom/RHI/Code/Source/Platform/Windows/Atom_RHI_Traits_Platform.h
+10
View File
@@ -0,0 +1,10 @@
/*
* 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
*
*/
#pragma once
#include "Atom_RHI_Traits_Windows.h"
Gems/Atom/RHI/Code/Source/Platform/Windows/Atom_RHI_Traits_Windows.h
+10
View File
@@ -0,0 +1,10 @@
/*
* 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
*
*/
#pragma once
#define AZ_TRAIT_RENDERDOC_MODULE "renderdoc.dll"
Gems/Atom/RHI/Code/Source/Platform/Windows/platform_windows_files.cmake
+12
View File
@@ -0,0 +1,12 @@
#
# 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
#
#
set(FILES
Atom_RHI_Traits_Platform.h
Atom_RHI_Traits_Windows.h
)
Gems/Atom/RHI/Code/Source/Platform/iOS/Atom_RHI_Traits_Platform.h
+10
View File
@@ -0,0 +1,10 @@
/*
* 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
*
*/
#pragma once
#include "Atom_RHI_Traits_iOS.h"
Gems/Atom/RHI/Code/Source/Platform/iOS/Atom_RHI_Traits_iOS.h
+8
View File
@@ -0,0 +1,8 @@
/*
* 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
*
*/
#pragma once
Gems/Atom/RHI/Code/Source/Platform/iOS/platform_ios_files.cmake
+12
View File
@@ -0,0 +1,12 @@
#
# 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
#
#
set(FILES
Atom_RHI_Traits_Platform.h
Atom_RHI_Traits_iOS.h
)
Gems/Atom/RHI/Code/Source/RHI/Factory.cpp
+3 -2
View File
@@ -14,6 +14,7 @@
#if defined(USE_RENDERDOC)
#include <AzCore/Module/DynamicModuleHandle.h>
#include <Atom/RHI/RHIUtils.h>
#include <Atom_RHI_Traits_Platform.h>
static AZStd::unique_ptr<AZ::DynamicModuleHandle> s_renderDocModule;
static RENDERDOC_API_1_1_2* s_renderDocApi = nullptr;
@@ -45,9 +46,9 @@ namespace AZ
// If RenderDoc is requested, we need to load the library as early as possible (before device queries/factories are made)
bool enableRenderDoc = RHI::QueryCommandLineOption("enableRenderDoc");
if (enableRenderDoc && RENDERDOC_MODULE && !s_renderDocModule)
if (enableRenderDoc && AZ_TRAIT_RENDERDOC_MODULE && !s_renderDocModule)
{
s_renderDocModule = DynamicModuleHandle::Create(RENDERDOC_MODULE);
s_renderDocModule = DynamicModuleHandle::Create(AZ_TRAIT_RENDERDOC_MODULE);
if (s_renderDocModule)
{
if (s_renderDocModule->Load(false))