mirror of https://github.com/OpenRCT2/OpenRCT2.git
Add clang format for shaders (#21066)
This commit is contained in:
parent
042d555d9a
commit
5b42da2646
|
@ -1,11 +1,13 @@
|
||||||
#version 150
|
#version 150
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
uniform usampler2D uOpaqueTex;
|
uniform usampler2D uOpaqueTex;
|
||||||
uniform sampler2D uOpaqueDepth;
|
uniform sampler2D uOpaqueDepth;
|
||||||
uniform usampler2D uTransparentTex;
|
uniform usampler2D uTransparentTex;
|
||||||
uniform sampler2D uTransparentDepth;
|
uniform sampler2D uTransparentDepth;
|
||||||
uniform usampler2D uPaletteTex;
|
uniform usampler2D uPaletteTex;
|
||||||
uniform usampler2D uBlendPaletteTex;
|
uniform usampler2D uBlendPaletteTex;
|
||||||
|
// clang-format off
|
||||||
|
|
||||||
in vec2 fTextureCoordinate;
|
in vec2 fTextureCoordinate;
|
||||||
|
|
||||||
|
|
|
@ -5,10 +5,12 @@ const float DEPTH_INCREMENT = 1.0 / float(1u << 22u);
|
||||||
|
|
||||||
uniform ivec2 uScreenSize;
|
uniform ivec2 uScreenSize;
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
in ivec4 vBounds;
|
in ivec4 vBounds;
|
||||||
in ivec4 vClip;
|
in ivec4 vClip;
|
||||||
in uint vColour;
|
in uint vColour;
|
||||||
in int vDepth;
|
in int vDepth;
|
||||||
|
// clang-format on
|
||||||
|
|
||||||
in mat4x2 vVertMat;
|
in mat4x2 vVertMat;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#version 150
|
#version 150
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
const int MASK_REMAP_COUNT = 3;
|
const int MASK_REMAP_COUNT = 3;
|
||||||
const int FLAG_NO_TEXTURE = (1 << 2);
|
const int FLAG_NO_TEXTURE = (1 << 2);
|
||||||
const int FLAG_MASK = (1 << 3);
|
const int FLAG_MASK = (1 << 3);
|
||||||
|
@ -18,8 +19,9 @@ in vec3 fTexColour;
|
||||||
in vec3 fTexMask;
|
in vec3 fTexMask;
|
||||||
flat in vec3 fPalettes;
|
flat in vec3 fPalettes;
|
||||||
|
|
||||||
in vec2 fPosition;
|
in vec2 fPosition;
|
||||||
in vec3 fPeelPos;
|
in vec3 fPeelPos;
|
||||||
|
// clang-format on
|
||||||
|
|
||||||
out uint oColour;
|
out uint oColour;
|
||||||
|
|
||||||
|
@ -49,17 +51,17 @@ void main()
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
uint hint_thresh = uint(fFlags & 0xff00) >> 8;
|
uint hint_thresh = uint(fFlags & 0xff00) >> 8;
|
||||||
if(hint_thresh > 0u)
|
if (hint_thresh > 0u)
|
||||||
{
|
{
|
||||||
bool solidColor = texel > 180u;
|
bool solidColor = texel > 180u;
|
||||||
texel = (texel > hint_thresh) ? fColour : 0u;
|
texel = (texel > hint_thresh) ? fColour : 0u;
|
||||||
texel = texel << 8;
|
texel = texel << 8;
|
||||||
if(solidColor)
|
if (solidColor)
|
||||||
{
|
{
|
||||||
texel += 1u;
|
texel += 1u;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
texel = fColour;
|
texel = fColour;
|
||||||
}
|
}
|
||||||
|
@ -101,7 +103,7 @@ void main()
|
||||||
if ((fFlags & FLAG_MASK) != 0)
|
if ((fFlags & FLAG_MASK) != 0)
|
||||||
{
|
{
|
||||||
uint mask = texture(uTexture, fTexMask).r;
|
uint mask = texture(uTexture, fTexMask).r;
|
||||||
if ( mask == 0u )
|
if (mask == 0u)
|
||||||
{
|
{
|
||||||
discard;
|
discard;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,7 @@ const float DEPTH_INCREMENT = 1.0 / float(1u << 22u);
|
||||||
|
|
||||||
uniform ivec2 uScreenSize;
|
uniform ivec2 uScreenSize;
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
in ivec4 vClip;
|
in ivec4 vClip;
|
||||||
in int vTexColourAtlas;
|
in int vTexColourAtlas;
|
||||||
in vec4 vTexColourBounds;
|
in vec4 vTexColourBounds;
|
||||||
|
@ -26,11 +27,13 @@ flat out uint fColour;
|
||||||
out vec3 fTexColour;
|
out vec3 fTexColour;
|
||||||
out vec3 fTexMask;
|
out vec3 fTexMask;
|
||||||
flat out vec3 fPalettes;
|
flat out vec3 fPalettes;
|
||||||
|
// clang-format on
|
||||||
|
|
||||||
void main()
|
void main()
|
||||||
{
|
{
|
||||||
// Clamp position by vClip, correcting interpolated values for the clipping
|
// Clamp position by vClip, correcting interpolated values for the clipping
|
||||||
vec2 m = clamp(((vVertMat * vec4(vClip)) - (vVertMat * vec4(vBounds)))/vec2(vBounds.zw - vBounds.xy) + vVertVec, 0.0, 1.0);
|
vec2 m = clamp(
|
||||||
|
((vVertMat * vec4(vClip)) - (vVertMat * vec4(vBounds))) / vec2(vBounds.zw - vBounds.xy) + vVertVec, 0.0, 1.0);
|
||||||
vec2 pos = mix(vec2(vBounds.xy), vec2(vBounds.zw), m);
|
vec2 pos = mix(vec2(vBounds.xy), vec2(vBounds.zw), m);
|
||||||
fTexColour = vec3(mix(vTexColourBounds.xy, vTexColourBounds.zw, m), vTexColourAtlas);
|
fTexColour = vec3(mix(vTexColourBounds.xy, vTexColourBounds.zw, m), vTexColourAtlas);
|
||||||
fTexMask = vec3(mix(vTexMaskBounds.xy, vTexMaskBounds.zw, m), vTexMaskAtlas);
|
fTexMask = vec3(mix(vTexMaskBounds.xy, vTexMaskBounds.zw, m), vTexMaskAtlas);
|
||||||
|
|
|
@ -16,4 +16,4 @@ fi
|
||||||
basedir="$($readlink_bin -f `dirname $0`/..)"
|
basedir="$($readlink_bin -f `dirname $0`/..)"
|
||||||
cd $basedir
|
cd $basedir
|
||||||
|
|
||||||
scripts/run-clang-format.py -r src test --exclude src/thirdparty
|
scripts/run-clang-format.py -r src test data/shaders --exclude src/thirdparty
|
||||||
|
|
|
@ -25,7 +25,7 @@ import traceback
|
||||||
|
|
||||||
from functools import partial
|
from functools import partial
|
||||||
|
|
||||||
DEFAULT_EXTENSIONS = 'c,h,C,H,cpp,hpp,cc,hh,c++,h++,cxx,hxx'
|
DEFAULT_EXTENSIONS = 'c,h,C,H,cpp,hpp,cc,hh,c++,h++,cxx,hxx,vert,frag'
|
||||||
|
|
||||||
|
|
||||||
class ExitStatus:
|
class ExitStatus:
|
||||||
|
|
Loading…
Reference in New Issue