imports/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-03-27 23:37:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Examples: WGPU: fixed undefined behaviors in example init code. (#9246, #9256) [@r-lyeh]

Browse Source
This commit is contained in:
r-lyeh
2026-02-20 15:54:56 +01:00
committed by ocornut
parent 221bac8b06
commit b5ccee78b6
4 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/CHANGELOG.txt
View File

@@ -45,6 +45,9 @@ Other Changes:
- Style: border sizes are now scaled (and rounded) by ScaleAllSizes(). - Style: border sizes are now scaled (and rounded) by ScaleAllSizes().
- Clipper: clear DisplayStart/DisplayEnd fields when Step() returns false. - Clipper: clear DisplayStart/DisplayEnd fields when Step() returns false.
- Examples:
- WGPU: fixed undefined behaviors in example code for requesting adapter
and device. (#9246, #9256) [@r-lyeh]
----------------------------------------------------------------------- -----------------------------------------------------------------------

24
examples/example_glfw_wgpu/main.cpp
View File

@@ -385,23 +385,29 @@ static WGPUAdapter RequestAdapter(WGPUInstance& instance)
{ {
WGPURequestAdapterOptions adapter_options = {}; WGPURequestAdapterOptions adapter_options = {};
WGPUAdapter local_adapter; WGPUAdapter local_adapter = nullptr;
WGPURequestAdapterCallbackInfo adapterCallbackInfo = {}; WGPURequestAdapterCallbackInfo adapterCallbackInfo = {};
adapterCallbackInfo.mode = WGPUCallbackMode_WaitAnyOnly;
adapterCallbackInfo.callback = handle_request_adapter; adapterCallbackInfo.callback = handle_request_adapter;
adapterCallbackInfo.userdata1 = &local_adapter; adapterCallbackInfo.userdata1 = &local_adapter;
wgpuInstanceRequestAdapter(instance, &adapter_options, adapterCallbackInfo); WGPUFuture future = wgpuInstanceRequestAdapter(instance, &adapter_options, adapterCallbackInfo);
WGPUFutureWaitInfo waitInfo = { future, false };
wgpuInstanceWaitAny(instance, 1, &waitInfo, ~0ull);
IM_ASSERT(local_adapter && "Error on Adapter request"); IM_ASSERT(local_adapter && "Error on Adapter request");
return local_adapter; return local_adapter;
} }
static WGPUDevice RequestDevice(WGPUAdapter& adapter) static WGPUDevice RequestDevice(WGPUInstance& instance, WGPUAdapter& adapter)
{ {
WGPUDevice local_device; WGPUDevice local_device = nullptr;
WGPURequestDeviceCallbackInfo deviceCallbackInfo = {}; WGPURequestDeviceCallbackInfo deviceCallbackInfo = {};
deviceCallbackInfo.mode = WGPUCallbackMode_WaitAnyOnly;
deviceCallbackInfo.callback = handle_request_device; deviceCallbackInfo.callback = handle_request_device;
deviceCallbackInfo.userdata1 = &local_device; deviceCallbackInfo.userdata1 = &local_device;
wgpuAdapterRequestDevice(adapter, nullptr, deviceCallbackInfo); WGPUFuture future = wgpuAdapterRequestDevice(adapter, nullptr, deviceCallbackInfo);
WGPUFutureWaitInfo waitInfo = { future, false };
wgpuInstanceWaitAny(instance, 1, &waitInfo, ~0ull);
IM_ASSERT(local_device && "Error on Device request"); IM_ASSERT(local_device && "Error on Device request");
return local_device; return local_device;
} }
@@ -449,7 +455,11 @@ bool InitWGPU(GLFWwindow* window)
// WGPU backend: Adapter and Device acquisition, Surface creation // WGPU backend: Adapter and Device acquisition, Surface creation
#elif defined(IMGUI_IMPL_WEBGPU_BACKEND_WGPU) #elif defined(IMGUI_IMPL_WEBGPU_BACKEND_WGPU)
wgpu_instance = wgpuCreateInstance(nullptr); WGPUInstanceDescriptor instanceDesc = {};
WGPUInstanceFeatureName timedWaitAny = WGPUInstanceFeatureName_TimedWaitAny;
instanceDesc.requiredFeatureCount = 1;
instanceDesc.requiredFeatures = &timedWaitAny;
wgpu_instance = wgpuCreateInstance(&instanceDesc);
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
getAdapterAndDeviceViaJS(); getAdapterAndDeviceViaJS();
@@ -476,7 +486,7 @@ bool InitWGPU(GLFWwindow* window)
WGPUAdapter adapter = RequestAdapter(wgpu_instance); WGPUAdapter adapter = RequestAdapter(wgpu_instance);
ImGui_ImplWGPU_DebugPrintAdapterInfo(adapter); ImGui_ImplWGPU_DebugPrintAdapterInfo(adapter);
wgpu_device = RequestDevice(adapter); wgpu_device = RequestDevice(wgpu_instance, adapter);
// Create the surface. // Create the surface.
wgpu_surface = CreateWGPUSurface(wgpu_instance, window); wgpu_surface = CreateWGPUSurface(wgpu_instance, window);

24
examples/example_sdl2_wgpu/main.cpp
View File

@@ -369,23 +369,29 @@ static WGPUAdapter RequestAdapter(WGPUInstance& instance)
{ {
WGPURequestAdapterOptions adapter_options = {}; WGPURequestAdapterOptions adapter_options = {};
WGPUAdapter local_adapter; WGPUAdapter local_adapter = nullptr;
WGPURequestAdapterCallbackInfo adapterCallbackInfo = {}; WGPURequestAdapterCallbackInfo adapterCallbackInfo = {};
adapterCallbackInfo.mode = WGPUCallbackMode_WaitAnyOnly;
adapterCallbackInfo.callback = handle_request_adapter; adapterCallbackInfo.callback = handle_request_adapter;
adapterCallbackInfo.userdata1 = &local_adapter; adapterCallbackInfo.userdata1 = &local_adapter;
wgpuInstanceRequestAdapter(instance, &adapter_options, adapterCallbackInfo); WGPUFuture future = wgpuInstanceRequestAdapter(instance, &adapter_options, adapterCallbackInfo);
WGPUFutureWaitInfo waitInfo = { future, false };
wgpuInstanceWaitAny(instance, 1, &waitInfo, ~0ull);
IM_ASSERT(local_adapter && "Error on Adapter request"); IM_ASSERT(local_adapter && "Error on Adapter request");
return local_adapter; return local_adapter;
} }
static WGPUDevice RequestDevice(WGPUAdapter& adapter) static WGPUDevice RequestDevice(WGPUInstance& instance, WGPUAdapter& adapter)
{ {
WGPUDevice local_device; WGPUDevice local_device = nullptr;
WGPURequestDeviceCallbackInfo deviceCallbackInfo = {}; WGPURequestDeviceCallbackInfo deviceCallbackInfo = {};
deviceCallbackInfo.mode = WGPUCallbackMode_WaitAnyOnly;
deviceCallbackInfo.callback = handle_request_device; deviceCallbackInfo.callback = handle_request_device;
deviceCallbackInfo.userdata1 = &local_device; deviceCallbackInfo.userdata1 = &local_device;
wgpuAdapterRequestDevice(adapter, nullptr, deviceCallbackInfo); WGPUFuture future = wgpuAdapterRequestDevice(adapter, nullptr, deviceCallbackInfo);
WGPUFutureWaitInfo waitInfo = { future, false };
wgpuInstanceWaitAny(instance, 1, &waitInfo, ~0ull);
IM_ASSERT(local_device && "Error on Device request"); IM_ASSERT(local_device && "Error on Device request");
return local_device; return local_device;
} }
@@ -434,7 +440,11 @@ static bool InitWGPU(SDL_Window* window)
// WGPU backend: Adapter and Device acquisition, Surface creation // WGPU backend: Adapter and Device acquisition, Surface creation
#elif defined(IMGUI_IMPL_WEBGPU_BACKEND_WGPU) #elif defined(IMGUI_IMPL_WEBGPU_BACKEND_WGPU)
wgpu_instance = wgpuCreateInstance(nullptr); WGPUInstanceDescriptor instanceDesc = {};
WGPUInstanceFeatureName timedWaitAny = WGPUInstanceFeatureName_TimedWaitAny;
instanceDesc.requiredFeatureCount = 1;
instanceDesc.requiredFeatures = &timedWaitAny;
wgpu_instance = wgpuCreateInstance(&instanceDesc);
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
getAdapterAndDeviceViaJS(); getAdapterAndDeviceViaJS();
@@ -461,7 +471,7 @@ static bool InitWGPU(SDL_Window* window)
WGPUAdapter adapter = RequestAdapter(wgpu_instance); WGPUAdapter adapter = RequestAdapter(wgpu_instance);
ImGui_ImplWGPU_DebugPrintAdapterInfo(adapter); ImGui_ImplWGPU_DebugPrintAdapterInfo(adapter);
wgpu_device = RequestDevice(adapter); wgpu_device = RequestDevice(wgpu_instance, adapter);
// Create the surface. // Create the surface.
wgpu_surface = CreateWGPUSurface(wgpu_instance, window); wgpu_surface = CreateWGPUSurface(wgpu_instance, window);

24
examples/example_sdl3_wgpu/main.cpp
View File

@@ -380,23 +380,29 @@ static WGPUAdapter RequestAdapter(WGPUInstance& instance)
{ {
WGPURequestAdapterOptions adapter_options = {}; WGPURequestAdapterOptions adapter_options = {};
WGPUAdapter local_adapter; WGPUAdapter local_adapter = nullptr;
WGPURequestAdapterCallbackInfo adapterCallbackInfo = {}; WGPURequestAdapterCallbackInfo adapterCallbackInfo = {};
adapterCallbackInfo.mode = WGPUCallbackMode_WaitAnyOnly;
adapterCallbackInfo.callback = handle_request_adapter; adapterCallbackInfo.callback = handle_request_adapter;
adapterCallbackInfo.userdata1 = &local_adapter; adapterCallbackInfo.userdata1 = &local_adapter;
wgpuInstanceRequestAdapter(instance, &adapter_options, adapterCallbackInfo); WGPUFuture future = wgpuInstanceRequestAdapter(instance, &adapter_options, adapterCallbackInfo);
WGPUFutureWaitInfo waitInfo = { future, false };
wgpuInstanceWaitAny(instance, 1, &waitInfo, ~0ull);
IM_ASSERT(local_adapter && "Error on Adapter request"); IM_ASSERT(local_adapter && "Error on Adapter request");
return local_adapter; return local_adapter;
} }
static WGPUDevice RequestDevice(WGPUAdapter& adapter) static WGPUDevice RequestDevice(WGPUInstance& instance, WGPUAdapter& adapter)
{ {
WGPUDevice local_device; WGPUDevice local_device = nullptr;
WGPURequestDeviceCallbackInfo deviceCallbackInfo = {}; WGPURequestDeviceCallbackInfo deviceCallbackInfo = {};
deviceCallbackInfo.mode = WGPUCallbackMode_WaitAnyOnly;
deviceCallbackInfo.callback = handle_request_device; deviceCallbackInfo.callback = handle_request_device;
deviceCallbackInfo.userdata1 = &local_device; deviceCallbackInfo.userdata1 = &local_device;
wgpuAdapterRequestDevice(adapter, nullptr, deviceCallbackInfo); WGPUFuture future = wgpuAdapterRequestDevice(adapter, nullptr, deviceCallbackInfo);
WGPUFutureWaitInfo waitInfo = { future, false };
wgpuInstanceWaitAny(instance, 1, &waitInfo, ~0ull);
IM_ASSERT(local_device && "Error on Device request"); IM_ASSERT(local_device && "Error on Device request");
return local_device; return local_device;
} }
@@ -445,7 +451,11 @@ static bool InitWGPU(SDL_Window* window)
// WGPU backend: Adapter and Device acquisition, Surface creation // WGPU backend: Adapter and Device acquisition, Surface creation
#elif defined(IMGUI_IMPL_WEBGPU_BACKEND_WGPU) #elif defined(IMGUI_IMPL_WEBGPU_BACKEND_WGPU)
wgpu_instance = wgpuCreateInstance(nullptr); WGPUInstanceDescriptor instanceDesc = {};
WGPUInstanceFeatureName timedWaitAny = WGPUInstanceFeatureName_TimedWaitAny;
instanceDesc.requiredFeatureCount = 1;
instanceDesc.requiredFeatures = &timedWaitAny;
wgpu_instance = wgpuCreateInstance(&instanceDesc);
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
getAdapterAndDeviceViaJS(); getAdapterAndDeviceViaJS();
@@ -472,7 +482,7 @@ static bool InitWGPU(SDL_Window* window)
WGPUAdapter adapter = RequestAdapter(wgpu_instance); WGPUAdapter adapter = RequestAdapter(wgpu_instance);
ImGui_ImplWGPU_DebugPrintAdapterInfo(adapter); ImGui_ImplWGPU_DebugPrintAdapterInfo(adapter);
wgpu_device = RequestDevice(adapter); wgpu_device = RequestDevice(wgpu_instance, adapter);
// Create the surface. // Create the surface.
wgpu_surface = CreateWGPUSurface(wgpu_instance, window); wgpu_surface = CreateWGPUSurface(wgpu_instance, window);