Merge branch 'main' into Atom/mriegger/PLS

2021-05-04 17:15:41 -07:00
parent c58089d35a f79257e530
commit 19e28b18a0
19 changed files with 7 additions and 59 deletions
@@ -1,28 +0,0 @@
-/*
-* 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.
-*
-*/
-
-#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
@@ -10,11 +10,9 @@
 *
 */

-#ifndef AZ_COLLECTING_PARTIAL_SRGS
-#error Do not include this file directly. Include the main .srgi file instead.
-#endif
+#include <Atom/Features/SrgSemantics.azsli>

-partial ShaderResourceGroup RayTracingSceneSrg
+ShaderResourceGroup RayTracingSceneSrg : SRG_RayTracingScene
 {
    RaytracingAccelerationStructure m_scene;

@@ -152,6 +150,4 @@ partial ShaderResourceGroup RayTracingSceneSrg
    #define MESH_NORMAL_BUFFER_OFFSET   2
    
    ByteAddressBuffer m_meshBuffers[];
-}
-
-
+}
@@ -1,19 +0,0 @@
-/*
-* 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.
-*
-*/
-
-#pragma once
-
-// Please review README.md to understand how this file is used in RayTracingSceneSrg.azsrg generation 
-
-#ifdef AZ_COLLECTING_PARTIAL_SRGS
-#include <Atom/Feature/Common/Assets/ShaderResourceGroups/RayTracingSceneSrg.azsli>
-#endif
@@ -9904,4 +9904,4 @@
            ]
        }
    ]
-}
+}
@@ -280,8 +280,6 @@ set(FILES
    ShaderLib/Atom/Features/Shadow/Shadow.azsli
    ShaderLib/Atom/Features/Shadow/ShadowmapAtlasLib.azsli
    ShaderLib/Atom/Features/Vertex/VertexHelper.azsli
-    ShaderResourceGroups/RayTracingSceneSrg.azsli
-    ShaderResourceGroups/RayTracingSceneSrgAll.azsli
    ShaderResourceGroups/SceneSrg.azsli
    ShaderResourceGroups/SceneSrgAll.azsli
    ShaderResourceGroups/SceneTimeSrg.azsli
@@ -67,7 +67,7 @@ namespace AZ

            // load the RayTracingSceneSrg asset
            Data::Asset<RPI::ShaderResourceGroupAsset> rayTracingSceneSrgAsset =
-                RPI::AssetUtils::LoadAssetByProductPath<RPI::ShaderResourceGroupAsset>("shaderlib/raytracingscenesrg_raytracingscenesrg.azsrg", RPI::AssetUtils::TraceLevel::Error);
+                RPI::AssetUtils::LoadAssetByProductPath<RPI::ShaderResourceGroupAsset>("shaderlib/atom/features/raytracing/raytracingscenesrg_raytracingscenesrg.azsrg", RPI::AssetUtils::TraceLevel::Error);
            AZ_Assert(rayTracingSceneSrgAsset.IsReady(), "Failed to load RayTracingSceneSrg asset");

            m_rayTracingSceneSrg = RPI::ShaderResourceGroup::Create(rayTracingSceneSrgAsset);
@@ -32,7 +32,8 @@ include(cmake/LySet.cmake)
 # also allowed:
 # "s3://bucketname" (it will use LYPackage_S3Downloader.cmake to download it from a s3 bucket)

-set(LY_PACKAGE_SERVER_URLS "" CACHE STRING "Server URLS to fetch packages from")
+# https://d2c171ws20a1rv.cloudfront.net will be the current "production" CDN until formally moved to the public O3DE repo
+set(LY_PACKAGE_SERVER_URLS "https://d2c171ws20a1rv.cloudfront.net" CACHE STRING "Server URLS to fetch packages from")
 # Note: if you define the "LY_PACKAGE_SERVER_URLS" environment variable
 # it will be added to this value in the front, so that users can set
 # an env var and use that as an "additional" set of servers beyond the default set.