Fix indentation and add full example

This commit is contained in:
Emir
2024-07-24 10:22:18 +03:00
parent f9ef951b22
commit 2a2bedc85c
9 changed files with 266 additions and 108 deletions

17
vendor/wgpu/examples/sdl2/Makefile vendored Normal file
View File

@@ -0,0 +1,17 @@
FILES := $(wildcard *)
# NOTE: changing this requires changing the same values in the `web/index.html`.
INITIAL_MEMORY_PAGES := 2000
MAX_MEMORY_PAGES := 65536
PAGE_SIZE := 65536
INITIAL_MEMORY_BYTES := $(shell expr $(INITIAL_MEMORY_PAGES) \* $(PAGE_SIZE))
MAX_MEMORY_BYTES := $(shell expr $(MAX_MEMORY_PAGES) \* $(PAGE_SIZE))
web/triangle.wasm: $(FILES) ../../wgpu.js ../../../wasm/js/runtime.js
odin build . \
-target:js_wasm32 -out:web/triangle.wasm -o:size \
-extra-linker-flags:"--export-table --import-memory --initial-memory=$(INITIAL_MEMORY_BYTES) --max-memory=$(MAX_MEMORY_BYTES)"
cp ../../wgpu.js web/wgpu.js
cp ../../../wasm/js/runtime.js web/runtime.js

12
vendor/wgpu/examples/sdl2/build.bat vendored Normal file
View File

@@ -0,0 +1,12 @@
REM NOTE: changing this requires changing the same values in the `web/index.html`.
set INITIAL_MEMORY_PAGES=2000
set MAX_MEMORY_PAGES=65536
set PAGE_SIZE=65536
set /a INITIAL_MEMORY_BYTES=%INITIAL_MEMORY_PAGES% * %PAGE_SIZE%
set /a MAX_MEMORY_BYTES=%MAX_MEMORY_PAGES% * %PAGE_SIZE%
call odin.exe build . -target:js_wasm32 -out:web/triangle.wasm -o:size -extra-linker-flags:"--export-table --import-memory --initial-memory=%INITIAL_MEMORY_BYTES% --max-memory=%MAX_MEMORY_BYTES%"
copy "..\..\wgpu.js" "web\wgpu.js"
copy "..\..\..\wasm\js\runtime.js" "web\runtime.js"

View File

@@ -4,13 +4,11 @@ import "base:runtime"
import "core:fmt"
import "vendor:sdl2"
import "vendor:wgpu"
import "vendor:wgpu/sdl2glue"
State :: struct {
ctx: runtime.Context,
window: ^sdl2.Window,
os: OS,
instance: wgpu.Instance,
surface: wgpu.Surface,
@@ -29,32 +27,13 @@ state: State
main :: proc() {
state.ctx = context
sdl_flags := sdl2.InitFlags{.VIDEO, .JOYSTICK, .GAMECONTROLLER, .EVENTS}
if res := sdl2.Init(sdl_flags); res != 0 {
fmt.eprintf("ERROR: Failed to initialize SDL: [%s]\n", sdl2.GetError())
return
}
window_flags: sdl2.WindowFlags = {.SHOWN, .ALLOW_HIGHDPI, .RESIZABLE}
state.window = sdl2.CreateWindow(
"wgpu triangle",
sdl2.WINDOWPOS_CENTERED,
sdl2.WINDOWPOS_CENTERED,
800,
600,
window_flags,
)
if state.window == nil {
fmt.eprintf("ERROR: Failed to create the SDL Window: [%s]\n", sdl2.GetError())
return
}
os_init(&state.os)
state.instance = wgpu.CreateInstance(nil)
if state.instance == nil {
panic("WebGPU is not supported")
}
state.surface = sdl2glue.GetSurface(state.instance, state.window)
state.surface = os_get_surface(&state.os, state.instance)
wgpu.InstanceRequestAdapter(state.instance, &{ compatibleSurface = state.surface }, on_adapter, nil)
@@ -135,37 +114,17 @@ main :: proc() {
},
})
now := sdl2.GetPerformanceCounter()
last : u64 = 0
dt: f32 = 0
main_loop: for {
last = now
now := sdl2.GetPerformanceCounter()
dt = auto_cast((now - last)*1000 / sdl2.GetPerformanceFrequency())
e: sdl2.Event
for sdl2.PollEvent(&e) {
#partial switch (e.type) {
case .QUIT:
break main_loop
case .WINDOWEVENT:
#partial switch (e.window.event) {
case .SIZE_CHANGED:
case .RESIZED:
state.config.width = cast(u32)e.window.data1
state.config.height = cast(u32)e.window.data2
wgpu.SurfaceConfigure(state.surface, &state.config)
}
}
}
frame(dt)
}
os_run(&state.os)
}
}
resize :: proc "c" () {
context = state.ctx
state.config.width, state.config.height = os_get_render_bounds(&state.os)
wgpu.SurfaceConfigure(state.surface, &state.config)
}
frame :: proc "c" (dt: f32) {
context = state.ctx
@@ -178,7 +137,7 @@ frame :: proc "c" (dt: f32) {
if surface_texture.texture != nil {
wgpu.TextureRelease(surface_texture.texture)
}
// todo - resize()
resize()
return
case .OutOfMemory, .DeviceLost:
// Fatal error

60
vendor/wgpu/examples/sdl2/os_js.odin vendored Normal file
View File

@@ -0,0 +1,60 @@
package vendor_wgpu_example_triangle
import "vendor:wgpu"
import "vendor:wasm/js"
OS :: struct {
initialized: bool,
}
@(private="file")
g_os: ^OS
os_init :: proc(os: ^OS) {
g_os = os
assert(js.add_window_event_listener(.Resize, nil, size_callback))
}
// NOTE: frame loop is done by the runtime.js repeatedly calling `step`.
os_run :: proc(os: ^OS) {
os.initialized = true
}
os_get_render_bounds :: proc(os: ^OS) -> (width, height: u32) {
rect := js.get_bounding_client_rect("body")
return u32(rect.width), u32(rect.height)
}
os_get_surface :: proc(os: ^OS, instance: wgpu.Instance) -> wgpu.Surface {
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromCanvasHTMLSelector{
sType = .SurfaceDescriptorFromCanvasHTMLSelector,
selector = "#wgpu-canvas",
},
},
)
}
@(private="file", export)
step :: proc(dt: f32) -> bool {
if !g_os.initialized {
return true
}
frame(dt)
return true
}
@(private="file", fini)
os_fini :: proc() {
js.remove_window_event_listener(.Resize, nil, size_callback)
finish()
}
@(private="file")
size_callback :: proc(e: js.Event) {
resize()
}

