From bf7c192ce93f495cf9d4d836fa7f6cc8938f6827 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 30 Jan 2025 12:22:22 +0000 Subject: [PATCH] Keep -vet and -strict-style happy --- vendor/sdl3/sdl3__foreign.odin | 2 +- vendor/sdl3/sdl3_assert.odin | 1 - vendor/sdl3/sdl3_endian.odin | 16 ++++++++-------- vendor/sdl3/sdl3_iostream.odin | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/vendor/sdl3/sdl3__foreign.odin b/vendor/sdl3/sdl3__foreign.odin index 863a37329..0dac66665 100644 --- a/vendor/sdl3/sdl3__foreign.odin +++ b/vendor/sdl3/sdl3__foreign.odin @@ -2,5 +2,5 @@ package sdl3 @(export) foreign import lib { - "SDL3.lib" + "SDL3.lib", } \ No newline at end of file diff --git a/vendor/sdl3/sdl3_assert.odin b/vendor/sdl3/sdl3_assert.odin index 21576bb2f..eec880e45 100644 --- a/vendor/sdl3/sdl3_assert.odin +++ b/vendor/sdl3/sdl3_assert.odin @@ -2,7 +2,6 @@ package sdl3 import "base:intrinsics" import "core:c" -import "core:strings" TriggerBreakpoint :: intrinsics.debug_trap AssertBreakpoint :: TriggerBreakpoint diff --git a/vendor/sdl3/sdl3_endian.odin b/vendor/sdl3/sdl3_endian.odin index 2a34fa9d6..277237a18 100644 --- a/vendor/sdl3/sdl3_endian.odin +++ b/vendor/sdl3/sdl3_endian.odin @@ -13,12 +13,12 @@ BYTEORDER :: LIL_ENDIAN when ODIN_ENDIAN == .Little else BIG_ENDIAN @(require_results) SwapFloat :: #force_inline proc "c" (x: f32) -> f32 { return intrinsics.byte_swap(x) } -@(require_results) Swap16LE :: #force_inline proc "c" (x: Uint16) -> Uint16 { return Uint16(transmute(u16le)x) } -@(require_results) Swap32LE :: #force_inline proc "c" (x: Uint32) -> Uint32 { return Uint32(transmute(u32le)x) } -@(require_results) Swap64LE :: #force_inline proc "c" (x: Uint64) -> Uint64 { return Uint64(transmute(u64le)x) } -@(require_results) SwapFloatLE :: #force_inline proc "c" (x: f32) -> f32 { return f32 (transmute(f32le)x) } +@(require_results) Swap16LE :: #force_inline proc "c" (x: Uint16) -> Uint16 { x := x; return Uint16((^u16le)(&x)^) } +@(require_results) Swap32LE :: #force_inline proc "c" (x: Uint32) -> Uint32 { x := x; return Uint32((^u32le)(&x)^) } +@(require_results) Swap64LE :: #force_inline proc "c" (x: Uint64) -> Uint64 { x := x; return Uint64((^u64le)(&x)^) } +@(require_results) SwapFloatLE :: #force_inline proc "c" (x: f32) -> f32 { x := x; return f32 ((^f32le)(&x)^) } -@(require_results) Swap16BE :: #force_inline proc "c" (x: Uint16) -> Uint16 { return Uint16(transmute(u16be)x) } -@(require_results) Swap32BE :: #force_inline proc "c" (x: Uint32) -> Uint32 { return Uint32(transmute(u32be)x) } -@(require_results) Swap64BE :: #force_inline proc "c" (x: Uint64) -> Uint64 { return Uint64(transmute(u64be)x) } -@(require_results) SwapFloatBE :: #force_inline proc "c" (x: f32) -> f32 { return f32 (transmute(f32be)x) } \ No newline at end of file +@(require_results) Swap16BE :: #force_inline proc "c" (x: Uint16) -> Uint16 { x := x; return Uint16((^u16be)(&x)^) } +@(require_results) Swap32BE :: #force_inline proc "c" (x: Uint32) -> Uint32 { x := x; return Uint32((^u32be)(&x)^) } +@(require_results) Swap64BE :: #force_inline proc "c" (x: Uint64) -> Uint64 { x := x; return Uint64((^u64be)(&x)^) } +@(require_results) SwapFloatBE :: #force_inline proc "c" (x: f32) -> f32 { x := x; return f32 ((^f32be)(&x)^) } \ No newline at end of file diff --git a/vendor/sdl3/sdl3_iostream.odin b/vendor/sdl3/sdl3_iostream.odin index 6f7756bdd..399e53a53 100644 --- a/vendor/sdl3/sdl3_iostream.odin +++ b/vendor/sdl3/sdl3_iostream.odin @@ -33,7 +33,7 @@ IOStreamInterface :: struct { #assert( (size_of(IOStreamInterface) == 28 && size_of(rawptr) == 4) || - (size_of(IOStreamInterface) == 56 && size_of(rawptr) == 8) + (size_of(IOStreamInterface) == 56 && size_of(rawptr) == 8), ) IOStream :: struct {}