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

More fixes to shaders with the latest dxc

Browse Source
This commit is contained in:
moudgils
2021-05-07 17:41:24 -07:00
parent 81dbcdc8e4
commit e2ca84ceb2
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.shader
+1 -2
View File
@@ -31,8 +31,7 @@
},
"CompilerHints" : {
"DisableOptimizations" : true,
"DxcGenerateDebugInfo" : true
"DisableOptimizations" : true
},
"ProgramSettings":
Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridDownsample_nomsaa.azsl
+2 -2
View File
@@ -70,8 +70,8 @@ PSOutput MainPS(VSOutput IN)
{
for (uint x = 0; x < ImageScale; ++x)
{
float depth = PassSrg::m_depth.Load(int3(screenCoords, 0), int2(x, y)).r;
float4 encodedNormal = PassSrg::m_normal.Load(int3(screenCoords, 0), int2(x, y));
float depth = PassSrg::m_depth.Load(int3(screenCoords + int2(x, y), 0)).r;
float4 encodedNormal = PassSrg::m_normal.Load(int3(screenCoords + int2(x, y), 0));
// take the closest depth sample to ensure we're getting the normal closest to the viewer
// (larger depth value due to reverse depth)
Gems/Atom/RHI/Code/Source/RHI.Edit/Utils.cpp
+1 -1
View File
@@ -308,7 +308,7 @@ namespace AZ
uint32_t exitCode = 0;
bool timedOut = false;
const AZStd::sys_time_t maxWaitTimeSeconds = 240;
const AZStd::sys_time_t maxWaitTimeSeconds = 120;
const AZStd::sys_time_t startTimeSeconds = AZStd::GetTimeNowSecond();
const AZStd::sys_time_t startTime = AZStd::GetTimeNowTicks();
Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/Vulkan_Traits_Windows.h
+1 -1
View File
@@ -11,7 +11,7 @@
*/
#pragma once
#define AZ_TRAIT_ATOM_SHADERBUILDER_DXC "Builders/DirectXShaderCompilerAz/dxc.exe"
#define AZ_TRAIT_ATOM_SHADERBUILDER_DXC "Builders/DirectXShaderCompiler/dxc.exe"
#define AZ_TRAIT_ATOM_VULKAN_DISABLE_DUAL_SOURCE_BLENDING 0
#define AZ_TRAIT_ATOM_VULKAN_DLL "vulkan.dll"
#define AZ_TRAIT_ATOM_VULKAN_DLL_1 "vulkan-1.dll"