87
vendor/wgpu/examples/sdl2/os_sdl2.odin vendored Normal file
View File

@@ -0,0 +1,87 @@
//+build !js
package vendor_wgpu_example_triangle
import "core:c"
import "core:fmt"
import "vendor:sdl2"
import "vendor:wgpu"
import "vendor:wgpu/sdl2glue"
OS :: struct {
window: ^sdl2.Window,
}
os_init :: proc(os: ^OS) {
sdl_flags := sdl2.InitFlags{.VIDEO, .JOYSTICK, .GAMECONTROLLER, .EVENTS}
if res := sdl2.Init(sdl_flags); res != 0 {
fmt.eprintfln("ERROR: Failed to initialize SDL: [%s]", sdl2.GetError())
return
}
window_flags: sdl2.WindowFlags = {.SHOWN, .ALLOW_HIGHDPI, .RESIZABLE}
os.window = sdl2.CreateWindow(
"wgpu triangle",
sdl2.WINDOWPOS_CENTERED,
sdl2.WINDOWPOS_CENTERED,
800,
600,
window_flags,
)
if os.window == nil {
fmt.eprintfln("ERROR: Failed to create the SDL Window: [%s]", sdl2.GetError())
return
}
sdl2.AddEventWatch(size_callback, nil)
}
os_run :: proc(os: ^OS) {
now := sdl2.GetPerformanceCounter()
last : u64
dt: f32
main_loop: for {
last = now
now = sdl2.GetPerformanceCounter()
dt = f32((now - last) * 1000) / f32(sdl2.GetPerformanceFrequency())
e: sdl2.Event
for sdl2.PollEvent(&e) {
#partial switch (e.type) {
case .QUIT:
break main_loop
}
}
frame(dt)
}
sdl2.DestroyWindow(os.window)
sdl2.Quit()
finish()
}
os_get_render_bounds :: proc(os: ^OS) -> (width, height: u32) {
iw, ih: c.int
sdl2.GetWindowSize(os.window, &iw, &ih)
return u32(iw), u32(ih)
}
os_get_surface :: proc(os: ^OS, instance: wgpu.Instance) -> wgpu.Surface {
return sdl2glue.GetSurface(instance, os.window)
}
@(private="file")
size_callback :: proc "c" (userdata: rawptr, event: ^sdl2.Event) -> c.int {
if event.type == .WINDOWEVENT {
if event.window.event == .SIZE_CHANGED || event.window.event == .RESIZED {
resize()
}
}
return 0
}

View File

