sokol: remove duplicate types

Author: medvednikov

vlib/sokol/c/declaration.c.v

@@ -117,4 +117,8 @@ $if !no_sokol_app ? {
 #define SOKOL_NO_DEPRECATED
 #include "sokol_gfx.h"
 
+@[use_once]
+#define SOKOL_IMPL
+#include "util/sokol_gl.h"
+
 #include "sokol_v.post.h"

vlib/sokol/f/f.v

@@ -0,0 +1,12 @@
+module f
+
+import fontstash as _
+import sokol.c as _
+
+#flag linux -I.
+
+//#include "ft2build.h"
+
+@[use_once]
+#define SOKOL_FONTSTASH_IMPL
+#include "util/sokol_fontstash.h"

vlib/sokol/sapp/enums.v vlib/sokol/sapp/enums.c.vvlib/sokol/sapp/enums.v renamed to vlib/sokol/sapp/enums.c.v

@@ -36,33 +36,17 @@ pub enum MouseButton {
 }
 
 pub enum MouseCursor {
-	default       = 0
-	arrow         = 1
-	ibeam         = 2
-	crosshair     = 3
-	pointing_hand = 4
-	resize_ew     = 5
-	resize_ns     = 6
-	resize_nwse   = 7
-	resize_nesw   = 8
-	resize_all    = 9
-	not_allowed   = 10
-	custom_0      = 11
-	custom_1      = 12
-	custom_2      = 13
-	custom_3      = 14
-	custom_4      = 15
-	custom_5      = 16
-	custom_6      = 17
-	custom_7      = 18
-	custom_8      = 19
-	custom_9      = 20
-	custom_10     = 21
-	custom_11     = 22
-	custom_12     = 23
-	custom_13     = 24
-	custom_14     = 25
-	custom_15     = 26
+	default       = C.SAPP_MOUSECURSOR_DEFAULT
+	arrow         = C.SAPP_MOUSECURSOR_ARROW
+	ibeam         = C.SAPP_MOUSECURSOR_IBEAM
+	crosshair     = C.SAPP_MOUSECURSOR_CROSSHAIR
+	pointing_hand = C.SAPP_MOUSECURSOR_POINTING_HAND
+	resize_ew     = C.SAPP_MOUSECURSOR_RESIZE_EW
+	resize_ns     = C.SAPP_MOUSECURSOR_RESIZE_NS
+	resize_nwse   = C.SAPP_MOUSECURSOR_RESIZE_NWSE
+	resize_nesw   = C.SAPP_MOUSECURSOR_RESIZE_NESW
+	resize_all    = C.SAPP_MOUSECURSOR_RESIZE_ALL
+	not_allowed   = C.SAPP_MOUSECURSOR_NOT_ALLOWED
 }
 
 pub enum Modifier {

vlib/sokol/sapp/sapp.v vlib/sokol/sapp/sapp.c.vvlib/sokol/sapp/sapp.v renamed to vlib/sokol/sapp/sapp.c.v

@@ -5,9 +5,8 @@ import sokol.gfx
 import sokol.memory
 
 // Android needs a global reference to `g_desc`
-__global g_desc Desc
+__global g_desc C.sapp_desc
 
-// create_desc creates a default `gfx.Desc` configured for use with `sapp`.
 pub fn create_desc() gfx.Desc {
 	return gfx.Desc{
 		environment:     glue_environment()
@@ -23,46 +22,28 @@ pub fn create_default_pass(action gfx.PassAction) gfx.Pass {
 	}
 }
 
-// sapp_to_gfx_pixel_format translates sapp_pixel_format to gfx.PixelFormat.
-// sokol_app.h uses a compact pixel format enum (sapp_pixel_format) that does NOT
-// match the sg_pixel_format numbering used by sokol_gfx.h.
-fn sapp_to_gfx_pixel_format(sapp_fmt int) gfx.PixelFormat {
-	return match sapp_fmt {
-		0 { gfx.PixelFormat._default } // _SAPP_PIXELFORMAT_DEFAULT
-		1 { gfx.PixelFormat.none } // SAPP_PIXELFORMAT_NONE
-		2 { gfx.PixelFormat.rgba8 } // SAPP_PIXELFORMAT_RGBA8
-		3 { gfx.PixelFormat.srgb8a8 } // SAPP_PIXELFORMAT_SRGB8A8
-		4 { gfx.PixelFormat.bgra8 } // SAPP_PIXELFORMAT_BGRA8
-		5 { gfx.PixelFormat.bgra8 } // SAPP_PIXELFORMAT_SBGRA8 (no exact sg match, use bgra8)
-		6 { gfx.PixelFormat.depth } // SAPP_PIXELFORMAT_DEPTH
-		7 { gfx.PixelFormat.depth_stencil } // SAPP_PIXELFORMAT_DEPTH_STENCIL
-		else { gfx.PixelFormat.none }
-	}
-}
-
 // glue_environment returns a `gfx.Environment` compatible for use with `sapp` specific `gfx.Pass`es.
-// The returned `gfx.Environment` can be used when rendering via `sapp`.
+// The retuned `gfx.Environment` can be used when rendering via `sapp`.
 // See also: documentation at the top of thirdparty/sokol/sokol_gfx.h
 pub fn glue_environment() gfx.Environment {
 	sapp_env := C.sapp_get_environment()
 	mut env := gfx.Environment{}
 	unsafe { vmemset(&env, 0, int(sizeof(env))) }
-	env.defaults.color_format = sapp_to_gfx_pixel_format(sapp_env.defaults.color_format)
-	env.defaults.depth_format = sapp_to_gfx_pixel_format(sapp_env.defaults.depth_format)
+	env.defaults.color_format = gfx.PixelFormat.from(sapp_env.defaults.color_format) or {
+		gfx.PixelFormat.none
+	}
+	env.defaults.depth_format = gfx.PixelFormat.from(sapp_env.defaults.depth_format) or {
+		gfx.PixelFormat.none
+	}
 	env.defaults.sample_count = sapp_env.defaults.sample_count
 	$if macos && !darwin_sokol_glcore33 ? {
 		env.metal.device = sapp_env.metal.device
 	}
-	// if windows and dx3d11
-	// env.d3d11.device = sapp_env.d3d11.device
-	// env.d3d11.device_context = sapp_env.d3d11.device_context
-	// if webgpu
-	// env.wgpu.device = sapp_env.wgpu.device
 	return env
 }
 
 // glue_swapchain returns a `gfx.Swapchain` compatible for use with `sapp` specific display/rendering `gfx.Pass`es.
-// The returned `gfx.Swapchain` can be used when rendering via `sapp`.
+// The retuned `gfx.Swapchain` can be used when rendering via `sapp`.
 // See also: documentation at the top of thirdparty/sokol/sokol_gfx.h
 pub fn glue_swapchain() gfx.Swapchain {
 	sapp_sc := C.sapp_get_swapchain()
@@ -71,22 +52,13 @@ pub fn glue_swapchain() gfx.Swapchain {
 	swapchain.width = sapp_sc.width
 	swapchain.height = sapp_sc.height
 	swapchain.sample_count = sapp_sc.sample_count
-	swapchain.color_format = sapp_to_gfx_pixel_format(sapp_sc.color_format)
-	swapchain.depth_format = sapp_to_gfx_pixel_format(sapp_sc.depth_format)
+	swapchain.color_format = gfx.PixelFormat.from(sapp_sc.color_format) or { gfx.PixelFormat.none }
+	swapchain.depth_format = gfx.PixelFormat.from(sapp_sc.depth_format) or { gfx.PixelFormat.none }
 	$if macos && !darwin_sokol_glcore33 ? {
 		swapchain.metal.current_drawable = sapp_sc.metal.current_drawable
 		swapchain.metal.depth_stencil_texture = sapp_sc.metal.depth_stencil_texture
 		swapchain.metal.msaa_color_texture = sapp_sc.metal.msaa_color_texture
-	}
-	// if windows and dx3d11
-	// swapchain.d3d11.render_view = sapp_sc.d3d11.render_view
-	// swapchain.d3d11.resolve_view = sapp_sc.d3d11.resolve_view
-	// swapchain.d3d11.depth_stencil_view = sapp_sc.d3d11.depth_stencil_view
-	// if webgpu
-	// swapchain.wgpu.render_view = sapp_sc.wgpu.render_view
-	// swapchain.wgpu.resolve_view = sapp_sc.wgpu.resolve_view
-	// swapchain.wgpu.depth_stencil_view = sapp_sc.wgpu.depth_stencil_view
-	$else {
+	} $else {
 		swapchain.gl.framebuffer = sapp_sc.gl.framebuffer
 	}
 	return swapchain
@@ -164,37 +136,17 @@ pub fn set_mouse_cursor(cursor MouseCursor) {
 	C.sapp_set_mouse_cursor(cursor)
 }
 
-// get current mouse cursor type
-@[inline]
-pub fn get_mouse_cursor() MouseCursor {
-	return C.sapp_get_mouse_cursor()
-}
-
-// bind a custom mouse cursor image to a cursor type
-@[inline]
-pub fn bind_mouse_cursor_image(cursor MouseCursor, desc &ImageDesc) MouseCursor {
-	return C.sapp_bind_mouse_cursor_image(cursor, desc)
-}
-
-// unbind a custom mouse cursor image
-@[inline]
-pub fn unbind_mouse_cursor_image(cursor MouseCursor) {
-	C.sapp_unbind_mouse_cursor_image(cursor)
-}
-
 // show or hide the mouse cursor
 @[inline]
 pub fn mouse_shown() bool {
 	return C.sapp_mouse_shown()
 }
 
-// lock_mouse locks or unlocks the mouse cursor, confining it to the window.
 @[inline]
 pub fn lock_mouse(locked bool) {
 	C.sapp_lock_mouse(locked)
 }
 
-// mouse_locked returns true if the mouse is currently locked to the window.
 @[inline]
 pub fn mouse_locked() bool {
 	return C.sapp_mouse_locked()
@@ -260,12 +212,6 @@ pub fn get_clipboard_string() &char {
 	return &char(C.sapp_get_clipboard_string())
 }
 
-// set the window icon (only on Windows and Linux)
-@[inline]
-pub fn set_icon(icon_desc &IconDesc) {
-	C.sapp_set_icon(icon_desc)
-}
-
 // special run-function for SOKOL_NO_ENTRY (in standard mode this is an empty stub)
 pub fn run(desc &Desc) {
 	if desc.allocator.alloc_fn == unsafe { nil } && desc.allocator.free_fn == unsafe { nil } {
@@ -284,42 +230,12 @@ pub fn run(desc &Desc) {
 	C.sapp_run(desc)
 }
 
-// get runtime environment information
-@[inline]
-pub fn get_environment() Environment {
-	return C.sapp_get_environment()
-}
-
-// get current frame's swapchain information (call once per frame!)
-@[inline]
-pub fn get_swapchain() Swapchain {
-	return C.sapp_get_swapchain()
-}
-
 // HTML5: enable or disable the hardwired "Leave Site?" dialog box
 @[inline]
 pub fn html5_ask_leave_site(ask bool) {
 	C.sapp_html5_ask_leave_site(ask)
 }
 
-// HTML5: get byte size of a dropped file
-@[inline]
-pub fn html5_get_dropped_file_size(index int) u32 {
-	return C.sapp_html5_get_dropped_file_size(index)
-}
-
-// EGL: get EGLDisplay object
-@[inline]
-pub fn egl_get_display() voidptr {
-	return C.sapp_egl_get_display()
-}
-
-// EGL: get EGLContext object
-@[inline]
-pub fn egl_get_context() voidptr {
-	return C.sapp_egl_get_context()
-}
-
 // macOS: get ARC-bridged pointer to macOS NSWindow
 @[inline]
 pub fn macos_get_window() voidptr {
@@ -332,52 +248,22 @@ pub fn ios_get_window() voidptr {
 	return voidptr(C.sapp_ios_get_window())
 }
 
-// D3D11: get pointer to IDXGISwapChain object
-@[inline]
-pub fn d3d11_get_swap_chain() voidptr {
-	return voidptr(C.sapp_d3d11_get_swap_chain())
-}
-
 // Win32: get the HWND window handle
 @[inline]
 pub fn win32_get_hwnd() voidptr {
 	return voidptr(C.sapp_win32_get_hwnd())
 }
 
-// GL: get major version
-@[inline]
-pub fn gl_get_major_version() int {
-	return C.sapp_gl_get_major_version()
-}
-
-// GL: get minor version
-@[inline]
-pub fn gl_get_minor_version() int {
-	return C.sapp_gl_get_minor_version()
-}
-
-// GL: return true if the context is GLES
-@[inline]
-pub fn gl_is_gles() bool {
-	return C.sapp_gl_is_gles()
-}
-
 // GL: get framebuffer object
 @[inline]
 pub fn gl_get_framebuffer() u32 {
 	return C.sapp_gl_get_framebuffer()
 }
 
-// X11: get Window
-@[inline]
-pub fn x11_get_window() voidptr {
-	return voidptr(C.sapp_x11_get_window())
-}
-
-// X11: get Display
+// Android: get native activity handle
 @[inline]
-pub fn x11_get_display() voidptr {
-	return voidptr(C.sapp_x11_get_display())
+pub fn android_get_native_activity() voidptr {
+	return voidptr(C.sapp_android_get_native_activity())
 }
 
 // Toggle full screen
@@ -392,22 +278,14 @@ pub fn is_fullscreen() bool {
 	return C.sapp_is_fullscreen()
 }
 
-// get_num_dropped_files returns the number of files dropped onto the window.
 @[inline]
 pub fn get_num_dropped_files() int {
 	return C.sapp_get_num_dropped_files()
 }
 
-// get_dropped_file_path returns the path of a dropped file by index.
 @[inline]
 pub fn get_dropped_file_path(index int) string {
 	unsafe {
 		return cstring_to_vstring(C.sapp_get_dropped_file_path(index))
 	}
 }
-
-// Android: get native activity handle
-@[inline]
-pub fn android_get_native_activity() voidptr {
-	return voidptr(C.sapp_android_get_native_activity())
-}

vlib/sokol/sapp/sapp_allocator_and_logger.c.v

@@ -0,0 +1,18 @@
+module sapp
+
+import sokol.memory
+
+@[typedef]
+pub struct C.sapp_allocator {
+pub mut:
+	alloc_fn  memory.FnAllocatorAlloc = unsafe { nil }
+	free_fn   memory.FnAllocatorFree  = unsafe { nil }
+	user_data voidptr
+}
+
+@[typedef]
+pub struct C.sapp_logger {
+pub mut:
+	func      memory.FnLogCb = unsafe { nil }
+	user_data voidptr
+}

vlib/sokol/sapp/sapp_v.v vlib/sokol/sapp/sapp_v.c.vvlib/sokol/sapp/sapp_v.v renamed to vlib/sokol/sapp/sapp_v.c.v

@@ -3,6 +3,11 @@ module sapp
 import os
 import stbi
 
+#define SOKOL_VALIDATE_NON_FATAL 1
+
+// v_sapp_gl_read_rgba_pixels reads pixles from the OpenGL buffer into `pixels`.
+fn C.v_sapp_gl_read_rgba_pixels(x int, y int, width int, height int, pixels charptr)
+
 // screenshot takes a screenshot of the current window and
 // saves it to `path`. The format is inferred from the extension
 // of the file name in `path`.
@@ -42,7 +47,6 @@ pub fn screenshot_png(path string) ! {
 }
 
 // write_rgba_to_ppm writes `pixels` data in RGBA format to PPM3 format.
-@[direct_array_access]
 fn write_rgba_to_ppm(path string, w int, h int, components int, pixels &u8) ! {
 	mut f_out := os.create(path)!
 	defer {

vlib/sokol/sapp/screenshot.v vlib/sokol/sapp/screenshot.c.vvlib/sokol/sapp/screenshot.v renamed to vlib/sokol/sapp/screenshot.c.v

@@ -9,7 +9,6 @@ mut:
 	pixels &u8 = unsafe { nil }
 }
 
-// screenshot_window captures a screenshot of the current window.
 @[manualfree]
 pub fn screenshot_window() &Screenshot {
 	img_width := width()