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

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/CrySCompileServer/CrySCompileServer/Core/Server/CrySimpleJobCompile.cpp
-6
View File
@@ -250,8 +250,6 @@ bool CCrySimpleJobCompile::Compile(const TiXmlElement* pElement, std::vector<uin
"METAL", SEnviropment::m_METAL_HLSLcc
},{
"ORBIS", SEnviropment::m_Orbis_DXC
},{
"DURANGO", SEnviropment::m_Durango_FXC
},{
"JASPER", SEnviropment::m_Jasper_FXC
}
@@ -457,10 +455,6 @@ bool CCrySimpleJobCompile::Compile(const TiXmlElement* pElement, std::vector<uin
AZStd::string hardwareTarget;
#if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
#if defined(TOOLS_SUPPORT_XENIA)
#define AZ_RESTRICTED_SECTION CRYSIMPLEJOBCOMPILE_CPP_SECTION_1
#include AZ_RESTRICTED_FILE_EXPLICIT(CrySimpleJobCompile_cpp, xenia)
#endif
#if defined(TOOLS_SUPPORT_JASPER)
#define AZ_RESTRICTED_SECTION CRYSIMPLEJOBCOMPILE_CPP_SECTION_1
#include AZ_RESTRICTED_FILE_EXPLICIT(CrySimpleJobCompile_cpp, jasper)
Code/Tools/CrySCompileServer/CrySCompileServer/Core/Server/CrySimpleServer.cpp
-11
View File
@@ -113,7 +113,6 @@ SEnviropment& SEnviropment::Instance()
// Shader Compilers ID
// NOTE: Values must be in sync with CShaderSrv::GetShaderCompilerName() function in the engine side.
const char* SEnviropment::m_Orbis_DXC = "Orbis_DXC";
const char* SEnviropment::m_Durango_FXC = "Durango_FXC";
const char* SEnviropment::m_Jasper_FXC = "Jasper_FXC";
const char* SEnviropment::m_D3D11_FXC = "D3D11_FXC";
const char* SEnviropment::m_GLSL_HLSLcc = "GLSL_HLSLcc";
@@ -126,7 +125,6 @@ void SEnviropment::InitializePlatformAttributes()
// Initialize valid Plaforms
// NOTE: Values must be in sync with CShaderSrv::GetPlatformName() function in the engine side.
m_Platforms.insert("Orbis");
m_Platforms.insert("Durango");
m_Platforms.insert("Nx");
m_Platforms.insert("PC");
m_Platforms.insert("Mac");
@@ -138,7 +136,6 @@ void SEnviropment::InitializePlatformAttributes()
// Initialize valid Shader Languages
// NOTE: Values must be in sync with GetShaderLanguageName() function in the engine side.
m_ShaderLanguages.insert("Orbis");
m_ShaderLanguages.insert("Durango");
m_ShaderLanguages.insert("D3D11");
m_ShaderLanguages.insert("METAL");
m_ShaderLanguages.insert("GL4");
@@ -153,10 +150,6 @@ void SEnviropment::InitializePlatformAttributes()
// Initialize valid Shader Compilers ID and Executables.
// Intentionally put a space after the executable name so that attackers can't try to change the executable name that we are going to run.
#if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
#if defined(TOOLS_SUPPORT_XENIA)
#define AZ_RESTRICTED_SECTION CRYSIMPLESERVER_CPP_SECTION_2
#include AZ_RESTRICTED_FILE_EXPLICIT(CrySimpleServer_cpp, xenia)
#endif
#if defined(TOOLS_SUPPORT_JASPER)
#define AZ_RESTRICTED_SECTION CRYSIMPLESERVER_CPP_SECTION_2
#include AZ_RESTRICTED_FILE_EXPLICIT(CrySimpleServer_cpp, jasper)
@@ -394,10 +387,6 @@ void CompileJob::Process()
}
#if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
#if defined(TOOLS_SUPPORT_XENIA)
#define AZ_RESTRICTED_SECTION CRYSIMPLESERVER_CPP_SECTION_1
#include AZ_RESTRICTED_FILE_EXPLICIT(CrySimpleServer_cpp, xenia)
#endif
#if defined(TOOLS_SUPPORT_JASPER)
#define AZ_RESTRICTED_SECTION CRYSIMPLESERVER_CPP_SECTION_1
#include AZ_RESTRICTED_FILE_EXPLICIT(CrySimpleServer_cpp, jasper)
Code/Tools/CrySCompileServer/CrySCompileServer/Core/Server/CrySimpleServer.hpp
-1
View File
@@ -69,7 +69,6 @@ public:
// Shader Compilers ID
static const char* m_Orbis_DXC;
static const char* m_Durango_FXC;
static const char* m_Jasper_FXC;
static const char* m_D3D11_FXC;
static const char* m_GLSL_HLSLcc;
Code/Tools/CrySCompileServer/CrySCompileServer/CrySCompileServer.cpp
-3
View File
@@ -142,9 +142,6 @@ public:
SEnviropment::Instance().m_RunAsRoot = (runAsRoot == 1);
}
#if defined(TOOLS_SUPPORT_XENIA)
#include AZ_RESTRICTED_FILE_EXPLICIT(CrySCompileServer_cpp, xenia)
#endif
#if defined(TOOLS_SUPPORT_JASPER)
#include AZ_RESTRICTED_FILE_EXPLICIT(CrySCompileServer_cpp, jasper)
#endif