From 4946079f1d331504686e4448ef31a103170be05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Fri, 3 Nov 2023 21:36:00 -0700 Subject: [PATCH] Cleanup. --- examples/00-helloworld/helloworld.cpp | 2 +- examples/01-cubes/cubes.cpp | 2 +- examples/02-metaballs/metaballs.cpp | 2 +- examples/03-raymarch/raymarch.cpp | 2 +- examples/04-mesh/mesh.cpp | 2 +- examples/05-instancing/instancing.cpp | 2 +- examples/06-bump/bump.cpp | 2 +- examples/07-callback/callback.cpp | 2 +- examples/08-update/update.cpp | 2 +- examples/09-hdr/hdr.cpp | 2 +- examples/10-font/font.cpp | 2 +- examples/11-fontsdf/fontsdf.cpp | 2 +- examples/12-lod/lod.cpp | 2 +- examples/13-stencil/stencil.cpp | 2 +- examples/14-shadowvolumes/shadowvolumes.cpp | 2 +- examples/15-shadowmaps-simple/shadowmaps_simple.cpp | 2 +- examples/16-shadowmaps/shadowmaps.cpp | 2 +- examples/17-drawstress/drawstress.cpp | 2 +- examples/18-ibl/ibl.cpp | 2 +- examples/19-oit/oit.cpp | 2 +- examples/20-nanovg/nanovg.cpp | 2 +- examples/21-deferred/deferred.cpp | 2 +- examples/22-windows/windows.cpp | 2 +- examples/24-nbody/nbody.cpp | 2 +- examples/26-occlusion/occlusion.cpp | 2 +- examples/27-terrain/terrain.cpp | 2 +- examples/28-wireframe/wireframe.cpp | 2 +- examples/29-debugdraw/debugdraw.cpp | 2 +- examples/30-picking/picking.cpp | 2 +- examples/31-rsm/reflectiveshadowmap.cpp | 2 +- examples/32-particles/particles.cpp | 2 +- examples/33-pom/pom.cpp | 2 +- examples/34-mvs/mvs.cpp | 2 +- examples/35-dynamic/dynamic.cpp | 2 +- examples/36-sky/sky.cpp | 2 +- examples/37-gpudrivenrendering/gpudrivenrendering.cpp | 2 +- examples/38-bloom/bloom.cpp | 2 +- examples/39-assao/assao.cpp | 2 +- examples/40-svt/svt.cpp | 2 +- examples/41-tess/tess.cpp | 2 +- examples/42-bunnylod/bunnylod.cpp | 2 +- examples/43-denoise/denoise.cpp | 2 +- examples/44-sss/screen_space_shadows.cpp | 2 +- examples/45-bokeh/bokeh.cpp | 2 +- examples/47-pixelformats/pixelformats.cpp | 2 +- examples/48-drawindirect/drawindirect.cpp | 2 +- examples/49-hextile/hextile.cpp | 2 +- examples/common/entry/entry.cpp | 2 +- examples/common/entry/entry.h | 2 +- examples/common/entry/entry_android.cpp | 3 +-- examples/common/entry/entry_glfw.cpp | 2 +- examples/common/entry/entry_html5.cpp | 3 +-- examples/common/entry/entry_ios.mm | 3 +-- examples/common/entry/entry_noop.cpp | 2 +- examples/common/entry/entry_osx.mm | 3 +-- examples/common/entry/entry_sdl.cpp | 8 ++++++-- examples/common/entry/entry_windows.cpp | 3 +-- examples/common/entry/entry_x11.cpp | 3 +-- 58 files changed, 63 insertions(+), 65 deletions(-) diff --git a/examples/00-helloworld/helloworld.cpp b/examples/00-helloworld/helloworld.cpp index 8b9891952..ebf971797 100644 --- a/examples/00-helloworld/helloworld.cpp +++ b/examples/00-helloworld/helloworld.cpp @@ -34,7 +34,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/01-cubes/cubes.cpp b/examples/01-cubes/cubes.cpp index 4c3da5c52..07c974dbb 100644 --- a/examples/01-cubes/cubes.cpp +++ b/examples/01-cubes/cubes.cpp @@ -149,7 +149,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/02-metaballs/metaballs.cpp b/examples/02-metaballs/metaballs.cpp index 8c42f2211..361ad9edf 100644 --- a/examples/02-metaballs/metaballs.cpp +++ b/examples/02-metaballs/metaballs.cpp @@ -508,7 +508,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/03-raymarch/raymarch.cpp b/examples/03-raymarch/raymarch.cpp index ddbd73fe0..89f145fcd 100644 --- a/examples/03-raymarch/raymarch.cpp +++ b/examples/03-raymarch/raymarch.cpp @@ -121,7 +121,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/04-mesh/mesh.cpp b/examples/04-mesh/mesh.cpp index 40469bd14..788784253 100644 --- a/examples/04-mesh/mesh.cpp +++ b/examples/04-mesh/mesh.cpp @@ -32,7 +32,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/05-instancing/instancing.cpp b/examples/05-instancing/instancing.cpp index 9d5a804b0..3b1d7b9c4 100644 --- a/examples/05-instancing/instancing.cpp +++ b/examples/05-instancing/instancing.cpp @@ -84,7 +84,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/06-bump/bump.cpp b/examples/06-bump/bump.cpp index 93aeeb386..fd42f80c4 100644 --- a/examples/06-bump/bump.cpp +++ b/examples/06-bump/bump.cpp @@ -104,7 +104,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/07-callback/callback.cpp b/examples/07-callback/callback.cpp index 2b7f59c8b..5d9c98df3 100644 --- a/examples/07-callback/callback.cpp +++ b/examples/07-callback/callback.cpp @@ -331,7 +331,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/08-update/update.cpp b/examples/08-update/update.cpp index d6fe77960..0f4130331 100644 --- a/examples/08-update/update.cpp +++ b/examples/08-update/update.cpp @@ -247,7 +247,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/09-hdr/hdr.cpp b/examples/09-hdr/hdr.cpp index 6db19d1c8..8b43bf754 100644 --- a/examples/09-hdr/hdr.cpp +++ b/examples/09-hdr/hdr.cpp @@ -155,7 +155,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/10-font/font.cpp b/examples/10-font/font.cpp index f74ec9563..dbc70b83a 100644 --- a/examples/10-font/font.cpp +++ b/examples/10-font/font.cpp @@ -73,7 +73,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/11-fontsdf/fontsdf.cpp b/examples/11-fontsdf/fontsdf.cpp index 5e03e9256..d79e3087d 100644 --- a/examples/11-fontsdf/fontsdf.cpp +++ b/examples/11-fontsdf/fontsdf.cpp @@ -56,7 +56,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/12-lod/lod.cpp b/examples/12-lod/lod.cpp index b429334a8..a3aa6c038 100644 --- a/examples/12-lod/lod.cpp +++ b/examples/12-lod/lod.cpp @@ -48,7 +48,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/13-stencil/stencil.cpp b/examples/13-stencil/stencil.cpp index cfbf0615c..d082677ac 100644 --- a/examples/13-stencil/stencil.cpp +++ b/examples/13-stencil/stencil.cpp @@ -814,7 +814,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_viewState.m_width; init.resolution.height = m_viewState.m_height; init.resolution.reset = m_reset; diff --git a/examples/14-shadowvolumes/shadowvolumes.cpp b/examples/14-shadowvolumes/shadowvolumes.cpp index f90aec05d..4ccea3a93 100644 --- a/examples/14-shadowvolumes/shadowvolumes.cpp +++ b/examples/14-shadowvolumes/shadowvolumes.cpp @@ -1785,7 +1785,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_viewState.m_width; init.resolution.height = m_viewState.m_height; init.resolution.reset = m_reset; diff --git a/examples/15-shadowmaps-simple/shadowmaps_simple.cpp b/examples/15-shadowmaps-simple/shadowmaps_simple.cpp index bfd4a75a0..c1e44430a 100644 --- a/examples/15-shadowmaps-simple/shadowmaps_simple.cpp +++ b/examples/15-shadowmaps-simple/shadowmaps_simple.cpp @@ -80,7 +80,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/16-shadowmaps/shadowmaps.cpp b/examples/16-shadowmaps/shadowmaps.cpp index 03ef90e99..f648a624a 100644 --- a/examples/16-shadowmaps/shadowmaps.cpp +++ b/examples/16-shadowmaps/shadowmaps.cpp @@ -1156,7 +1156,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_viewState.m_width; init.resolution.height = m_viewState.m_height; init.resolution.reset = m_reset; diff --git a/examples/17-drawstress/drawstress.cpp b/examples/17-drawstress/drawstress.cpp index c76cf9d27..951ccc1cf 100644 --- a/examples/17-drawstress/drawstress.cpp +++ b/examples/17-drawstress/drawstress.cpp @@ -131,7 +131,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/18-ibl/ibl.cpp b/examples/18-ibl/ibl.cpp index fc3286b45..972e29dee 100644 --- a/examples/18-ibl/ibl.cpp +++ b/examples/18-ibl/ibl.cpp @@ -420,7 +420,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/19-oit/oit.cpp b/examples/19-oit/oit.cpp index fa846b529..a1e54c2b1 100644 --- a/examples/19-oit/oit.cpp +++ b/examples/19-oit/oit.cpp @@ -171,7 +171,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/20-nanovg/nanovg.cpp b/examples/20-nanovg/nanovg.cpp index 62c17bcb9..f9db9d9a6 100644 --- a/examples/20-nanovg/nanovg.cpp +++ b/examples/20-nanovg/nanovg.cpp @@ -1404,7 +1404,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/21-deferred/deferred.cpp b/examples/21-deferred/deferred.cpp index c77c4f79b..92f4786df 100644 --- a/examples/21-deferred/deferred.cpp +++ b/examples/21-deferred/deferred.cpp @@ -209,7 +209,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/22-windows/windows.cpp b/examples/22-windows/windows.cpp index 04b9b26e1..169d54ac2 100644 --- a/examples/22-windows/windows.cpp +++ b/examples/22-windows/windows.cpp @@ -88,7 +88,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/24-nbody/nbody.cpp b/examples/24-nbody/nbody.cpp index b47469d8c..52bef1caa 100644 --- a/examples/24-nbody/nbody.cpp +++ b/examples/24-nbody/nbody.cpp @@ -132,7 +132,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/26-occlusion/occlusion.cpp b/examples/26-occlusion/occlusion.cpp index 57cfa097c..3e3cc57e7 100644 --- a/examples/26-occlusion/occlusion.cpp +++ b/examples/26-occlusion/occlusion.cpp @@ -84,7 +84,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/27-terrain/terrain.cpp b/examples/27-terrain/terrain.cpp index 867e50894..4732e25f3 100644 --- a/examples/27-terrain/terrain.cpp +++ b/examples/27-terrain/terrain.cpp @@ -80,7 +80,7 @@ ExampleTerrain(const char* _name, const char* _description, const char* _url) init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/28-wireframe/wireframe.cpp b/examples/28-wireframe/wireframe.cpp index 397577ba1..75001cda5 100644 --- a/examples/28-wireframe/wireframe.cpp +++ b/examples/28-wireframe/wireframe.cpp @@ -293,7 +293,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/29-debugdraw/debugdraw.cpp b/examples/29-debugdraw/debugdraw.cpp index 20a240fb4..ea67655d9 100644 --- a/examples/29-debugdraw/debugdraw.cpp +++ b/examples/29-debugdraw/debugdraw.cpp @@ -780,7 +780,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/30-picking/picking.cpp b/examples/30-picking/picking.cpp index a9387ecfb..fcbe63e57 100644 --- a/examples/30-picking/picking.cpp +++ b/examples/30-picking/picking.cpp @@ -40,7 +40,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/31-rsm/reflectiveshadowmap.cpp b/examples/31-rsm/reflectiveshadowmap.cpp index 3d055f80e..cd4143816 100644 --- a/examples/31-rsm/reflectiveshadowmap.cpp +++ b/examples/31-rsm/reflectiveshadowmap.cpp @@ -210,7 +210,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/32-particles/particles.cpp b/examples/32-particles/particles.cpp index 12ab607af..a58adda57 100644 --- a/examples/32-particles/particles.cpp +++ b/examples/32-particles/particles.cpp @@ -248,7 +248,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/33-pom/pom.cpp b/examples/33-pom/pom.cpp index 508178faf..5a7766ce4 100644 --- a/examples/33-pom/pom.cpp +++ b/examples/33-pom/pom.cpp @@ -130,7 +130,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/34-mvs/mvs.cpp b/examples/34-mvs/mvs.cpp index 7fecebead..c23aa29b1 100644 --- a/examples/34-mvs/mvs.cpp +++ b/examples/34-mvs/mvs.cpp @@ -126,7 +126,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/35-dynamic/dynamic.cpp b/examples/35-dynamic/dynamic.cpp index 7ee451f5e..f27b7c98e 100644 --- a/examples/35-dynamic/dynamic.cpp +++ b/examples/35-dynamic/dynamic.cpp @@ -104,7 +104,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/36-sky/sky.cpp b/examples/36-sky/sky.cpp index b82c31fda..d00a4aa9b 100644 --- a/examples/36-sky/sky.cpp +++ b/examples/36-sky/sky.cpp @@ -420,7 +420,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/37-gpudrivenrendering/gpudrivenrendering.cpp b/examples/37-gpudrivenrendering/gpudrivenrendering.cpp index 5a3ff9acc..cbe33c339 100644 --- a/examples/37-gpudrivenrendering/gpudrivenrendering.cpp +++ b/examples/37-gpudrivenrendering/gpudrivenrendering.cpp @@ -330,7 +330,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/38-bloom/bloom.cpp b/examples/38-bloom/bloom.cpp index 33a89170a..04a974c4d 100644 --- a/examples/38-bloom/bloom.cpp +++ b/examples/38-bloom/bloom.cpp @@ -196,7 +196,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/39-assao/assao.cpp b/examples/39-assao/assao.cpp index 6dc1de27c..0a51f3ca3 100644 --- a/examples/39-assao/assao.cpp +++ b/examples/39-assao/assao.cpp @@ -268,7 +268,7 @@ namespace init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/40-svt/svt.cpp b/examples/40-svt/svt.cpp index 3256f6495..cde5f01ac 100644 --- a/examples/40-svt/svt.cpp +++ b/examples/40-svt/svt.cpp @@ -82,7 +82,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/41-tess/tess.cpp b/examples/41-tess/tess.cpp index 8f0ef1643..e92d22be1 100644 --- a/examples/41-tess/tess.cpp +++ b/examples/41-tess/tess.cpp @@ -339,7 +339,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/42-bunnylod/bunnylod.cpp b/examples/42-bunnylod/bunnylod.cpp index 4bfbbf907..34e6db1ac 100644 --- a/examples/42-bunnylod/bunnylod.cpp +++ b/examples/42-bunnylod/bunnylod.cpp @@ -264,7 +264,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/43-denoise/denoise.cpp b/examples/43-denoise/denoise.cpp index 3fd2eca7b..ac6fb6c2f 100644 --- a/examples/43-denoise/denoise.cpp +++ b/examples/43-denoise/denoise.cpp @@ -250,7 +250,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/44-sss/screen_space_shadows.cpp b/examples/44-sss/screen_space_shadows.cpp index 186a64619..c32c6f109 100644 --- a/examples/44-sss/screen_space_shadows.cpp +++ b/examples/44-sss/screen_space_shadows.cpp @@ -262,7 +262,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/45-bokeh/bokeh.cpp b/examples/45-bokeh/bokeh.cpp index edb8bc870..8c30df3f1 100644 --- a/examples/45-bokeh/bokeh.cpp +++ b/examples/45-bokeh/bokeh.cpp @@ -244,7 +244,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/47-pixelformats/pixelformats.cpp b/examples/47-pixelformats/pixelformats.cpp index 4eb79532d..0fcfc4fc7 100644 --- a/examples/47-pixelformats/pixelformats.cpp +++ b/examples/47-pixelformats/pixelformats.cpp @@ -429,7 +429,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/48-drawindirect/drawindirect.cpp b/examples/48-drawindirect/drawindirect.cpp index 65fffa123..76414104f 100644 --- a/examples/48-drawindirect/drawindirect.cpp +++ b/examples/48-drawindirect/drawindirect.cpp @@ -146,7 +146,7 @@ public: init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/49-hextile/hextile.cpp b/examples/49-hextile/hextile.cpp index 58dc2c7e3..820598f26 100644 --- a/examples/49-hextile/hextile.cpp +++ b/examples/49-hextile/hextile.cpp @@ -85,7 +85,7 @@ namespace init.vendorId = args.m_pciId; init.platformData.nwh = entry::getNativeWindowHandle(entry::kDefaultWindowHandle); init.platformData.ndt = entry::getNativeDisplayHandle(); - init.platformData.type = entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + init.platformData.type = entry::getNativeWindowHandleType(); init.resolution.width = m_width; init.resolution.height = m_height; init.resolution.reset = m_reset; diff --git a/examples/common/entry/entry.cpp b/examples/common/entry/entry.cpp index 14a489250..be3a54639 100644 --- a/examples/common/entry/entry.cpp +++ b/examples/common/entry/entry.cpp @@ -1040,5 +1040,5 @@ extern "C" void* entry_get_native_display_handle() extern "C" bgfx::NativeWindowHandleType::Enum entry_get_native_window_handle_type() { - return entry::getNativeWindowHandleType(entry::kDefaultWindowHandle); + return entry::getNativeWindowHandleType(); } diff --git a/examples/common/entry/entry.h b/examples/common/entry/entry.h index 9867aa874..4c9bdb288 100644 --- a/examples/common/entry/entry.h +++ b/examples/common/entry/entry.h @@ -299,7 +299,7 @@ namespace entry void* getNativeDisplayHandle(); /// - bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType(WindowHandle _handle); + bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType(); /// void setCurrentDir(const char* _dir); diff --git a/examples/common/entry/entry_android.cpp b/examples/common/entry/entry_android.cpp index de6bd5ab9..b120db32d 100644 --- a/examples/common/entry/entry_android.cpp +++ b/examples/common/entry/entry_android.cpp @@ -550,9 +550,8 @@ namespace entry return NULL; } - bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType(WindowHandle _handle) + bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType() { - BX_UNUSED(_handle); return bgfx::NativeWindowHandleType::Default; } diff --git a/examples/common/entry/entry_glfw.cpp b/examples/common/entry/entry_glfw.cpp index 071672696..0461dabc1 100644 --- a/examples/common/entry/entry_glfw.cpp +++ b/examples/common/entry/entry_glfw.cpp @@ -875,7 +875,7 @@ namespace entry # endif // BX_PLATFORM_* } - bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType(WindowHandle _handle) + bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType() { # if BX_PLATFORM_LINUX || BX_PLATFORM_BSD # if ENTRY_CONFIG_USE_WAYLAND diff --git a/examples/common/entry/entry_html5.cpp b/examples/common/entry/entry_html5.cpp index 998cb9501..d16572ba0 100644 --- a/examples/common/entry/entry_html5.cpp +++ b/examples/common/entry/entry_html5.cpp @@ -428,9 +428,8 @@ namespace entry return NULL; } - bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType(WindowHandle _handle) + bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType() { - BX_UNUSED(_handle); return bgfx::NativeWindowHandleType::Default; } } diff --git a/examples/common/entry/entry_ios.mm b/examples/common/entry/entry_ios.mm index d5676fef1..97e51750f 100644 --- a/examples/common/entry/entry_ios.mm +++ b/examples/common/entry/entry_ios.mm @@ -161,9 +161,8 @@ namespace entry return NULL; } - bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType(WindowHandle _handle) + bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType() { - BX_UNUSED(_handle); return bgfx::NativeWindowHandleType::Default; } diff --git a/examples/common/entry/entry_noop.cpp b/examples/common/entry/entry_noop.cpp index 1e1e61d0b..413c33de5 100644 --- a/examples/common/entry/entry_noop.cpp +++ b/examples/common/entry/entry_noop.cpp @@ -78,7 +78,7 @@ namespace entry return NULL; } - bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType(WindowHandle _handle) + bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType() { BX_UNUSED(_handle); return bgfx::NativeWindowHandleType::Default; diff --git a/examples/common/entry/entry_osx.mm b/examples/common/entry/entry_osx.mm index 201033f1a..aec370afc 100644 --- a/examples/common/entry/entry_osx.mm +++ b/examples/common/entry/entry_osx.mm @@ -725,9 +725,8 @@ namespace entry return NULL; } - bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType(WindowHandle _handle) + bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType() { - BX_UNUSED(_handle); return bgfx::NativeWindowHandleType::Default; } diff --git a/examples/common/entry/entry_sdl.cpp b/examples/common/entry/entry_sdl.cpp index 2d5e9c15e..83c34f474 100644 --- a/examples/common/entry/entry_sdl.cpp +++ b/examples/common/entry/entry_sdl.cpp @@ -1160,21 +1160,25 @@ namespace entry # endif // BX_PLATFORM_* } - bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType(WindowHandle _handle) + bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType() { SDL_SysWMinfo wmi; SDL_VERSION(&wmi.version); - if (!SDL_GetWindowWMInfo(s_ctx.m_window[_handle.idx], &wmi) ) + if (!SDL_GetWindowWMInfo(s_ctx.m_window[kDefaultWindowHandle], &wmi) ) { return bgfx::NativeWindowHandleType::Default; } # if BX_PLATFORM_LINUX || BX_PLATFORM_BSD # if ENTRY_CONFIG_USE_WAYLAND if (wmi.subsystem == SDL_SYSWM_WAYLAND) + { return bgfx::NativeWindowHandleType::Wayland; + } else # endif // ENTRY_CONFIG_USE_WAYLAND + { return bgfx::NativeWindowHandleType::Default; + } # else return bgfx::NativeWindowHandleType::Default; # endif // BX_PLATFORM_* diff --git a/examples/common/entry/entry_windows.cpp b/examples/common/entry/entry_windows.cpp index 7db32cd1d..073c6be59 100644 --- a/examples/common/entry/entry_windows.cpp +++ b/examples/common/entry/entry_windows.cpp @@ -1169,9 +1169,8 @@ namespace entry return NULL; } - bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType(WindowHandle _handle) + bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType() { - BX_UNUSED(_handle); return bgfx::NativeWindowHandleType::Default; } diff --git a/examples/common/entry/entry_x11.cpp b/examples/common/entry/entry_x11.cpp index 9d80593f9..f66349694 100644 --- a/examples/common/entry/entry_x11.cpp +++ b/examples/common/entry/entry_x11.cpp @@ -771,9 +771,8 @@ namespace entry return s_ctx.m_display; } - bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType(WindowHandle _handle) + bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType() { - BX_UNUSED(_handle); return bgfx::NativeWindowHandleType::Default; }