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

sokol: add missing `C` prefixes

pull/4447/head
Alexey 2020-04-16 16:53:34 +03:00 committed by GitHub
parent 714ff50322
commit 54226e74cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/sokol/drawing.v
View File

@ -4,7 +4,7 @@ import sokol.gfx
import sokol.sgl import sokol.sgl
struct AppState { struct AppState {
pass_action sg_pass_action pass_action C.sg_pass_action
} }
const ( const (
@ -16,7 +16,7 @@ fn main() {
pass_action: gfx.create_clear_pass(0.1, 0.1, 0.1, 1.0) pass_action: gfx.create_clear_pass(0.1, 0.1, 0.1, 1.0)
} }
title := 'Sokol Drawing Template' title := 'Sokol Drawing Template'
desc := sapp_desc{ desc := C.sapp_desc{
user_data: state user_data: state
init_userdata_cb: init init_userdata_cb: init
frame_userdata_cb: frame frame_userdata_cb: frame
@ -27,7 +27,7 @@ fn main() {
} }
fn init(user_data voidptr) { fn init(user_data voidptr) {
desc := sg_desc{ desc := C.sg_desc{
mtl_device: sapp.metal_get_device() mtl_device: sapp.metal_get_device()
mtl_renderpass_descriptor_cb: sapp.metal_get_renderpass_descriptor mtl_renderpass_descriptor_cb: sapp.metal_get_renderpass_descriptor
mtl_drawable_cb: sapp.metal_get_drawable mtl_drawable_cb: sapp.metal_get_drawable
@ -37,7 +37,7 @@ fn init(user_data voidptr) {
d3d11_depth_stencil_view_cb: sapp.d3d11_get_depth_stencil_view d3d11_depth_stencil_view_cb: sapp.d3d11_get_depth_stencil_view
} }
gfx.setup(&desc) gfx.setup(&desc)
sgl_desc := sgl_desc_t{} sgl_desc := C.sgl_desc_t{}
sgl.setup(&sgl_desc) sgl.setup(&sgl_desc)
} }

10
vlib/sokol/gfx/gfx.v
View File

@ -167,27 +167,27 @@ pub fn query_pixelformat(fmt PixelFormat) C.sg_pixelformat_info {
/* get current state of a resource (INITIAL, ALLOC, VALID, FAILED, INVALID) */ /* get current state of a resource (INITIAL, ALLOC, VALID, FAILED, INVALID) */
[inline] [inline]
pub fn query_buffer_state(buf C.sg_buffer) C.sg_resource_state { pub fn query_buffer_state(buf C.sg_buffer) C.sg_resource_state {
return sg_query_buffer_state(buf) return C.sg_query_buffer_state(buf)
} }
[inline] [inline]
pub fn query_image_state(img C.sg_image) C.sg_resource_state { pub fn query_image_state(img C.sg_image) C.sg_resource_state {
return sg_query_image_state(img) return C.sg_query_image_state(img)
} }
[inline] [inline]
pub fn query_shader_state(shd C.sg_shader) C.sg_resource_state { pub fn query_shader_state(shd C.sg_shader) C.sg_resource_state {
return sg_query_shader_state(shd) return C.sg_query_shader_state(shd)
} }
[inline] [inline]
pub fn query_pipeline_state(pip C.sg_pipeline) C.sg_resource_state { pub fn query_pipeline_state(pip C.sg_pipeline) C.sg_resource_state {
return sg_query_pipeline_state(pip) return C.sg_query_pipeline_state(pip)
} }
[inline] [inline]
pub fn query_pass_state(pass C.sg_pass) C.sg_resource_state { pub fn query_pass_state(pass C.sg_pass) C.sg_resource_state {
return sg_query_pass_state(pass) return C.sg_query_pass_state(pass)
} }
// get runtime information about a resource // get runtime information about a resource

54
vlib/sokol/gfx/gfx_structs.v
View File

@ -46,50 +46,50 @@ pub struct C.sg_pipeline {
pub: pub:
id u32 id u32
} }
pub fn (p C.sg_pipeline) free() { sg_destroy_pipeline(p) } pub fn (p C.sg_pipeline) free() { C.sg_destroy_pipeline(p) }
pub struct C.sg_bindings { pub struct C.sg_bindings {
pub mut: pub mut:
_start_canary u32 _start_canary u32
vertex_buffers [8]sg_buffer vertex_buffers [8]C.sg_buffer
vertex_buffer_offsets [8]int vertex_buffer_offsets [8]int
index_buffer sg_buffer index_buffer C.sg_buffer
index_buffer_offset int index_buffer_offset int
vs_images [8]sg_image vs_images [8]C.sg_image
fs_images [8]sg_image fs_images [8]C.sg_image
_end_canary u32 _end_canary u32
} }
pub fn (b mut sg_bindings) set_vert_image(index int, img C.sg_image) { pub fn (b mut C.sg_bindings) set_vert_image(index int, img C.sg_image) {
b.vs_images[index] = img b.vs_images[index] = img
} }
pub fn (b mut sg_bindings) set_frag_image(index int, img C.sg_image) { pub fn (b mut C.sg_bindings) set_frag_image(index int, img C.sg_image) {
b.fs_images[index] = img b.fs_images[index] = img
} }
pub fn (b &C.sg_bindings) update_vert_buffer(index int, data voidptr, element_size int, element_count int) { pub fn (b &C.sg_bindings) update_vert_buffer(index int, data voidptr, element_size int, element_count int) {
sg_update_buffer(b.vertex_buffers[index], data, element_size * element_count) C.sg_update_buffer(b.vertex_buffers[index], data, element_size * element_count)
} }
pub fn (b &C.sg_bindings) append_vert_buffer(index int, data voidptr, element_size int, element_count int) int { pub fn (b &C.sg_bindings) append_vert_buffer(index int, data voidptr, element_size int, element_count int) int {
return sg_append_buffer(b.vertex_buffers[index], data, element_size * element_count) return C.sg_append_buffer(b.vertex_buffers[index], data, element_size * element_count)
} }
pub fn (b &C.sg_bindings) update_index_buffer(data voidptr, element_size int, element_count int) { pub fn (b &C.sg_bindings) update_index_buffer(data voidptr, element_size int, element_count int) {
sg_update_buffer(b.index_buffer, data, element_size * element_count) C.sg_update_buffer(b.index_buffer, data, element_size * element_count)
} }
pub fn (b &C.sg_bindings) append_index_buffer(data voidptr, element_size int, element_count int) int { pub fn (b &C.sg_bindings) append_index_buffer(data voidptr, element_size int, element_count int) int {
return sg_append_buffer(b.index_buffer, data, element_size * element_count) return C.sg_append_buffer(b.index_buffer, data, element_size * element_count)
} }
pub struct C.sg_shader_desc { pub struct C.sg_shader_desc {
pub mut: pub mut:
_start_canary u32 _start_canary u32
attrs [16]sg_shader_attr_desc attrs [16]C.sg_shader_attr_desc
vs C.sg_shader_stage_desc vs C.sg_shader_stage_desc
fs C.sg_shader_stage_desc fs C.sg_shader_stage_desc
label byteptr label byteptr
@ -141,7 +141,7 @@ pub fn (desc mut C.sg_shader_desc) set_frag_uniform(block_index int, uniform_ind
} }
pub fn (desc &C.sg_shader_desc) make_shader() C.sg_shader { pub fn (desc &C.sg_shader_desc) make_shader() C.sg_shader {
return sg_make_shader(desc) return C.sg_make_shader(desc)
} }
@ -158,8 +158,8 @@ pub mut:
byte_code &byte byte_code &byte
byte_code_size int byte_code_size int
entry byteptr entry byteptr
uniform_blocks [4]sg_shader_uniform_block_desc uniform_blocks [4]C.sg_shader_uniform_block_desc
images [12]sg_shader_image_desc images [12]C.sg_shader_image_desc
} }
pub fn (desc mut C.sg_shader_stage_desc) set_image(index int, name string) C.sg_shader_stage_desc { pub fn (desc mut C.sg_shader_stage_desc) set_image(index int, name string) C.sg_shader_stage_desc {
@ -172,7 +172,7 @@ pub fn (desc mut C.sg_shader_stage_desc) set_image(index int, name string) C.sg_
pub struct C.sg_shader_uniform_block_desc { pub struct C.sg_shader_uniform_block_desc {
pub mut: pub mut:
size int size int
uniforms [16]sg_shader_uniform_desc uniforms [16]C.sg_shader_uniform_desc
} }
pub struct C.sg_shader_uniform_desc { pub struct C.sg_shader_uniform_desc {
@ -198,13 +198,13 @@ pub struct C.sg_shader {
pub: pub:
id u32 id u32
} }
pub fn (s C.sg_shader) free() { sg_destroy_shader(s) } pub fn (s C.sg_shader) free() { C.sg_destroy_shader(s) }
pub struct C.sg_pass_desc { pub struct C.sg_pass_desc {
pub mut: pub mut:
_start_canary u32 _start_canary u32
color_attachments [4]sg_attachment_desc color_attachments [4]C.sg_attachment_desc
depth_stencil_attachment C.sg_attachment_desc depth_stencil_attachment C.sg_attachment_desc
label byteptr label byteptr
_end_canary u32 _end_canary u32
@ -217,16 +217,16 @@ pub struct C.sg_pass_info {
pub struct C.sg_pass_action { pub struct C.sg_pass_action {
pub mut: pub mut:
_start_canary u32 _start_canary u32
colors [4]sg_color_attachment_action colors [4]C.sg_color_attachment_action
depth sg_depth_attachment_action depth C.sg_depth_attachment_action
stencil sg_stencil_attachment_action stencil C.sg_stencil_attachment_action
_end_canary u32 _end_canary u32
} }
pub struct C.sg_pass { pub struct C.sg_pass {
id u32 id u32
} }
pub fn (p C.sg_pass) free() { sg_destroy_pass(p) } pub fn (p C.sg_pass) free() { C.sg_destroy_pass(p) }
pub struct C.sg_buffer_desc { pub struct C.sg_buffer_desc {
@ -251,7 +251,7 @@ pub struct C.sg_buffer_info {}
pub struct C.sg_buffer { pub struct C.sg_buffer {
id u32 id u32
} }
pub fn (b C.sg_buffer) free() { sg_destroy_buffer(b) } pub fn (b C.sg_buffer) free() { C.sg_destroy_buffer(b) }
pub union DepthLayers { pub union DepthLayers {
@ -309,12 +309,12 @@ pub struct C.sg_image {
pub: pub:
id u32 id u32
} }
pub fn (i C.sg_image) free() { sg_destroy_image(i) } pub fn (i C.sg_image) free() { C.sg_destroy_image(i) }
pub struct C.sg_image_content { pub struct C.sg_image_content {
pub mut: pub mut:
subimage [6][16]sg_subimage_content subimage [6][16]C.sg_subimage_content
} }
pub struct C.sg_subimage_content { pub struct C.sg_subimage_content {
@ -346,8 +346,8 @@ pub:
pub struct C.sg_layout_desc { pub struct C.sg_layout_desc {
pub mut: pub mut:
buffers [8]sg_buffer_layout_desc buffers [8]C.sg_buffer_layout_desc
attrs [16]sg_vertex_attr_desc attrs [16]C.sg_vertex_attr_desc
} }
pub struct C.sg_buffer_layout_desc { pub struct C.sg_buffer_layout_desc {

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

@ -1,12 +1,12 @@
module gfx module gfx
pub fn create_clear_pass(r, g, b, a f32) C.sg_pass_action { pub fn create_clear_pass(r, g, b, a f32) C.sg_pass_action {
mut color_action := sg_color_attachment_action { mut color_action := C.sg_color_attachment_action {
action: C.SG_ACTION_CLEAR action: C.SG_ACTION_CLEAR
} }
color_action.set_color_values(r, g, b, a) color_action.set_color_values(r, g, b, a)
mut pass_action := sg_pass_action{} mut pass_action := C.sg_pass_action{}
pass_action.colors[0] = color_action pass_action.colors[0] = color_action
return pass_action return pass_action
} }

2
vlib/sokol/sapp/sapp_structs.v
View File

@ -50,7 +50,7 @@ pub:
scroll_x f32 scroll_x f32
scroll_y f32 scroll_y f32
num_touches int num_touches int
touches [8]sapp_touchpoint touches [8]C.sapp_touchpoint
window_width int window_width int
window_height int window_height int
framebuffer_width int framebuffer_width int