nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-30 10:45:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[glsl-out] Write space after if keyword

Browse Source
This commit is contained in:
Gordon-F 2021-06-12 22:03:01 +03:00 committed by Dzmitry Malyshau
parent 976ae3a9ff
commit d1f9575ed1
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/back/glsl/mod.rs
View File

@ -1242,7 +1242,7 @@ impl<'a, W: Write> Writer<'a, W> {
ref reject, ref reject,
} => { } => {
write!(self.out, "{}", INDENT.repeat(indent))?; write!(self.out, "{}", INDENT.repeat(indent))?;
write!(self.out, "if(")?; write!(self.out, "if (")?;
self.write_expr(condition, ctx)?; self.write_expr(condition, ctx)?;
writeln!(self.out, ") {{")?; writeln!(self.out, ") {{")?;

24
tests/out/boids.Compute.glsl
View File

@ -41,7 +41,7 @@ void main() {
vec2 vel1; vec2 vel1;
uint i = 0u; uint i = 0u;
uint index = global_invocation_id.x; uint index = global_invocation_id.x;
if((index >= 1500u)) { if ((index >= 1500u)) {
return; return;
} }
vec2 _expr10 = _group_0_binding_1.particles[index].pos; vec2 _expr10 = _group_0_binding_1.particles[index].pos;
@ -53,11 +53,11 @@ void main() {
colVel = vec2(0.0, 0.0); colVel = vec2(0.0, 0.0);
while(true) { while(true) {
uint _expr37 = i; uint _expr37 = i;
if((_expr37 >= 1500u)) { if ((_expr37 >= 1500u)) {
break; break;
} }
uint _expr39 = i; uint _expr39 = i;
if((_expr39 == index)) { if ((_expr39 == index)) {
continue; continue;
} }
uint _expr42 = i; uint _expr42 = i;
@ -69,7 +69,7 @@ void main() {
vec2 _expr51 = pos1; vec2 _expr51 = pos1;
vec2 _expr52 = vPos; vec2 _expr52 = vPos;
float _expr55 = _group_0_binding_0.rule1Distance; float _expr55 = _group_0_binding_0.rule1Distance;
if((distance(_expr51, _expr52) < _expr55)) { if ((distance(_expr51, _expr52) < _expr55)) {
vec2 _expr57 = cMass; vec2 _expr57 = cMass;
vec2 _expr58 = pos1; vec2 _expr58 = pos1;
cMass = (_expr57 + _expr58); cMass = (_expr57 + _expr58);
@ -79,7 +79,7 @@ void main() {
vec2 _expr63 = pos1; vec2 _expr63 = pos1;
vec2 _expr64 = vPos; vec2 _expr64 = vPos;
float _expr67 = _group_0_binding_0.rule2Distance; float _expr67 = _group_0_binding_0.rule2Distance;
if((distance(_expr63, _expr64) < _expr67)) { if ((distance(_expr63, _expr64) < _expr67)) {
vec2 _expr69 = colVel; vec2 _expr69 = colVel;
vec2 _expr70 = pos1; vec2 _expr70 = pos1;
vec2 _expr71 = vPos; vec2 _expr71 = vPos;
@ -88,7 +88,7 @@ void main() {
vec2 _expr74 = pos1; vec2 _expr74 = pos1;
vec2 _expr75 = vPos; vec2 _expr75 = vPos;
float _expr78 = _group_0_binding_0.rule3Distance; float _expr78 = _group_0_binding_0.rule3Distance;
if((distance(_expr74, _expr75) < _expr78)) { if ((distance(_expr74, _expr75) < _expr78)) {
vec2 _expr80 = cVel; vec2 _expr80 = cVel;
vec2 _expr81 = vel1; vec2 _expr81 = vel1;
cVel = (_expr80 + _expr81); cVel = (_expr80 + _expr81);
@ -99,14 +99,14 @@ void main() {
i = (_expr86 + 1u); i = (_expr86 + 1u);
} }
int _expr89 = cMassCount; int _expr89 = cMassCount;
if((_expr89 > 0)) { if ((_expr89 > 0)) {
vec2 _expr92 = cMass; vec2 _expr92 = cMass;
int _expr93 = cMassCount; int _expr93 = cMassCount;
vec2 _expr97 = vPos; vec2 _expr97 = vPos;
cMass = ((_expr92 / vec2(float(_expr93))) - _expr97); cMass = ((_expr92 / vec2(float(_expr93))) - _expr97);
} }
int _expr99 = cVelCount; int _expr99 = cVelCount;
if((_expr99 > 0)) { if ((_expr99 > 0)) {
vec2 _expr102 = cVel; vec2 _expr102 = cVel;
int _expr103 = cVelCount; int _expr103 = cVelCount;
cVel = (_expr102 / vec2(float(_expr103))); cVel = (_expr102 / vec2(float(_expr103)));
@ -127,19 +127,19 @@ void main() {
float _expr134 = _group_0_binding_0.deltaT; float _expr134 = _group_0_binding_0.deltaT;
vPos = (_expr131 + (_expr132 * _expr134)); vPos = (_expr131 + (_expr132 * _expr134));
vec2 _expr137 = vPos; vec2 _expr137 = vPos;
if((_expr137.x < -1.0)) { if ((_expr137.x < -1.0)) {
vPos.x = 1.0; vPos.x = 1.0;
} }
vec2 _expr143 = vPos; vec2 _expr143 = vPos;
if((_expr143.x > 1.0)) { if ((_expr143.x > 1.0)) {
vPos.x = -1.0; vPos.x = -1.0;
} }
vec2 _expr149 = vPos; vec2 _expr149 = vPos;
if((_expr149.y < -1.0)) { if ((_expr149.y < -1.0)) {
vPos.y = 1.0; vPos.y = 1.0;
} }
vec2 _expr155 = vPos; vec2 _expr155 = vPos;
if((_expr155.y > 1.0)) { if ((_expr155.y > 1.0)) {
vPos.y = -1.0; vPos.y = -1.0;
} }
vec2 _expr164 = vPos; vec2 _expr164 = vPos;

2
tests/out/quad.Fragment.glsl
View File

@ -15,7 +15,7 @@ layout(location = 0) out vec4 _fs2p_location0;
void main() { void main() {
vec2 uv2 = _vs2fs_location0; vec2 uv2 = _vs2fs_location0;
vec4 color = texture(_group_0_binding_0, vec2(uv2)); vec4 color = texture(_group_0_binding_0, vec2(uv2));
if((color.w == 0.0)) { if ((color.w == 0.0)) {
discard; discard;
} }
vec4 premultiplied = (color.w * color); vec4 premultiplied = (color.w * color);

4
tests/out/shadow.Fragment.glsl
View File

@ -23,7 +23,7 @@ smooth in vec4 _vs2fs_location1;
layout(location = 0) out vec4 _fs2p_location0; layout(location = 0) out vec4 _fs2p_location0;
float fetch_shadow(uint light_id, vec4 homogeneous_coords) { float fetch_shadow(uint light_id, vec4 homogeneous_coords) {
if((homogeneous_coords.w <= 0.0)) { if ((homogeneous_coords.w <= 0.0)) {
return 1.0; return 1.0;
} }
vec2 flip_correction = vec2(0.5, -0.5); vec2 flip_correction = vec2(0.5, -0.5);
@ -41,7 +41,7 @@ void main() {
while(true) { while(true) {
uint _expr12 = i; uint _expr12 = i;
uvec4 _expr14 = _group_0_binding_0.num_lights; uvec4 _expr14 = _group_0_binding_0.num_lights;
if((_expr12 >= min(_expr14.x, 10u))) { if ((_expr12 >= min(_expr14.x, 10u))) {
break; break;
} }
uint _expr19 = i; uint _expr19 = i;