AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CI fixes 

- Don't use named params with fmt (fixes Clang 10)
- Disable buildcache step for macOS
- Update zeus (fixes GCC 9)
This commit is contained in:
Luke Street 2022-06-03 02:01:36 -04:00
parent 0ba73696f5
commit af1814d3c7
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build.yml vendored
View File

@ -136,6 +136,7 @@ jobs:
run: cmake --build --preset x-macos-ci run: cmake --build --preset x-macos-ci
- name: Print buildcache stats - name: Print buildcache stats
if: 'false' # temporarily disabled
run: buildcache -s run: buildcache -s
build-ios: build-ios:

21
aurora/lib/gfx/gx_shader.cpp
View File

@ -1215,18 +1215,17 @@ wgpu::ShaderModule build_shader(const ShaderConfig& config, const ShaderInfo& in
fragmentFn += "\n prev = vec4<f32>(in.nrm, prev.a);"; fragmentFn += "\n prev = vec4<f32>(in.nrm, prev.a);";
} }
const auto shaderSource = const auto shaderSource = fmt::format(FMT_STRING(R"""({10}
fmt::format(FMT_STRING(R"""({uniformPre}
struct Uniform {{ struct Uniform {{
pos_mtx: mat4x3<f32>, pos_mtx: mat4x3<f32>,
nrm_mtx: mat4x3<f32>, nrm_mtx: mat4x3<f32>,
proj: mat4x4<f32>,{uniBufAttrs} proj: mat4x4<f32>,{0}
}}; }};
@group(0) @binding(0) @group(0) @binding(0)
var<uniform> ubuf: Uniform;{uniformBindings}{sampBindings}{texBindings} var<uniform> ubuf: Uniform;{3}{1}{2}
struct VertexOutput {{ struct VertexOutput {{
@builtin(position) pos: vec4<f32>,{vtxOutAttrs} @builtin(position) pos: vec4<f32>,{4}
}}; }};
fn intensityF32(rgb: vec3<f32>) -> f32 {{ fn intensityF32(rgb: vec3<f32>) -> f32 {{
@ -1274,21 +1273,19 @@ fn textureSamplePaletteRGB(tex: texture_2d<f32>, samp: sampler, uv: vec2<f32>, t
}} }}
@stage(vertex) @stage(vertex)
fn vs_main({vtxInAttrs} fn vs_main({5}
) -> VertexOutput {{ ) -> VertexOutput {{
var out: VertexOutput;{vtxXfrAttrsPre}{vtxXfrAttrs} var out: VertexOutput;{9}{6}
return out; return out;
}} }}
@stage(fragment) @stage(fragment)
fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {{{fragmentFnPre}{fragmentFn} fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {{{8}{7}
return prev; return prev;
}} }}
)"""), )"""),
"uniBufAttrs"_a = uniBufAttrs, "sampBindings"_a = sampBindings, "texBindings"_a = texBindings, uniBufAttrs, sampBindings, texBindings, uniformBindings, vtxOutAttrs,
"vtxOutAttrs"_a = vtxOutAttrs, "vtxInAttrs"_a = vtxInAttrs, "vtxXfrAttrs"_a = vtxXfrAttrs, vtxInAttrs, vtxXfrAttrs, fragmentFn, fragmentFnPre, vtxXfrAttrsPre, uniformPre);
"fragmentFn"_a = fragmentFn, "fragmentFnPre"_a = fragmentFnPre, "vtxXfrAttrsPre"_a = vtxXfrAttrsPre,
"uniformBindings"_a = uniformBindings, "uniformPre"_a = uniformPre);
if (EnableDebugPrints) { if (EnableDebugPrints) {
Log.report(logvisor::Info, FMT_STRING("Generated shader: {}"), shaderSource); Log.report(logvisor::Info, FMT_STRING("Generated shader: {}"), shaderSource);
} }

2
extern/zeus vendored

@ -1 +1 @@
Subproject commit 6547f76752682c187fb3e549f0f50e7494209a45 Subproject commit ac7d83009dae97a28ba779d00188e3d76e9b9821