Skip to content

Commit 043b29a

Browse files
GS/HW: Fix shader compile errors and warnings from AA1 on GL.
1 parent d9e0cd5 commit 043b29a

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

bin/resources/shaders/dx11/tfx.fx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1438,8 +1438,8 @@ uint load_index(uint _i)
14381438
{
14391439
uint i = _i + BaseIndex;
14401440
// i is even => load lower 16 bits; i odd => load upper 16 bits.
1441-
uint shift = (i & 1) << 4;
1442-
return (IndexBuffer.Load(i >> 1) >> shift) & 0xFFFF;
1441+
uint shift = (i & 1u) << 4u;
1442+
return (IndexBuffer.Load(i >> 1u) >> shift) & 0xFFFFu;
14431443
}
14441444

14451445
VS_INPUT load_vertex(uint index)

bin/resources/shaders/opengl/tfx_vgs.glsl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ out SHADER
3737
flat vec4 c;
3838
#endif
3939
float inv_cov; // We use the inverse to make it simpler to interpolate.
40-
uint interior; // 1 for triangle interior; 0 for edge;
40+
flat uint interior; // 1 for triangle interior; 0 for edge.
4141
} VSout;
4242

4343
const float exp_min32 = exp2(-32.0f);
@@ -138,8 +138,8 @@ uint load_index(uint _i)
138138
{
139139
uint i = _i + BaseIndex;
140140
// i is even => load lower 16 bits; i odd => load upper 16 bits.
141-
uint shift = (i & 1) << 4;
142-
return (index_buffer[i >> 1] >> shift) & 0xFFFF;
141+
uint shift = (i & 1u) << 4u;
142+
return (index_buffer[i >> 1u] >> shift) & 0xFFFFu;
143143
}
144144

145145
ProcessedVertex load_vertex(uint index)

bin/resources/shaders/vulkan/tfx.glsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ uint load_index(uint _i)
140140
{
141141
uint i = _i + BaseIndex;
142142
// i is even => load lower 16 bits; i odd => load upper 16 bits.
143-
uint shift = (i & 1) << 4;
144-
return (index_buffer[i >> 1] >> shift) & 0xFFFF;
143+
uint shift = (i & 1u) << 4u;
144+
return (index_buffer[i >> 1u] >> shift) & 0xFFFFu;
145145
}
146146

147147
ProcessedVertex load_vertex(uint index)

pcsx2/ShaderCacheVersion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
/// Version number for GS and other shaders. Increment whenever any of the contents of the
55
/// shaders change, to invalidate the cache.
6-
static constexpr u32 SHADER_CACHE_VERSION = 86; // Last changed in PR 13681
6+
static constexpr u32 SHADER_CACHE_VERSION = 87; // Last changed in PR 14336

0 commit comments

Comments
 (0)