vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

sokol: use V type for SG_SHADERSTAGE_[VS|FS] (#13086)

pull/13090/head
Larpon 2022-01-07 18:52:44 +01:00 committed by GitHub
parent 5717066147
commit 5cffa1a2e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/sokol/02_cubes_glsl/cube_glsl.v
View File

@ -370,7 +370,7 @@ fn draw_cube_glsl(app App) {
ptr: &tr_matrix ptr: &tr_matrix
size: usize(4 * 16) size: usize(4 * 16)
} }
gfx.apply_uniforms(C.SG_SHADERSTAGE_VS, C.SLOT_vs_params, &vs_uniforms_range) gfx.apply_uniforms(.vs, C.SLOT_vs_params, &vs_uniforms_range)
// fs uniforms // fs uniforms
time_ticks := f32(time.ticks() - app.ticks) / 1000 time_ticks := f32(time.ticks() - app.ticks) / 1000
@ -384,7 +384,7 @@ fn draw_cube_glsl(app App) {
ptr: unsafe { &text_res } ptr: unsafe { &text_res }
size: usize(4 * 4) size: usize(4 * 4)
} }
gfx.apply_uniforms(C.SG_SHADERSTAGE_FS, C.SLOT_fs_params, &fs_uniforms_range) gfx.apply_uniforms(.fs, C.SLOT_fs_params, &fs_uniforms_range)
gfx.draw(0, (3 * 2) * 6, 1) gfx.draw(0, (3 * 2) * 6, 1)
gfx.end_pass() gfx.end_pass()

4
examples/sokol/03_march_tracing_glsl/rt_glsl.v
View File

@ -268,7 +268,7 @@ fn draw_cube_glsl(app App) {
ptr: &tr_matrix ptr: &tr_matrix
size: usize(4 * 16) size: usize(4 * 16)
} }
gfx.apply_uniforms(C.SG_SHADERSTAGE_VS, C.SLOT_vs_params, &vs_uniforms_range) gfx.apply_uniforms(.vs, C.SLOT_vs_params, &vs_uniforms_range)
// *** fragment shader uniforms *** // *** fragment shader uniforms ***
time_ticks := f32(time.ticks() - app.ticks) / 1000 time_ticks := f32(time.ticks() - app.ticks) / 1000
@ -286,7 +286,7 @@ fn draw_cube_glsl(app App) {
ptr: unsafe { &tmp_fs_params } ptr: unsafe { &tmp_fs_params }
size: usize(sizeof(tmp_fs_params)) size: usize(sizeof(tmp_fs_params))
} }
gfx.apply_uniforms(C.SG_SHADERSTAGE_FS, C.SLOT_fs_params, &fs_uniforms_range) gfx.apply_uniforms(.fs, C.SLOT_fs_params, &fs_uniforms_range)
// 3 vertices for triangle * 2 triangles per face * 6 faces = 36 vertices to draw // 3 vertices for triangle * 2 triangles per face * 6 faces = 36 vertices to draw
gfx.draw(0, (3 * 2) * 6, 1) gfx.draw(0, (3 * 2) * 6, 1)

8
examples/sokol/04_multi_shader_glsl/rt_glsl.v
View File

