mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-14 15:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

ci,examples: fix v examples/sokol/simple_shader_glsl/simple_shader.v, ensure it compiles on the misc-tooling job (#19404)

Browse source
This commit is contained in:
Delyan Angelov 2023-09-21 19:44:58 +03:00 • committed by GitHub
parent baf5d8a102
commit c075e44ec1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cmd/tools/modules/testing/common.v
View file

@ -231,7 +231,7 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession {
skip_files << 'vlib/net/mbedtls/mbedtls_compiles_test.v' skip_files << 'vlib/net/mbedtls/mbedtls_compiles_test.v'
skip_files << 'vlib/net/ssl/ssl_compiles_test.v' skip_files << 'vlib/net/ssl/ssl_compiles_test.v'
} }
if testing.github_job != 'sokol-shaders-can-be-compiled' { if testing.github_job != 'misc-tooling' {
// These examples need .h files that are produced from the supplied .glsl files, // 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 // 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/simple_shader_glsl/simple_shader.v'
@ -241,6 +241,10 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession {
skip_files << 'examples/sokol/05_instancing_glsl/rt_glsl.v' skip_files << 'examples/sokol/05_instancing_glsl/rt_glsl.v'
// Skip obj_viewer code in the CI // Skip obj_viewer code in the CI
skip_files << 'examples/sokol/06_obj_viewer/show_obj.v' skip_files << 'examples/sokol/06_obj_viewer/show_obj.v'
// skip the audio examples too on most CI jobs
skip_files << 'examples/sokol/sounds/melody.v'
skip_files << 'examples/sokol/sounds/wav_player.v'
skip_files << 'examples/sokol/sounds/simple_sin_tones.v'
} }
if testing.github_job != 'ubuntu-tcc' { if testing.github_job != 'ubuntu-tcc' {
skip_files << 'examples/c_interop_wkhtmltopdf.v' // needs installation of wkhtmltopdf from https://github.com/wkhtmltopdf/packaging/releases skip_files << 'examples/c_interop_wkhtmltopdf.v' // needs installation of wkhtmltopdf from https://github.com/wkhtmltopdf/packaging/releases
@ -250,11 +254,6 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession {
skip_files << 'vlib/x/ttf/ttf_test.v' skip_files << 'vlib/x/ttf/ttf_test.v'
skip_files << 'vlib/vweb/vweb_app_test.v' // imports the `sqlite` module, which in turn includes sqlite3.h skip_files << 'vlib/vweb/vweb_app_test.v' // imports the `sqlite` module, which in turn includes sqlite3.h
} }
if testing.github_job != 'audio-examples' {
skip_files << 'examples/sokol/sounds/melody.v'
skip_files << 'examples/sokol/sounds/wav_player.v'
skip_files << 'examples/sokol/sounds/simple_sin_tones.v'
}
$if !macos { $if !macos {
skip_files << 'examples/macos_tray/tray.v' skip_files << 'examples/macos_tray/tray.v'
} }

4
examples/sokol/simple_shader_glsl/simple_shader.v
View file

@ -68,7 +68,7 @@ fn (mut a App) run() {
} }
fn init(user_data voidptr) { fn init(user_data voidptr) {
mut app := &App(user_data) mut app := unsafe { &App(user_data) }
mut desc := sapp.create_desc() mut desc := sapp.create_desc()
gfx.setup(&desc) gfx.setup(&desc)
@ -142,7 +142,7 @@ fn cleanup(user_data voidptr) {
} }
fn frame(user_data voidptr) { fn frame(user_data voidptr) {
mut app := &App(user_data) mut app := unsafe { &App(user_data) }
gfx.begin_default_pass(&app.pass_action, sapp.width(), sapp.height()) gfx.begin_default_pass(&app.pass_action, sapp.width(), sapp.height())