@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html lang="en" style="height: 100%;">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>WGPU WASM Triangle</title>
</head>
<body id="body" style="height: 100%; padding: 0; margin: 0; overflow: hidden;">
<canvas id="wgpu-canvas"></canvas>
<script type="text/javascript" src="runtime.js"></script>
<script type="text/javascript" src="wgpu.js"></script>
<script type="text/javascript">
const mem = new WebAssembly.Memory({ initial: 2000, maximum: 65536, shared: false });
const memInterface = new odin.WasmMemoryInterface();
memInterface.setMemory(mem);
const wgpuInterface = new odin.WebGPUInterface(memInterface);
odin.runWasm("triangle.wasm", null, { wgpu: wgpuInterface.getInterface() }, memInterface, /*intSize=8*/);
</script>
</body>
</html>

View File

@@ -6,14 +6,14 @@ import CA "vendor:darwin/QuartzCore"
import NS "core:sys/darwin/Foundation"
GetSurface :: proc(instance: wgpu.Instance, window: ^sdl2.Window) -> wgpu.Surface {
window_info: sdl2.SysWMinfo
sdl2.GetWindowWMInfo(window, &window_info)
ns_window := cast(^NS.Window)window_info.info.cocoa.window
metal_layer := CA.MetalLayer_layer()
ns_window->contentView()->setLayer(metal_layer)
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
window_info: sdl2.SysWMinfo
sdl2.GetWindowWMInfo(window, &window_info)
ns_window := cast(^NS.Window)window_info.info.cocoa.window
metal_layer := CA.MetalLayer_layer()
ns_window->contentView()->setLayer(metal_layer)
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromMetalLayer{
chain = wgpu.ChainedStruct{
sType = .SurfaceDescriptorFromMetalLayer,
@@ -21,5 +21,5 @@ GetSurface :: proc(instance: wgpu.Instance, window: ^sdl2.Window) -> wgpu.Surfac
layer = rawptr(metal_layer),
},
},
)
)
}

View File

@@ -4,39 +4,39 @@ import "vendor:sdl2"
import "vendor:wgpu"
GetSurface :: proc(instance: wgpu.Instance, window: ^sdl2.Window) -> wgpu.Surface {
window_info: sdl2.SysWMinfo
sdl2.GetWindowWMInfo(window, &window_info)
window_info: sdl2.SysWMinfo
sdl2.GetWindowWMInfo(window, &window_info)
if window_info.subsystem == .WAYLAND {
display := window_info.info.wl.display
surface := window_info.info.wl.surface
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromWaylandSurface{
chain = {
sType = .SurfaceDescriptorFromWaylandSurface,
},
display = display,
surface = surface,
},
},
)
display := window_info.info.wl.display
surface := window_info.info.wl.surface
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromWaylandSurface{
chain = {
sType = .SurfaceDescriptorFromWaylandSurface,
},
display = display,
surface = surface,
},
},
)
} else if window_info.subsystem == .X11 {
display := window_info.info.x11.display
window := window_info.info.x11.window
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromXlibWindow{
chain = {
sType = .SurfaceDescriptorFromXlibWindow,
},
display = display,
window = u64(window),
},
},
)
} else {
panic("wgpu sdl2 glue: unsupported platform, expected Wayland or X11")
}
display := window_info.info.x11.display
window := window_info.info.x11.window
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromXlibWindow{
chain = {
sType = .SurfaceDescriptorFromXlibWindow,
},
display = display,
window = u64(window),
},
},
)
} else {
panic("wgpu sdl2 glue: unsupported platform, expected Wayland or X11")
}
}

View File

@@ -2,24 +2,24 @@ package wgpu_sdl2_glue
import win "core:sys/windows"
import "vendor:sdl2"
import "vendor:wgpu"
import "vendor:sdl2"
import "vendor:wgpu"
GetSurface :: proc(instance: wgpu.Instance, window: ^sdl2.Window) -> wgpu.Surface {
window_info: sdl2.SysWMinfo
sdl2.GetWindowWMInfo(window, &window_info)
hwnd := cast(win.HWND)window_info.info.win.window
hinstance := win.GetModuleHandleW(nil)
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromMetalLayer{
window_info: sdl2.SysWMinfo
sdl2.GetWindowWMInfo(window, &window_info)
hwnd := window_info.info.win.window
hinstance := win.GetModuleHandleW(nil)
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromWindowsHWND{
chain = wgpu.ChainedStruct{
sType = .SurfaceDescriptorFromMetalLayer,
sType = .SurfaceDescriptorFromWindowsHWND,
},
hinstance = rawptr(hinstance),
hwnd = rawptr(hwnd),
},
},
)
}
)
}