Skip to content

Commit faa3463

Browse files
Merge pull request #1229 from dj2/robust_access
Update graphics robust access results
2 parents 9bb9e00 + b77be9f commit faa3463

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

checkout_glslang_spirv_tools.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
GLSLANG_REV=83af46951202c0f8cfdbe786b102805d9905b62d
4-
SPIRV_TOOLS_REV=47f3eb42641badfed31b110cc4dc840b1deb524a
3+
GLSLANG_REV=a4af7676feb011d61b1dfa8915bd41d9c5aaf22a
4+
SPIRV_TOOLS_REV=e82a428605f6ce0a07337b36f8ba3935c9f165ac
55
SPIRV_HEADERS_REV=204cd131c42b90d129073719f2766293ce35c081
66

77
if [ -z $PROTOCOL ]; then

reference/opt/shaders-ue4/asm/frag/texture-atomics.asm.graphics-robust-access.frag

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ fragment main0_out main0(main0_in in [[stage_in]], constant uint* spvBufferSizeC
8282
float3 _102 = float3(_100.x, _100.y, _70.z);
8383
_102.z = 1.0;
8484
uint _103 = in.in_var_TEXCOORD0 * 5u;
85-
uint _186 = clamp(_103 + 1u, 0u, ((CulledObjectBoxBoundsBufferSize - 0) / 16) - 1u);
86-
if (all(CulledObjectBoxBounds._m0[_186].xy > _96.xy) && all(CulledObjectBoxBounds._m0[clamp(_103, 0u, ((CulledObjectBoxBoundsBufferSize - 0) / 16) - 1u)].xyz < _102))
85+
uint _189 = uint(clamp(int(_103 + 1u), int(0u), int(min((((CulledObjectBoxBoundsBufferSize - 0) / 16) - 1u), 2147483647u))));
86+
if (all(CulledObjectBoxBounds._m0[_189].xy > _96.xy) && all(CulledObjectBoxBounds._m0[uint(clamp(int(_103), int(0u), int(min((((CulledObjectBoxBoundsBufferSize - 0) / 16) - 1u), 2147483647u))))].xyz < _102))
8787
{
8888
float _122 = _96.x;
8989
float _123 = _96.y;
@@ -104,8 +104,8 @@ fragment main0_out main0(main0_in in [[stage_in]], constant uint* spvBufferSizeC
104104
_158 = float3(500000.0);
105105
for (int _160 = 0; _160 < 8; )
106106
{
107-
float3 _166 = _73[int(clamp(uint(_160), uint(0), uint(7)))] - (float3(0.5) * (CulledObjectBoxBounds._m0[clamp(_103, 0u, ((CulledObjectBoxBoundsBufferSize - 0) / 16) - 1u)].xyz + CulledObjectBoxBounds._m0[_186].xyz));
108-
float3 _170 = float3(dot(_166, CulledObjectBoxBounds._m0[clamp(_103 + 2u, 0u, ((CulledObjectBoxBoundsBufferSize - 0) / 16) - 1u)].xyz), dot(_166, CulledObjectBoxBounds._m0[clamp(_103 + 3u, 0u, ((CulledObjectBoxBoundsBufferSize - 0) / 16) - 1u)].xyz), dot(_166, CulledObjectBoxBounds._m0[clamp(_103 + 4u, 0u, ((CulledObjectBoxBoundsBufferSize - 0) / 16) - 1u)].xyz));
107+
float3 _166 = _73[clamp(_160, 0, 7)] - (float3(0.5) * (CulledObjectBoxBounds._m0[uint(clamp(int(_103), int(0u), int(min((((CulledObjectBoxBoundsBufferSize - 0) / 16) - 1u), 2147483647u))))].xyz + CulledObjectBoxBounds._m0[_189].xyz));
108+
float3 _170 = float3(dot(_166, CulledObjectBoxBounds._m0[uint(clamp(int(_103 + 2u), int(0u), int(min((((CulledObjectBoxBoundsBufferSize - 0) / 16) - 1u), 2147483647u))))].xyz), dot(_166, CulledObjectBoxBounds._m0[uint(clamp(int(_103 + 3u), int(0u), int(min((((CulledObjectBoxBoundsBufferSize - 0) / 16) - 1u), 2147483647u))))].xyz), dot(_166, CulledObjectBoxBounds._m0[uint(clamp(int(_103 + 4u), int(0u), int(min((((CulledObjectBoxBoundsBufferSize - 0) / 16) - 1u), 2147483647u))))].xyz));
109109
_155 = fast::max(_155, _170);
110110
_158 = fast::min(_158, _170);
111111
_160++;

0 commit comments

Comments
 (0)