seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style: Enable clang-format's InsertBraces config

Browse Source 
This was part of our style guide since we started using clang-format
but the feature was only added in clang-format 15, and we hadn't
noticed it yet.
This commit is contained in:
Rémi Verschelde
2025-01-09 16:46:47 +01:00
parent 0e3a5eda86
commit 03c83cea1e
15 changed files with 127 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
modules/betsy/bc1.glsl
View File

@ -108,8 +108,9 @@ void OptimizeColorsBlock(const uint srcPixelsBlock[16], out float outMinEndp16,
// determine covariance matrix
float cov[6];
for (int i = 0; i < 6; ++i)
for (int i = 0; i < 6; ++i) {
cov[i] = 0;
}
for (int i = 0; i < 16; ++i) {
const float3 currColor = unpackUnorm4x8(srcPixelsBlock[i]).xyz * 255.0f;
@ -124,8 +125,9 @@ void OptimizeColorsBlock(const uint srcPixelsBlock[16], out float outMinEndp16,
}
// convert covariance matrix to float, find principal axis via power iter
for (int i = 0; i < 6; ++i)
for (int i = 0; i < 6; ++i) {
cov[i] /= 255.0f;
}
float3 vF = maxColor - minColor;
@ -180,8 +182,9 @@ uint MatchColorsBlock(const uint srcPixelsBlock[16], float3 color[4]) {
float3 dir = color[0] - color[1];
float stops[4];
for (int i = 0; i < 4; ++i)
for (int i = 0; i < 4; ++i) {
stops[i] = dot(color[i], dir);
}
// think of the colors as arranged on a line; project point onto that line, then choose
// next color out of available ones. we compute the crossover points for "best color in top
@ -203,10 +206,11 @@ uint MatchColorsBlock(const uint srcPixelsBlock[16], float3 color[4]) {
const float dotValue = dot(currColor, dir);
mask <<= 2u;
if (dotValue < halfPoint)
if (dotValue < halfPoint) {
mask |= ((dotValue < c0Point) ? 1u : 3u);
else
} else {
mask |= ((dotValue < c3Point) ? 2u : 0u);
}
}
#else
// with floyd-steinberg dithering
@ -228,10 +232,11 @@ uint MatchColorsBlock(const uint srcPixelsBlock[16], float3 color[4]) {
dotValue = dot(currColor, dir);
ditherDot = (dotValue * 16.0f) + (3 * ep2[1] + 5 * ep2[0]);
if (ditherDot < halfPoint)
if (ditherDot < halfPoint) {
step = (ditherDot < c0Point) ? 1u : 3u;
else
} else {
step = (ditherDot < c3Point) ? 2u : 0u;
}
ep1[0] = dotValue - stops[step];
lmask = step;
@ -239,10 +244,11 @@ uint MatchColorsBlock(const uint srcPixelsBlock[16], float3 color[4]) {
dotValue = dot(currColor, dir);
ditherDot = (dotValue * 16.0f) + (7 * ep1[0] + 3 * ep2[2] + 5 * ep2[1] + ep2[0]);
if (ditherDot < halfPoint)
if (ditherDot < halfPoint) {
step = (ditherDot < c0Point) ? 1u : 3u;
else
} else {
step = (ditherDot < c3Point) ? 2u : 0u;
}
ep1[1] = dotValue - stops[step];
lmask |= step << 2u;
@ -250,10 +256,11 @@ uint MatchColorsBlock(const uint srcPixelsBlock[16], float3 color[4]) {
dotValue = dot(currColor, dir);
ditherDot = (dotValue * 16.0f) + (7 * ep1[1] + 3 * ep2[3] + 5 * ep2[2] + ep2[1]);
if (ditherDot < halfPoint)
if (ditherDot < halfPoint) {
step = (ditherDot < c0Point) ? 1u : 3u;
else
} else {
step = (ditherDot < c3Point) ? 2u : 0u;
}
ep1[2] = dotValue - stops[step];
lmask |= step << 4u;
@ -261,10 +268,11 @@ uint MatchColorsBlock(const uint srcPixelsBlock[16], float3 color[4]) {
dotValue = dot(currColor, dir);
ditherDot = (dotValue * 16.0f) + (7 * ep1[2] + 5 * ep2[3] + ep2[2]);
if (ditherDot < halfPoint)
if (ditherDot < halfPoint) {
step = (ditherDot < c0Point) ? 1u : 3u;
else
} else {
step = (ditherDot < c3Point) ? 2u : 0u;
}
ep1[3] = dotValue - stops[step];
lmask |= step << 6u;
@ -294,8 +302,9 @@ bool RefineBlock(const uint srcPixelsBlock[16], uint mask, inout float inOutMinE
// yes, linear system would be singular; solve using optimal
// single-color match on average color
float3 rgbVal = float3(8.0f / 255.0f, 8.0f / 255.0f, 8.0f / 255.0f);
for (int i = 0; i < 16; ++i)
for (int i = 0; i < 16; ++i) {
rgbVal += unpackUnorm4x8(srcPixelsBlock[i]).xyz;
}
rgbVal = floor(rgbVal * (255.0f / 16.0f));