From bbb4a802e6cf93e3ae2968d1b486daedc8e2ac5d Mon Sep 17 00:00:00 2001 From: Larpon Date: Tue, 17 Oct 2023 16:58:35 +0200 Subject: [PATCH] sokol: update `sokol_gfx.h` to match upstream @ d98c8b9 (fixes macOS compile error) (#19590) --- thirdparty/sokol/sokol_gfx.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/thirdparty/sokol/sokol_gfx.h b/thirdparty/sokol/sokol_gfx.h index ac586f1ff5..d062fcd7b0 100644 --- a/thirdparty/sokol/sokol_gfx.h +++ b/thirdparty/sokol/sokol_gfx.h @@ -10758,7 +10758,6 @@ _SOKOL_PRIVATE void _sg_mtl_init_caps(void) { #if (MAC_OS_X_VERSION_MAX_ALLOWED >= 120000) || (__IPHONE_OS_VERSION_MAX_ALLOWED >= 140000) if (@available(macOS 12.0, iOS 14.0, *)) { _sg.features.image_clamp_to_border = [_sg.mtl.device supportsFamily:MTLGPUFamilyApple7] - || [_sg.mtl.device supportsFamily:MTLGPUFamilyApple8] || [_sg.mtl.device supportsFamily:MTLGPUFamilyMac2]; #if (MAC_OS_X_VERSION_MAX_ALLOWED >= 130000) || (__IPHONE_OS_VERSION_MAX_ALLOWED >= 160000) if (!_sg.features.image_clamp_to_border) { @@ -12054,10 +12053,10 @@ _SOKOL_PRIVATE WGPUBufferUsageFlags _sg_wgpu_buffer_usage(sg_buffer_type t, sg_u _SOKOL_PRIVATE WGPULoadOp _sg_wgpu_load_op(sg_action a) { switch (a) { - case SG_LOADACTION_CLEAR: - case SG_LOADACTION_DONTCARE: + case SG_ACTION_CLEAR: + case SG_ACTION_DONTCARE: return WGPULoadOp_Clear; - case SG_LOADACTION_LOAD: + case SG_ACTION_LOAD: return WGPULoadOp_Load; default: SOKOL_UNREACHABLE;