@ -377,7 +377,7 @@ fn draw_cube_glsl_m(app App) {
ptr: &tr_matrix ptr: &tr_matrix
size: usize(4 * 16) size: usize(4 * 16)
} }
gfx.apply_uniforms(C.SG_SHADERSTAGE_VS, C.SLOT_vs_params_m, &vs_uniforms_range) gfx.apply_uniforms(.vs, C.SLOT_vs_params_m, &vs_uniforms_range)
// *** fragment shader uniforms *** // *** fragment shader uniforms ***
time_ticks := f32(time.ticks() - app.ticks) / 1000 time_ticks := f32(time.ticks() - app.ticks) / 1000
@ -397,7 +397,7 @@ fn draw_cube_glsl_m(app App) {
ptr: unsafe { &tmp_fs_params } ptr: unsafe { &tmp_fs_params }
size: usize(sizeof(tmp_fs_params)) size: usize(sizeof(tmp_fs_params))
} }
gfx.apply_uniforms(C.SG_SHADERSTAGE_FS, C.SLOT_fs_params_p, &fs_uniforms_range) gfx.apply_uniforms(.fs, C.SLOT_fs_params_p, &fs_uniforms_range)
// 3 vertices for triangle * 2 triangles per face * 6 faces = 36 vertices to draw // 3 vertices for triangle * 2 triangles per face * 6 faces = 36 vertices to draw
gfx.draw(0, (3 * 2) * 3, 1) gfx.draw(0, (3 * 2) * 3, 1)
@ -429,7 +429,7 @@ fn draw_cube_glsl_p(app App) {
ptr: &tr_matrix ptr: &tr_matrix
size: usize(4 * 16) size: usize(4 * 16)
} }
gfx.apply_uniforms(C.SG_SHADERSTAGE_VS, C.SLOT_vs_params_p, &vs_uniforms_range) gfx.apply_uniforms(.vs, C.SLOT_vs_params_p, &vs_uniforms_range)
// *** fragment shader uniforms *** // *** fragment shader uniforms ***
time_ticks := f32(time.ticks() - app.ticks) / 1000 time_ticks := f32(time.ticks() - app.ticks) / 1000
@ -449,7 +449,7 @@ fn draw_cube_glsl_p(app App) {
ptr: unsafe { &tmp_fs_params } ptr: unsafe { &tmp_fs_params }
size: usize(sizeof(tmp_fs_params)) size: usize(sizeof(tmp_fs_params))
} }
gfx.apply_uniforms(C.SG_SHADERSTAGE_FS, C.SLOT_fs_params_p, &fs_uniforms_range) gfx.apply_uniforms(.fs, C.SLOT_fs_params_p, &fs_uniforms_range)
// 3 vertices for triangle * 2 triangles per face * 6 faces = 36 vertices to draw // 3 vertices for triangle * 2 triangles per face * 6 faces = 36 vertices to draw
gfx.draw(0, (3 * 2) * 3, 1) gfx.draw(0, (3 * 2) * 3, 1)

4
examples/sokol/05_instancing_glsl/rt_glsl.v
View File

@ -324,7 +324,7 @@ fn draw_cube_glsl_i(mut app App){
ptr: unsafe { &tr_matrix } ptr: unsafe { &tr_matrix }
size: usize(4 * 16) size: usize(4 * 16)
} }
gfx.apply_uniforms(C.SG_SHADERSTAGE_VS, C.SLOT_vs_params_i, &vs_uniforms_range) gfx.apply_uniforms(.vs, C.SLOT_vs_params_i, &vs_uniforms_range)
/* /*
// *** fragment shader uniforms *** // *** fragment shader uniforms ***
@ -342,7 +342,7 @@ fn draw_cube_glsl_i(mut app App){
ptr: unsafe { &tmp_fs_params } ptr: unsafe { &tmp_fs_params }
size: usize(sizeof(tmp_fs_params)) size: usize(sizeof(tmp_fs_params))
} }
gfx.apply_uniforms(C.SG_SHADERSTAGE_FS, C.SLOT_fs_params, &fs_uniforms_range) gfx.apply_uniforms(.fs, C.SLOT_fs_params, &fs_uniforms_range)
*/ */
// 3 vertices for triangle * 2 triangles per face * 6 faces = 36 vertices to draw for num_inst times // 3 vertices for triangle * 2 triangles per face * 6 faces = 36 vertices to draw for num_inst times
gfx.draw(0, (3 * 2) * 6, num_inst) gfx.draw(0, (3 * 2) * 6, num_inst)

4
examples/sokol/06_obj_viewer/modules/obj/rend.v
View File

@ -243,8 +243,8 @@ pub fn (obj_part ObjPart) bind_and_draw(rend_data_index int, in_data Shader_data
size: usize(in_data.fs_len) size: usize(in_data.fs_len)
} }
gfx.apply_uniforms(C.SG_SHADERSTAGE_VS, C.SLOT_vs_params, &vs_uniforms_range) gfx.apply_uniforms(.vs, C.SLOT_vs_params, &vs_uniforms_range)
gfx.apply_uniforms(C.SG_SHADERSTAGE_FS, C.SLOT_fs_params, &fs_uniforms_range) gfx.apply_uniforms(.fs, C.SLOT_fs_params, &fs_uniforms_range)
gfx.draw(0, int(part_render_data.n_vert), 1) gfx.draw(0, int(part_render_data.n_vert), 1)
return part_render_data.n_vert return part_render_data.n_vert
} }

4
vlib/sokol/gfx/gfx.c.v
View File

@ -131,8 +131,8 @@ pub fn apply_bindings(bindings &Bindings) {
} }
[inline] [inline]
pub fn apply_uniforms(stage int, ub_index int, data &Range) { pub fn apply_uniforms(stage ShaderStage, ub_index int, data &Range) {
C.sg_apply_uniforms(stage, ub_index, data) C.sg_apply_uniforms(int(stage), ub_index, data)
} }
[inline] [inline]