Browse Source

Merge pull request #3825 from Valakor/wgpu

wgpu_native fixes
gingerBill 1 year ago
parent
commit
861d51b760
2 changed files with 4 additions and 11 deletions
  1. 2 9
      vendor/wgpu/wgpu_native.odin
  2. 2 2
      vendor/wgpu/wgpu_native_types.odin

+ 2 - 9
vendor/wgpu/wgpu_native.odin

@@ -29,10 +29,9 @@ foreign {
 	RawQueueSubmitForIndex :: proc(queue: Queue, commandCount: uint, commands: [^]CommandBuffer) -> SubmissionIndex ---
 
 	// Returns true if the queue is empty, or false if there are more queue submissions still in flight.
-	@(link_name="wgpuDevicePoll")
-	RawDevicePoll :: proc(device: Device, wait: b32, /* NULLABLE */ wrappedSubmissionIndex: /* const */ ^WrappedSubmissionIndex) -> b32 ---
+	DevicePoll :: proc(device: Device, wait: b32, /* NULLABLE */ wrappedSubmissionIndex: /* const */ ^WrappedSubmissionIndex = nil) -> b32 ---
 
-	SetLogCallback :: proc "odin" (callback: LogCallback) ---
+	SetLogCallback :: proc(callback: LogCallback, userdata: rawptr) ---
 
 	SetLogLevel :: proc(level: LogLevel) ---
 
@@ -67,9 +66,3 @@ InstanceEnumerateAdapters :: proc(instance: Instance, options: ^InstanceEnumerat
 QueueSubmitForIndex :: proc(queue: Queue, commands: []CommandBuffer) -> SubmissionIndex {
 	return RawQueueSubmitForIndex(queue, len(commands), raw_data(commands))
 }
-
-DevicePoll :: proc(device: Device, wait: b32) -> (wrappedSubmissionIndex: WrappedSubmissionIndex, ok: bool) {
-	ok = bool(RawDevicePoll(device, wait, &wrappedSubmissionIndex))
-	return
-}
-

+ 2 - 2
vendor/wgpu/wgpu_native_types.odin

@@ -79,7 +79,7 @@ RequiredLimitsExtras :: struct {
 }
 
 SupportedLimitsExtras :: struct {
-	using chain: ChainedStruct,
+	using chain: ChainedStructOut,
 	limits: NativeLimits,
 }
 
@@ -182,7 +182,7 @@ SurfaceConfigurationExtras :: struct {
 	desiredMaximumFrameLatency: i32,
 }
 
-LogCallback :: #type proc "odin" (level: LogLevel, message: cstring)
+LogCallback :: #type proc "c" (level: LogLevel, message: cstring, userdata: rawptr)
 
 // Wrappers