Normalize Shader vs Shaders Folders (#4925)

Normalize Shader vs Shaders Folders (#4925)
Signed-off-by: garrieta <garrieta@amazon.com>
monroegm-disable-blank-issue-2
galibzon 4 years ago committed by GitHub
parent c44d2a351b
commit da2ce2d7f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -7,10 +7,10 @@
#
set(FILES
Shader/DecomposeMsImage.azsl
Shader/DecomposeMsImage.shader
Shader/ImagePreview.azsl
Shader/ImagePreview.shader
Shaders/DecomposeMsImage.azsl
Shaders/DecomposeMsImage.shader
Shaders/ImagePreview.azsl
Shaders/ImagePreview.shader
ShaderLib/Atom/RPI/Math.azsli
ShaderLib/Atom/RPI/TangentSpace.azsli
ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli

@ -32,7 +32,7 @@ namespace AZ
//! The asset cache relative path of the only common shader asset for the RPI system that is used
//! as means to load the layout for scene srg and view srg. This is used to create any RPI::Scene.
AZStd::string m_commonSrgsShaderAssetPath = "shader/sceneandviewsrgs.azshader";
AZStd::string m_commonSrgsShaderAssetPath = "shaders/sceneandviewsrgs.azshader";
ImageSystemDescriptor m_imageSystemDescriptor;
GpuQuerySystemDescriptor m_gpuQuerySystemDescriptor;

@ -121,7 +121,7 @@ namespace AZ
m_fence->Init(*device, RHI::FenceState::Reset);
// Load shader and srg
const char* ShaderPath = "shader/decomposemsimage.azshader";
const char* ShaderPath = "shaders/decomposemsimage.azshader";
m_decomposeShader = LoadCriticalShader(ShaderPath);
if (m_decomposeShader == nullptr)

@ -244,7 +244,7 @@ namespace AZ
m_needsShaderLoad = false;
// Load Shader
const char* ShaderPath = "shader/imagepreview.azshader";
const char* ShaderPath = "shaders/imagepreview.azshader";
Data::Asset<ShaderAsset> shaderAsset = RPI::FindShaderAsset(ShaderPath);
m_shader = Shader::FindOrCreate(shaderAsset);
if (m_shader == nullptr)

@ -3,7 +3,7 @@
"Atom": {
"RPI": {
"Initialization": {
"CommonSrgsShaderAssetPath": "shader/sceneandviewsrgs.azshader",
"CommonSrgsShaderAssetPath": "shaders/sceneandviewsrgs.azshader",
"ImageSystemDescriptor": {
"AssetStreamingImagePoolSize": 2147483648, // 2 * 1024 * 1024 * 1024
"SystemStreamingImagePoolSize": 134217728, // 128 * 1024 * 1024

Loading…
Cancel
Save