Updates to the DefaultProject template

Removes raytracingschenesrg.srgi
Updates to the root scenesrg.srgi (to match AtomSampleViewer)
Adds a SceneSrg.azsli and a README to the template
main
phistere 5 years ago
parent 3bc5ecd9d9
commit 9f46e34cc4

@ -0,0 +1,5 @@
# Customizing Shader Resource Groups
Please read:
*\<engine\>/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/README.md*
for details on how to customize scenesrg.srgi and viewsrg.srgi.

@ -1,30 +0,0 @@
// {BEGIN_LICENSE}
/*
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
* its licensors.
*
* For complete copyright and license terms please see the LICENSE at the root of this
* distribution (the "License"). All use of this software is governed by the License,
* or, if provided, by the license below or the license accompanying this file. Do not
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*
*/
// {END_LICENSE}
#pragma once
// Please read README.md for an explanation on why scenesrg.srgi and viewsrg.srgi are
// located in this folder (And how you can optionally customize your own scenesrg.srgi
// and viewsrg.srgi in your game project).
#include <Atom/Features/SrgSemantics.azsli>
partial ShaderResourceGroup RayTracingSceneSrg : SRG_RayTracingScene
{
/* Intentionally Empty. Helps define the SrgSemantic for RayTracingSceneSrg once.*/
};
#define AZ_COLLECTING_PARTIAL_SRGS
#include <Atom/Feature/Common/Assets/ShaderResourceGroups/RayTracingSceneSrgAll.azsli>
#undef AZ_COLLECTING_PARTIAL_SRGS

@ -26,5 +26,6 @@ partial ShaderResourceGroup SceneSrg : SRG_PerScene
};
#define AZ_COLLECTING_PARTIAL_SRGS
#include <Atom/Feature/Common/Assets/ShaderResourceGroups/SceneSrgAll.azsli>
#include <Shaders/ShaderResourceGroups/SceneSrg.azsli>
#include <Atom/Feature/Common/Assets/ShaderResourceGroups/SceneSrg.azsli>
#undef AZ_COLLECTING_PARTIAL_SRGS

@ -0,0 +1,24 @@
// {BEGIN_LICENSE}
/*
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
* its licensors.
*
* For complete copyright and license terms please see the LICENSE at the root of this
* distribution (the "License"). All use of this software is governed by the License,
* or, if provided, by the license below or the license accompanying this file. Do not
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*
*/
// {END_LICENSE}
#ifndef AZ_COLLECTING_PARTIAL_SRGS
#error Do not include this file directly. Include the main .srgi file instead.
#endif
partial ShaderResourceGroup SceneSrg
{
float m_time;
float m_deltaTime;
}

@ -577,10 +577,10 @@
"isOptional": false
},
{
"file": "ShaderLib/raytracingscenesrg.srgi",
"origin": "ShaderLib/raytracingscenesrg.srgi",
"file": "ShaderLib/README.md",
"origin": "ShaderLib/README.md",
"isTemplated": true,
"isOptional": false
"isOptional": true
},
{
"file": "ShaderLib/scenesrg.srgi",
@ -600,6 +600,12 @@
"isTemplated": true,
"isOptional": false
},
{
"file": "Shaders/ShaderResourceGroups/SceneSrg.azsli",
"origin": "Shaders/ShaderResourceGroups/SceneSrg.azsli",
"isTemplated": true,
"isOptional": false
},
{
"file": "autoexec.cfg",
"origin": "autoexec.cfg",

Loading…
Cancel
Save