diff --git a/cmd/tools/modules/testing/common.v b/cmd/tools/modules/testing/common.v index 18133c90bc..cf6c10ae40 100644 --- a/cmd/tools/modules/testing/common.v +++ b/cmd/tools/modules/testing/common.v @@ -282,12 +282,12 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession { if testing.github_job != 'misc-tooling' { // These examples need .h files that are produced from the supplied .glsl files, // using by the shader compiler tools in https://github.com/floooh/sokol-tools-bin/archive/pre-feb2021-api-changes.tar.gz - skip_files << 'examples/sokol/simple_shader_glsl/simple_shader.v' - skip_files << 'examples/sokol/sdf/sdf.v' skip_files << 'examples/sokol/02_cubes_glsl/cube_glsl.v' skip_files << 'examples/sokol/03_march_tracing_glsl/rt_glsl.v' skip_files << 'examples/sokol/04_multi_shader_glsl/rt_glsl.v' skip_files << 'examples/sokol/05_instancing_glsl/rt_glsl.v' + skip_files << 'examples/sokol/07_simple_shader_glsl/simple_shader.v' + skip_files << 'examples/sokol/08_sdf/sdf.v' // Skip obj_viewer code in the CI skip_files << 'examples/sokol/06_obj_viewer/show_obj.v' // skip the audio examples too on most CI jobs diff --git a/examples/sokol/simple_shader_glsl/.gitignore b/examples/sokol/07_simple_shader_glsl/.gitignore similarity index 100% rename from examples/sokol/simple_shader_glsl/.gitignore rename to examples/sokol/07_simple_shader_glsl/.gitignore diff --git a/examples/sokol/simple_shader_glsl/simple_shader.glsl b/examples/sokol/07_simple_shader_glsl/simple_shader.glsl similarity index 100% rename from examples/sokol/simple_shader_glsl/simple_shader.glsl rename to examples/sokol/07_simple_shader_glsl/simple_shader.glsl diff --git a/examples/sokol/simple_shader_glsl/simple_shader.v b/examples/sokol/07_simple_shader_glsl/simple_shader.v similarity index 98% rename from examples/sokol/simple_shader_glsl/simple_shader.v rename to examples/sokol/07_simple_shader_glsl/simple_shader.v index b53827b2a4..1bd7c63d0d 100644 --- a/examples/sokol/simple_shader_glsl/simple_shader.v +++ b/examples/sokol/07_simple_shader_glsl/simple_shader.v @@ -143,7 +143,7 @@ fn cleanup(user_data voidptr) { fn frame(user_data voidptr) { mut app := unsafe { &App(user_data) } - pass := sapp.create_default_pass(state.pass_action) + pass := sapp.create_default_pass(app.pass_action) gfx.begin_pass(&pass) gfx.apply_pipeline(app.shader_pipeline) diff --git a/examples/sokol/sdf/v.mod b/examples/sokol/07_simple_shader_glsl/v.mod similarity index 100% rename from examples/sokol/sdf/v.mod rename to examples/sokol/07_simple_shader_glsl/v.mod diff --git a/examples/sokol/sdf/.gitignore b/examples/sokol/08_sdf/.gitignore similarity index 100% rename from examples/sokol/sdf/.gitignore rename to examples/sokol/08_sdf/.gitignore diff --git a/examples/sokol/sdf/sdf.glsl b/examples/sokol/08_sdf/sdf.glsl similarity index 100% rename from examples/sokol/sdf/sdf.glsl rename to examples/sokol/08_sdf/sdf.glsl diff --git a/examples/sokol/sdf/sdf.v b/examples/sokol/08_sdf/sdf.v similarity index 100% rename from examples/sokol/sdf/sdf.v rename to examples/sokol/08_sdf/sdf.v diff --git a/examples/sokol/simple_shader_glsl/v.mod b/examples/sokol/08_sdf/v.mod similarity index 100% rename from examples/sokol/simple_shader_glsl/v.mod rename to examples/sokol/08_sdf/v.mod