From 9f2b58017add9b4e2dc3cd53129c301b91f88cde Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Mon, 10 Jun 2019 11:03:40 -0700 Subject: [PATCH 01/75] Update bgfx and bx submodules --- bgfx | 2 +- bx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bgfx b/bgfx index b5d8c89c..d992a3b6 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit b5d8c89c290289e339925a7aab0ef161dc71a0e3 +Subproject commit d992a3b62e1aef406e910bd150b30ce24152955e diff --git a/bx b/bx index 7a68aba8..c1b38fba 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 7a68aba842a0651541be23b32a85dabdafd6bbf3 +Subproject commit c1b38fba50f938f1866ae77806c47fd7955bf9c2 From de88c82f3ee156746f2abdc6045c7546d0a95b31 Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Mon, 10 Jun 2019 11:27:33 -0700 Subject: [PATCH 02/75] Update .gitmodules to the right path --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 05d956fc..fe3c45c0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "bgfx"] path = bgfx - url = https://github.com/bkaradzic/bgfx.git + url = https://github.com/syntheticmagus/bgfx.git [submodule "bx"] path = bx url = https://github.com/bkaradzic/bx.git From 5f2f6d92ca15e48dad8e73b35f3cec1bdddd2c8e Mon Sep 17 00:00:00 2001 From: Justin Murray <33846034+syntheticmagus@users.noreply.github.com> Date: Mon, 10 Jun 2019 12:58:34 -0700 Subject: [PATCH 03/75] Removed IB-compress scripts from build system because IB-compress is not available in the version of BGFX that we're using. --- cmake/3rdparty/ib-compress.cmake | 19 ------------------- cmake/examples.cmake | 1 - 2 files changed, 20 deletions(-) delete mode 100644 cmake/3rdparty/ib-compress.cmake diff --git a/cmake/3rdparty/ib-compress.cmake b/cmake/3rdparty/ib-compress.cmake deleted file mode 100644 index 8d0a23f2..00000000 --- a/cmake/3rdparty/ib-compress.cmake +++ /dev/null @@ -1,19 +0,0 @@ -# bgfx.cmake - bgfx building in cmake -# Written in 2017 by Joshua Brookover - -# To the extent possible under law, the author(s) have dedicated all copyright -# and related and neighboring rights to this software to the public domain -# worldwide. This software is distributed without any warranty. - -# You should have received a copy of the CC0 Public Domain Dedication along with -# this software. If not, see . - -if( TARGET ib-compress ) - return() -endif() - -file( GLOB IB_COMPRESS_SOURCES ${BGFX_DIR}/3rdparty/ib-compress/*.cpp ${BGFX_DIR}/3rdparty/ib-compress/*.h ) - -add_library( ib-compress STATIC ${IB_COMPRESS_SOURCES} ) -target_include_directories( ib-compress PUBLIC ${BGFX_DIR}/3rdparty ) -set_target_properties( ib-compress PROPERTIES FOLDER "bgfx/3rdparty" ) diff --git a/cmake/examples.cmake b/cmake/examples.cmake index 571db18d..00f8d555 100755 --- a/cmake/examples.cmake +++ b/cmake/examples.cmake @@ -12,7 +12,6 @@ include( CMakeParseArguments ) include( cmake/util/ConfigureDebugging.cmake ) -include( cmake/3rdparty/ib-compress.cmake ) include( cmake/3rdparty/dear-imgui.cmake ) function( add_bgfx_shader FILE FOLDER ) From 4d4d5b95004f20fa285b7008236b9653ab7f7f17 Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Mon, 1 Jul 2019 13:32:23 -0700 Subject: [PATCH 04/75] Update bgfx with 32 streams fix --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index d992a3b6..6cf6b913 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit d992a3b62e1aef406e910bd150b30ce24152955e +Subproject commit 6cf6b913da1b2c65c3e3c8532cd50f0c96e8e918 From 001548407466668fe35b8bc7694b8df35ed7d080 Mon Sep 17 00:00:00 2001 From: Justin Murray <33846034+syntheticmagus@users.noreply.github.com> Date: Wed, 7 Aug 2019 11:05:55 -0700 Subject: [PATCH 05/75] First round of changes to support UWP: ZW compiler flag, _CRT_SECURE_NO_WARNINGS, and cordoned off an incompatible bimg add-on. --- bgfx | 2 +- bimg | 2 +- bx | 2 +- cmake/bimg.cmake | 6 +++++- cmake/bx.cmake | 10 ++++++++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/bgfx b/bgfx index 6cf6b913..0f2dfae5 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 6cf6b913da1b2c65c3e3c8532cd50f0c96e8e918 +Subproject commit 0f2dfae5e17c4981211c9e3c4cfa7f0c338ba498 diff --git a/bimg b/bimg index f89b12ae..dab021bc 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit f89b12ae25e4d3734549fe6da19c75ed63789742 +Subproject commit dab021bc46dabba270123a32cc1c2f8102593e13 diff --git a/bx b/bx index c1b38fba..2e4bc10d 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit c1b38fba50f938f1866ae77806c47fd7955bf9c2 +Subproject commit 2e4bc10d6c63b811f4aa2f9c8678339221bc73ca diff --git a/cmake/bimg.cmake b/cmake/bimg.cmake index 3a5e9fac..3f7abc7a 100644 --- a/cmake/bimg.cmake +++ b/cmake/bimg.cmake @@ -16,9 +16,13 @@ include( cmake/3rdparty/etc1.cmake ) include( cmake/3rdparty/etc2.cmake ) include( cmake/3rdparty/iqa.cmake ) include( cmake/3rdparty/libsquish.cmake ) -include( cmake/3rdparty/nvtt.cmake ) include( cmake/3rdparty/pvrtc.cmake ) +# NVTT has not been made compatible with Windows Store builds +if (NOT WINDOWS_STORE ) + include( cmake/3rdparty/nvtt.cmake ) +endif () + # Ensure the directory exists if( NOT IS_DIRECTORY ${BIMG_DIR} ) message( SEND_ERROR "Could not load bimg, directory does not exist. ${BIMG_DIR}" ) diff --git a/cmake/bx.cmake b/cmake/bx.cmake index c95508b1..aef41d74 100644 --- a/cmake/bx.cmake +++ b/cmake/bx.cmake @@ -35,6 +35,11 @@ if( WIN32 ) target_link_libraries( bx PUBLIC psapi ) endif() +# For Windows Store, consume WinRT libraries +if ( WINDOWS_STORE ) + target_compile_options( bx PUBLIC /ZW ) +endif() + # Add include directory of bx target_include_directories( bx PUBLIC ${BX_DIR}/include ${BX_DIR}/3rdparty ) @@ -52,6 +57,11 @@ target_compile_definitions( bx PUBLIC "__STDC_LIMIT_MACROS" ) target_compile_definitions( bx PUBLIC "__STDC_FORMAT_MACROS" ) target_compile_definitions( bx PUBLIC "__STDC_CONSTANT_MACROS" ) +# Windows Store specific +if ( WINDOWS_STORE ) + target_compile_definitions( bx PUBLIC "_CRT_SECURE_NO_WARNINGS" ) +endif () + target_compile_definitions( bx PRIVATE "$<$:BX_CONFIG_DEBUG=1>" ) if(BGFX_CONFIG_DEBUG) target_compile_definitions( bx PRIVATE BX_CONFIG_DEBUG=1) From 9a7ab94669cf1b67282e65a1bafb9f3e9688ee8c Mon Sep 17 00:00:00 2001 From: Justin Murray <33846034+syntheticmagus@users.noreply.github.com> Date: Wed, 7 Aug 2019 17:51:14 -0700 Subject: [PATCH 06/75] Up-to-date merged version of BGFX. --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 0f2dfae5..c042dadf 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 0f2dfae5e17c4981211c9e3c4cfa7f0c338ba498 +Subproject commit c042dadf34c7e360014babbbeaf6b2766ff47486 From fa00b1fdc8362da65b920fdb6c0fc6fb07498bfc Mon Sep 17 00:00:00 2001 From: Justin Murray <33846034+syntheticmagus@users.noreply.github.com> Date: Wed, 7 Aug 2019 18:02:28 -0700 Subject: [PATCH 07/75] Fixed wrong commit number for submodule. --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index c042dadf..3343d06c 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit c042dadf34c7e360014babbbeaf6b2766ff47486 +Subproject commit 3343d06c3cecceab8a0cc8dcd2eb45acb04e8c4c From 3a82a743fa95e612d38ccb726d88289695ec943f Mon Sep 17 00:00:00 2001 From: Justin Murray <33846034+syntheticmagus@users.noreply.github.com> Date: Thu, 8 Aug 2019 13:05:58 -0700 Subject: [PATCH 08/75] Re-enabled NVTT for UWP (successful building requires a bimg change, currently pending) and switched several compiler options to private. --- cmake/3rdparty/nvtt.cmake | 5 +++++ cmake/bimg.cmake | 6 +----- cmake/bx.cmake | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cmake/3rdparty/nvtt.cmake b/cmake/3rdparty/nvtt.cmake index f7f72a22..ee200c10 100644 --- a/cmake/3rdparty/nvtt.cmake +++ b/cmake/3rdparty/nvtt.cmake @@ -31,3 +31,8 @@ add_library( nvtt STATIC ${NVTT_SOURCES} ) target_include_directories( nvtt PUBLIC ${BIMG_DIR}/3rdparty ${BIMG_DIR}/3rdparty/nvtt ) set_target_properties( nvtt PROPERTIES FOLDER "bgfx/3rdparty" ) target_link_libraries( nvtt PUBLIC bx ) + +# Automatically-enabled SDL errors cause NVTT to fail for Windows Store +if ( WINDOWS_STORE ) + target_compile_options( nvtt PRIVATE /sdl- ) +endif() \ No newline at end of file diff --git a/cmake/bimg.cmake b/cmake/bimg.cmake index 3f7abc7a..3a5e9fac 100644 --- a/cmake/bimg.cmake +++ b/cmake/bimg.cmake @@ -16,13 +16,9 @@ include( cmake/3rdparty/etc1.cmake ) include( cmake/3rdparty/etc2.cmake ) include( cmake/3rdparty/iqa.cmake ) include( cmake/3rdparty/libsquish.cmake ) +include( cmake/3rdparty/nvtt.cmake ) include( cmake/3rdparty/pvrtc.cmake ) -# NVTT has not been made compatible with Windows Store builds -if (NOT WINDOWS_STORE ) - include( cmake/3rdparty/nvtt.cmake ) -endif () - # Ensure the directory exists if( NOT IS_DIRECTORY ${BIMG_DIR} ) message( SEND_ERROR "Could not load bimg, directory does not exist. ${BIMG_DIR}" ) diff --git a/cmake/bx.cmake b/cmake/bx.cmake index aef41d74..be0fe5d3 100644 --- a/cmake/bx.cmake +++ b/cmake/bx.cmake @@ -37,7 +37,7 @@ endif() # For Windows Store, consume WinRT libraries if ( WINDOWS_STORE ) - target_compile_options( bx PUBLIC /ZW ) + target_compile_options( bx PRIVATE /ZW ) endif() # Add include directory of bx @@ -59,7 +59,7 @@ target_compile_definitions( bx PUBLIC "__STDC_CONSTANT_MACROS" ) # Windows Store specific if ( WINDOWS_STORE ) - target_compile_definitions( bx PUBLIC "_CRT_SECURE_NO_WARNINGS" ) + target_compile_definitions( bx PRIVATE "_CRT_SECURE_NO_WARNINGS" ) endif () target_compile_definitions( bx PRIVATE "$<$:BX_CONFIG_DEBUG=1>" ) From 25d023f1bc77e91e2ba9ad02d4010bd661a4e90e Mon Sep 17 00:00:00 2001 From: Justin Murray <33846034+syntheticmagus@users.noreply.github.com> Date: Fri, 9 Aug 2019 13:19:10 -0700 Subject: [PATCH 09/75] Added commits for arm fixes for bimg. --- bimg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bimg b/bimg index dab021bc..b34b29fa 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit dab021bc46dabba270123a32cc1c2f8102593e13 +Subproject commit b34b29fa694d5bd328bd374c1728b4d0426b1788 From 25a603e3399035b09b2a0adcd33df1bf19403760 Mon Sep 17 00:00:00 2001 From: Justin Murray <33846034+syntheticmagus@users.noreply.github.com> Date: Wed, 14 Aug 2019 09:53:57 -0700 Subject: [PATCH 10/75] Updated submodule to consume BGFX WinRT fix. --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 3343d06c..c9a997ed 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 3343d06c3cecceab8a0cc8dcd2eb45acb04e8c4c +Subproject commit c9a997ed804643d83df0e8ca6fcc277729c1886e From 52ca95ef3d09d2b22e90f963db91e4b04df1b654 Mon Sep 17 00:00:00 2001 From: Justin Murray <33846034+syntheticmagus@users.noreply.github.com> Date: Mon, 16 Sep 2019 16:49:04 -0700 Subject: [PATCH 11/75] Added support for creating SRVs for typeless textures in D3D11. --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index c9a997ed..a7689d56 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit c9a997ed804643d83df0e8ca6fcc277729c1886e +Subproject commit a7689d56abb7aae04e346cd94db4c9e804607b93 From 0c0d5752c4de7c92d9803648c3404e131d321cc0 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Mon, 25 Nov 2019 11:53:11 +0100 Subject: [PATCH 12/75] repos update --- bgfx | 2 +- bimg | 2 +- bx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bgfx b/bgfx index a7689d56..f50315c9 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit a7689d56abb7aae04e346cd94db4c9e804607b93 +Subproject commit f50315c955328078f22c8aed631063ee1314ce87 diff --git a/bimg b/bimg index b34b29fa..dc4d1f53 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit b34b29fa694d5bd328bd374c1728b4d0426b1788 +Subproject commit dc4d1f53451a532ec04a97938b0fd235e1fcc3c4 diff --git a/bx b/bx index 2e4bc10d..1680ef41 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 2e4bc10d6c63b811f4aa2f9c8678339221bc73ca +Subproject commit 1680ef418acf11f85d835d4f95365b01c13f7324 From 93378f175ca5303c228591510d9f131261300940 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Tue, 26 Nov 2019 14:38:39 +0100 Subject: [PATCH 13/75] bgfx update --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index f50315c9..b3ec1c8d 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit f50315c955328078f22c8aed631063ee1314ce87 +Subproject commit b3ec1c8d140864611b6e5c215baee46242eeab38 From 7f7018159d51ba45e4584b8207e95195c2f526c3 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 9 Apr 2020 15:58:11 +0200 Subject: [PATCH 14/75] update bgfx --- bgfx | 2 +- bimg | 2 +- bx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bgfx b/bgfx index b3ec1c8d..aac758b7 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit b3ec1c8d140864611b6e5c215baee46242eeab38 +Subproject commit aac758b7c1c6b671135b99595a921c8bcc27cf73 diff --git a/bimg b/bimg index dc4d1f53..b093e11e 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit dc4d1f53451a532ec04a97938b0fd235e1fcc3c4 +Subproject commit b093e11e15b0fa29d4698cdb3c71a290fdad6b14 diff --git a/bx b/bx index 1680ef41..936327aa 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 1680ef418acf11f85d835d4f95365b01c13f7324 +Subproject commit 936327aa0ff58fd3055edece1ed8c6da15a36e6b From b5493bd87e7a9c6885337f2ca8ce98ed3fc7796b Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Fri, 22 May 2020 22:07:52 +0200 Subject: [PATCH 15/75] update bx --- bx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bx b/bx index 936327aa..3d5d56fe 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 936327aa0ff58fd3055edece1ed8c6da15a36e6b +Subproject commit 3d5d56fef5b18592b59d9c7342bb5639780846da From 27b1598e10c2a45f09082320df729c938ac0e2c5 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Sat, 23 May 2020 09:56:13 +0200 Subject: [PATCH 16/75] update bimg --- bimg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bimg b/bimg index b093e11e..06d1e315 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit b093e11e15b0fa29d4698cdb3c71a290fdad6b14 +Subproject commit 06d1e315abd7b8586d818cb315fd9047734e185a From 465ba5db72b69347c77ed10153c73deecad81d16 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Sat, 23 May 2020 10:14:57 +0200 Subject: [PATCH 17/75] update bgfx --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index aac758b7..aa4f9ddf 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit aac758b7c1c6b671135b99595a921c8bcc27cf73 +Subproject commit aa4f9ddf8a3bbc0df792685ec9e69335233f028b From 512127a704498a68d3f102de7d286220725a5684 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Sat, 23 May 2020 11:19:14 +0200 Subject: [PATCH 18/75] disable warning for bx --- cmake/bx.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/bx.cmake b/cmake/bx.cmake index b21677c3..308173c8 100644 --- a/cmake/bx.cmake +++ b/cmake/bx.cmake @@ -85,6 +85,10 @@ elseif(APPLE) target_link_libraries( bx PUBLIC ${FOUNDATION_LIBRARY} ) endif() +if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + target_link_options(bx PRIVATE /ignore:4264) +endif() + # Put in a "bgfx" folder in Visual Studio set_target_properties( bx PROPERTIES FOLDER "bgfx" ) From b6795af210c4e6a1695732bf89b46d587991f40e Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Sat, 23 May 2020 11:43:42 +0200 Subject: [PATCH 19/75] revert flag change --- cmake/bx.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmake/bx.cmake b/cmake/bx.cmake index 308173c8..b21677c3 100644 --- a/cmake/bx.cmake +++ b/cmake/bx.cmake @@ -85,10 +85,6 @@ elseif(APPLE) target_link_libraries( bx PUBLIC ${FOUNDATION_LIBRARY} ) endif() -if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - target_link_options(bx PRIVATE /ignore:4264) -endif() - # Put in a "bgfx" folder in Visual Studio set_target_properties( bx PROPERTIES FOLDER "bgfx" ) From 78252835574c93399f94f0d743e057367cc6c1ca Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Sat, 23 May 2020 21:26:40 +0200 Subject: [PATCH 20/75] bx update --- bx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bx b/bx index 3d5d56fe..4e0267fa 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 3d5d56fef5b18592b59d9c7342bb5639780846da +Subproject commit 4e0267fae7b150112d7262b6144da22d7f899c3a From 2dfb00d77617769ada93a8b254fb54feb130b908 Mon Sep 17 00:00:00 2001 From: syntheticmagus <33846034+syntheticmagus@users.noreply.github.com> Date: Fri, 12 Jun 2020 19:10:59 -0700 Subject: [PATCH 21/75] Consume new OpenGL shader processing change in bgfx. --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index aa4f9ddf..48e63c0e 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit aa4f9ddf8a3bbc0df792685ec9e69335233f028b +Subproject commit 48e63c0e5801292f4d4f78f66e762c923ea47d30 From cf76bc4b363763032db0ebabfe722cf7636fee39 Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Wed, 24 Jun 2020 13:25:30 -0700 Subject: [PATCH 22/75] Update bgfx --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 48e63c0e..041c7c7f 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 48e63c0e5801292f4d4f78f66e762c923ea47d30 +Subproject commit 041c7c7f0a1d54122d181500f1623c5e476a36a3 From 5f8f05bcf58791eb4b7a6309b94dd79c22284795 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 23 Jul 2020 11:12:29 +0200 Subject: [PATCH 23/75] update bgfx for metal reinit --- bgfx | 2 +- bimg | 2 +- bx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bgfx b/bgfx index 041c7c7f..58ca2b82 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 041c7c7f0a1d54122d181500f1623c5e476a36a3 +Subproject commit 58ca2b82136f6d8bff9f64efe483551b7d2ef7a1 diff --git a/bimg b/bimg index 06d1e315..bfe3c683 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit 06d1e315abd7b8586d818cb315fd9047734e185a +Subproject commit bfe3c683f9c628fb3fd5d71b1a80d8fbdb6044a4 diff --git a/bx b/bx index 4e0267fa..c5b9b64c 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 4e0267fae7b150112d7262b6144da22d7f899c3a +Subproject commit c5b9b64c2d7c270494f6ad89cbb4090f8e3e7b64 From 93cd5583f72058b2366e5591a31be695087d5c28 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 23 Jul 2020 11:31:24 +0200 Subject: [PATCH 24/75] fix bxcheck --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 58ca2b82..ca96ef4f 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 58ca2b82136f6d8bff9f64efe483551b7d2ef7a1 +Subproject commit ca96ef4ff2c3de3864965f54a7102b1faa7fae61 From 7b1a20242463d54ffc7f0a0269fac5bf70340c0c Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Sat, 31 Oct 2020 11:16:38 +0100 Subject: [PATCH 25/75] update bgfx/bimg/bx --- bgfx | 2 +- bimg | 2 +- bx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bgfx b/bgfx index ca96ef4f..6073c3e0 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit ca96ef4ff2c3de3864965f54a7102b1faa7fae61 +Subproject commit 6073c3e04790444bb9250f50d39a8b0017bc06dd diff --git a/bimg b/bimg index bfe3c683..5077cd01 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit bfe3c683f9c628fb3fd5d71b1a80d8fbdb6044a4 +Subproject commit 5077cd017e2caeeb61cc6ea6fde19d2edcef13b8 diff --git a/bx b/bx index c5b9b64c..7837d908 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit c5b9b64c2d7c270494f6ad89cbb4090f8e3e7b64 +Subproject commit 7837d90865b391fd45698add941082823f5a83a6 From e70c465124b420709a8b5e381137c0f3df411a0b Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Fri, 13 Nov 2020 17:48:02 +0100 Subject: [PATCH 26/75] update bgfx --- bgfx | 2 +- bimg | 2 +- bx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bgfx b/bgfx index ca96ef4f..65b40ed9 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit ca96ef4ff2c3de3864965f54a7102b1faa7fae61 +Subproject commit 65b40ed9d0d092057045de122b13b1ce2750bf07 diff --git a/bimg b/bimg index bfe3c683..5077cd01 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit bfe3c683f9c628fb3fd5d71b1a80d8fbdb6044a4 +Subproject commit 5077cd017e2caeeb61cc6ea6fde19d2edcef13b8 diff --git a/bx b/bx index c5b9b64c..7837d908 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit c5b9b64c2d7c270494f6ad89cbb4090f8e3e7b64 +Subproject commit 7837d90865b391fd45698add941082823f5a83a6 From 40f2dd5699f010349612f7218ada4c11f123b1b0 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Fri, 13 Nov 2020 19:41:19 +0100 Subject: [PATCH 27/75] update --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 6073c3e0..038bd724 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 6073c3e04790444bb9250f50d39a8b0017bc06dd +Subproject commit 038bd72464a4cffe0de369003a852df1bb0042e3 From 48446986d0d8a0acee42fc091af93303f132e6da Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Wed, 2 Dec 2020 12:03:24 -0800 Subject: [PATCH 28/75] Update bgfx submodule to include fix to respect BGFX_RESET_FLIP_AFTER_RENDER during bgfx init. --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 038bd724..11681ba6 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 038bd72464a4cffe0de369003a852df1bb0042e3 +Subproject commit 11681ba6a974878c304a404cd51e866b8f5deba5 From 9fa98523501db0bc303187e374e003b8279d9f79 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Thu, 10 Dec 2020 11:02:21 -0800 Subject: [PATCH 29/75] Update bgfx submodule to add new config to allow waiting to fully render on flip --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 11681ba6..91c92d60 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 11681ba6a974878c304a404cd51e866b8f5deba5 +Subproject commit 91c92d6084febb50308cf31020858d272cd89610 From aada77770963be43819f9c54d9c472c70e006ec4 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 17 Dec 2020 14:18:03 +0100 Subject: [PATCH 30/75] update bgfx --- bgfx | 2 +- bimg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bgfx b/bgfx index 65b40ed9..14bfa0a4 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 65b40ed9d0d092057045de122b13b1ce2750bf07 +Subproject commit 14bfa0a4639f22cfda0baa6bec0e45622a06e9a6 diff --git a/bimg b/bimg index 5077cd01..bf830a85 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit 5077cd017e2caeeb61cc6ea6fde19d2edcef13b8 +Subproject commit bf830a85f5fc0e615aad445dbd7985031a6e754e From 4502ba77f6f5675bbd8be38979beea6cb306640f Mon Sep 17 00:00:00 2001 From: Chris Barth Date: Fri, 18 Dec 2020 10:40:26 -0800 Subject: [PATCH 31/75] add new cmake flag to avoid consuming windows runtime --- cmake/bx.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake/bx.cmake b/cmake/bx.cmake index b21677c3..6d1e6d71 100644 --- a/cmake/bx.cmake +++ b/cmake/bx.cmake @@ -35,8 +35,13 @@ if( WIN32 ) target_link_libraries( bx PUBLIC psapi ) endif() -# For Windows Store, consume WinRT libraries -if ( WINDOWS_STORE ) +# Avoid consuming the windows runtime library for winrt c++ projects +if ( WINDOWS_WINRT_NO_RUNTIME ) + target_compile_definitions( bx PRIVATE "WINDOWS_WINRT_NO_RUNTIME" ) +endif() + +# For Windows Store apps not using winrt c++ support, consume WinRT libraries +if ( WINDOWS_STORE AND NOT WINDOWS_USE_WINRT_CPP ) target_compile_options( bx PRIVATE /ZW ) endif() From 46ce9c87e78ab9b11e5634ed6a11142cfad2980e Mon Sep 17 00:00:00 2001 From: Chris Barth Date: Fri, 18 Dec 2020 10:51:19 -0800 Subject: [PATCH 32/75] update cmake flags --- cmake/bx.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/bx.cmake b/cmake/bx.cmake index 6d1e6d71..39d2500e 100644 --- a/cmake/bx.cmake +++ b/cmake/bx.cmake @@ -41,7 +41,7 @@ if ( WINDOWS_WINRT_NO_RUNTIME ) endif() # For Windows Store apps not using winrt c++ support, consume WinRT libraries -if ( WINDOWS_STORE AND NOT WINDOWS_USE_WINRT_CPP ) +if ( WINDOWS_STORE AND NOT WINDOWS_WINRT_NO_RUNTIME ) target_compile_options( bx PRIVATE /ZW ) endif() From 94593061a18b0b4688a83bbf2e4023e427787d4a Mon Sep 17 00:00:00 2001 From: Chris Barth Date: Tue, 22 Dec 2020 13:41:16 -0800 Subject: [PATCH 33/75] remove windows runtime component --- cmake/bx.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmake/bx.cmake b/cmake/bx.cmake index 39d2500e..f41e7a1e 100644 --- a/cmake/bx.cmake +++ b/cmake/bx.cmake @@ -40,11 +40,6 @@ if ( WINDOWS_WINRT_NO_RUNTIME ) target_compile_definitions( bx PRIVATE "WINDOWS_WINRT_NO_RUNTIME" ) endif() -# For Windows Store apps not using winrt c++ support, consume WinRT libraries -if ( WINDOWS_STORE AND NOT WINDOWS_WINRT_NO_RUNTIME ) - target_compile_options( bx PRIVATE /ZW ) -endif() - # Add include directory of bx target_include_directories( bx PUBLIC From 207564f2fd34cf4e332670cf917eae9244fce7be Mon Sep 17 00:00:00 2001 From: Chris Barth Date: Tue, 22 Dec 2020 13:51:26 -0800 Subject: [PATCH 34/75] remove adding consume windows runtime flag --- cmake/bx.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmake/bx.cmake b/cmake/bx.cmake index f41e7a1e..59f7b015 100644 --- a/cmake/bx.cmake +++ b/cmake/bx.cmake @@ -35,11 +35,6 @@ if( WIN32 ) target_link_libraries( bx PUBLIC psapi ) endif() -# Avoid consuming the windows runtime library for winrt c++ projects -if ( WINDOWS_WINRT_NO_RUNTIME ) - target_compile_definitions( bx PRIVATE "WINDOWS_WINRT_NO_RUNTIME" ) -endif() - # Add include directory of bx target_include_directories( bx PUBLIC From 6b4e08f64a5caa8c477b3fe65af245da0c74e12a Mon Sep 17 00:00:00 2001 From: Chris Barth Date: Mon, 4 Jan 2021 09:10:15 -0800 Subject: [PATCH 35/75] update bgfx submodule commits to pick up uwp fixes --- bimg | 2 +- bx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bimg b/bimg index bf830a85..13660578 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit bf830a85f5fc0e615aad445dbd7985031a6e754e +Subproject commit 13660578229162d16918654303a79852061960d7 diff --git a/bx b/bx index 7837d908..3824b48a 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 7837d90865b391fd45698add941082823f5a83a6 +Subproject commit 3824b48a0c1cefee12ff0d87b29cff5115255d56 From e5a7f97f2c15fff98fef1f857b6040aa4d624b40 Mon Sep 17 00:00:00 2001 From: Chris Barth Date: Wed, 6 Jan 2021 10:05:55 -0800 Subject: [PATCH 36/75] move to babylonjs bgfx repo --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index fe3c45c0..127858bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "bgfx"] path = bgfx - url = https://github.com/syntheticmagus/bgfx.git + url = https://github.com/BabylonJS/bgfx.git [submodule "bx"] path = bx url = https://github.com/bkaradzic/bx.git From 05c51add1aa53ae24e4a679e22f48390b9a0043d Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Wed, 6 Jan 2021 16:42:18 -0800 Subject: [PATCH 37/75] Update BGFX to fix bug on reset --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 14bfa0a4..49c6f2a2 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 14bfa0a4639f22cfda0baa6bec0e45622a06e9a6 +Subproject commit 49c6f2a2b253a81889af6c0703bf23519cec9a5f From 31d8257079b1fd54035e0c1460cd479eabfeb026 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Wed, 6 Jan 2021 17:24:19 -0800 Subject: [PATCH 38/75] Move bx onto an actual commit. It had been pointing at a (now deleted) branch of a fork. --- bx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bx b/bx index 3824b48a..208143b6 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 3824b48a0c1cefee12ff0d87b29cff5115255d56 +Subproject commit 208143b6d68ddf69ad0ef378056f6d715afd973e From fc5a75e9c699426459e1f5d18e148de07f870775 Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Thu, 18 Feb 2021 15:05:45 -0800 Subject: [PATCH 39/75] bgfx-update --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 49c6f2a2..87170e13 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 49c6f2a2b253a81889af6c0703bf23519cec9a5f +Subproject commit 87170e135d740ebbce84f2f8fc34bdfbc41653f4 From 1eb19559f54ba1051d2c97dd5a2733f8ad3b6052 Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Sat, 6 Mar 2021 21:43:28 -0800 Subject: [PATCH 40/75] bgfx update --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 49c6f2a2..ac96bef3 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 49c6f2a2b253a81889af6c0703bf23519cec9a5f +Subproject commit ac96bef36b27902c3cd0c0bc70e2ba2d75063d11 From 75092e451cbdf46f8a3720d37dc36ca6e5f2992e Mon Sep 17 00:00:00 2001 From: Chris Barth Date: Mon, 8 Mar 2021 09:00:32 -0800 Subject: [PATCH 41/75] use custom branch --- .gitmodules | 2 +- bgfx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 127858bb..6a84c209 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "bgfx"] path = bgfx - url = https://github.com/BabylonJS/bgfx.git + url = https://github.com/chrisfromwork/bgfx.git [submodule "bx"] path = bx url = https://github.com/bkaradzic/bx.git diff --git a/bgfx b/bgfx index 87170e13..7d991485 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 87170e135d740ebbce84f2f8fc34bdfbc41653f4 +Subproject commit 7d991485e3586ad37f2bc0832b294baf3fdd713d From 155220219f8290ebb6945a8bbcc6cad9adcd69ce Mon Sep 17 00:00:00 2001 From: Chris Barth Date: Wed, 10 Mar 2021 11:20:12 -0800 Subject: [PATCH 42/75] update submodule --- .gitmodules | 2 +- bgfx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6a84c209..127858bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "bgfx"] path = bgfx - url = https://github.com/chrisfromwork/bgfx.git + url = https://github.com/BabylonJS/bgfx.git [submodule "bx"] path = bx url = https://github.com/bkaradzic/bx.git diff --git a/bgfx b/bgfx index 7d991485..85473ad7 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 7d991485e3586ad37f2bc0832b294baf3fdd713d +Subproject commit 85473ad705347617bce44681f856d40bd3193fb1 From e1f92a073420b5bef38dcbd1e1214a7648840af0 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Thu, 6 May 2021 16:09:22 -0700 Subject: [PATCH 43/75] Update bgfx --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 85473ad7..6e7b232b 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 85473ad705347617bce44681f856d40bd3193fb1 +Subproject commit 6e7b232b267e04b134b4530ebc91ca28952332f7 From f853f854a1bbbc9cd3a703aa9793cb1b515f1a05 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Mon, 10 May 2021 18:34:18 -0700 Subject: [PATCH 44/75] Update bgfx to the latest to include support for signed byte and ushort vertex buffers --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 6e7b232b..784d0f2c 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 6e7b232b267e04b134b4530ebc91ca28952332f7 +Subproject commit 784d0f2cde4e3cc748bbc50e52299887927f9505 From b0a3848ca669306871417c8b6e35bde2894f9334 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Tue, 15 Jun 2021 13:56:52 -0700 Subject: [PATCH 45/75] Update BGFX --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 784d0f2c..f029e3d5 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 784d0f2cde4e3cc748bbc50e52299887927f9505 +Subproject commit f029e3d50b22c4c3faf74950682030930b06d057 From 2fb2b41401ee73469b04e2c5207af939e716dc29 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 23 Sep 2021 15:55:03 +0200 Subject: [PATCH 46/75] updatebgfx --- bgfx | 2 +- bimg | 2 +- bx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bgfx b/bgfx index f029e3d5..b70a35f1 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit f029e3d50b22c4c3faf74950682030930b06d057 +Subproject commit b70a35f1404990512ce9c0063aa3340f78bcef31 diff --git a/bimg b/bimg index 13660578..6693de0e 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit 13660578229162d16918654303a79852061960d7 +Subproject commit 6693de0e50ff7e76a22d6f37251fa2dec12168cd diff --git a/bx b/bx index 208143b6..e50536ac 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 208143b6d68ddf69ad0ef378056f6d715afd973e +Subproject commit e50536ac03eb404f50123d23f2c9ab2b3e4663e7 From 6acdd6e3abd766dea7715db5dfa4246912d491e5 Mon Sep 17 00:00:00 2001 From: Ryan Tremblay Date: Mon, 4 Oct 2021 16:30:17 -0700 Subject: [PATCH 47/75] Update bgfx --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index f029e3d5..837be565 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit f029e3d50b22c4c3faf74950682030930b06d057 +Subproject commit 837be56590b0848c47312d5a8899891998bc313b From 4982fdb438d652e981886f7b58c80ed5b63632ef Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 18 Nov 2021 11:51:14 +0100 Subject: [PATCH 48/75] update bx & bimg --- bimg | 2 +- bx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bimg b/bimg index 13660578..9e4d2b16 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit 13660578229162d16918654303a79852061960d7 +Subproject commit 9e4d2b167ffb4ecf4dba625dee59f6be7cf2587a diff --git a/bx b/bx index 208143b6..bb86fe84 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 208143b6d68ddf69ad0ef378056f6d715afd973e +Subproject commit bb86fe843b2b82b287e9b0c8916ff52f491bb437 From 15e746f8a43c2b1e949498306d7c2fd789c2f757 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 18 Nov 2021 15:04:50 +0100 Subject: [PATCH 49/75] tinyexr missing --- cmake/3rdparty/tinyexr.cmake | 10 ++++++++++ cmake/3rdparty/webgpu.cmake | 31 +++++++++++++++++++++++++++++++ cmake/bgfx.cmake | 3 ++- cmake/bimg.cmake | 3 ++- cmake/bx.cmake | 2 +- 5 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 cmake/3rdparty/tinyexr.cmake create mode 100644 cmake/3rdparty/webgpu.cmake diff --git a/cmake/3rdparty/tinyexr.cmake b/cmake/3rdparty/tinyexr.cmake new file mode 100644 index 00000000..b5c000c5 --- /dev/null +++ b/cmake/3rdparty/tinyexr.cmake @@ -0,0 +1,10 @@ +if( TARGET tinyexr ) + return() +endif() + +message("tinyexr") +file( GLOB_RECURSE TINYEXR_SOURCES ${BIMG_DIR}/3rdparty/tinyexr/*.c ${BIMG_DIR}/3rdparty/tinyexr/*.h ) + +add_library( tinyexr STATIC ${TINYEXR_SOURCES} ) +target_include_directories( tinyexr PUBLIC $ $ ) +set_target_properties( tinyexr PROPERTIES FOLDER "bgfx/3rdparty" ) \ No newline at end of file diff --git a/cmake/3rdparty/webgpu.cmake b/cmake/3rdparty/webgpu.cmake new file mode 100644 index 00000000..3575494a --- /dev/null +++ b/cmake/3rdparty/webgpu.cmake @@ -0,0 +1,31 @@ +# bgfx.cmake - bgfx building in cmake +# Written in 2017 by Joshua Brookover + +# To the extent possible under law, the author(s) have dedicated all copyright +# and related and neighboring rights to this software to the public domain +# worldwide. This software is distributed without any warranty. + +# You should have received a copy of the CC0 Public Domain Dedication along with +# this software. If not, see . + +if( TARGET webgpu ) + return() +endif() + +file( + GLOB + WEBGPU_SOURCES + ${BGFX_DIR}/3rdparty/webgpu/include/webgpu/*.h + # ${BGFX_DIR}/3rdparty/webgpu/webgpu_cpp.cpp # requires dawn to be installed +) + +# Library without sources is interface +#add_library( webgpu STATIC ${WEBGPU_SOURCES} ) +add_library(webgpu INTERFACE) +target_include_directories( webgpu + # PUBLIC + INTERFACE + $ +) + +# set_target_properties( webgpu PROPERTIES FOLDER "bgfx/3rdparty" ) \ No newline at end of file diff --git a/cmake/bgfx.cmake b/cmake/bgfx.cmake index 15758bae..a83f3bde 100755 --- a/cmake/bgfx.cmake +++ b/cmake/bgfx.cmake @@ -47,7 +47,8 @@ if( MSVC ) endif() # Add debug config required in bx headers since bx is private -if (${CMAKE_BUILD_TYPE} STREQUAL "Debug") +target_compile_definitions( bgfx PRIVATE "$<$:BGFX_CONFIG_DEBUG=1>" ) +if (BGFX_CONFIG_DEBUG) target_compile_definitions( bgfx PUBLIC "BX_CONFIG_DEBUG=1" ) else() target_compile_definitions( bgfx PUBLIC "BX_CONFIG_DEBUG=0" ) diff --git a/cmake/bimg.cmake b/cmake/bimg.cmake index 943c1ab4..b216fbf1 100644 --- a/cmake/bimg.cmake +++ b/cmake/bimg.cmake @@ -18,6 +18,7 @@ include( cmake/3rdparty/iqa.cmake ) include( cmake/3rdparty/libsquish.cmake ) include( cmake/3rdparty/nvtt.cmake ) include( cmake/3rdparty/pvrtc.cmake ) +include( cmake/3rdparty/tinyexr.cmake ) # Ensure the directory exists if( NOT IS_DIRECTORY ${BIMG_DIR} ) @@ -38,7 +39,7 @@ target_include_directories( bimg $) # bimg dependencies -target_link_libraries( bimg bx astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc ) +target_link_libraries( bimg bx astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr ) # Put in a "bgfx" folder in Visual Studio set_target_properties( bimg PROPERTIES FOLDER "bgfx" ) diff --git a/cmake/bx.cmake b/cmake/bx.cmake index 96910186..879ac850 100644 --- a/cmake/bx.cmake +++ b/cmake/bx.cmake @@ -63,7 +63,7 @@ endif () target_compile_definitions( bx PRIVATE "$<$:BX_CONFIG_DEBUG=1>" ) -if (${CMAKE_BUILD_TYPE} STREQUAL "Debug") +if (BGFX_CONFIG_DEBUG) target_compile_definitions( bx PUBLIC "BX_CONFIG_DEBUG=1" ) else() target_compile_definitions( bx PUBLIC "BX_CONFIG_DEBUG=0" ) From 79f56a6decc8d76e7c32b0ae0cdbee778180e250 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 18 Nov 2021 15:08:33 +0100 Subject: [PATCH 50/75] bgfx subrepo --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 837be565..10f3c6d8 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 837be56590b0848c47312d5a8899891998bc313b +Subproject commit 10f3c6d8e9710401ee8c67262175c0aceb912c91 From b6e76ec2af89d9f1d251752a425b4baee4f177ee Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 18 Nov 2021 15:26:43 +0100 Subject: [PATCH 51/75] tiny exr install --- cmake/3rdparty/tinyexr.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cmake/3rdparty/tinyexr.cmake b/cmake/3rdparty/tinyexr.cmake index b5c000c5..de2f6b98 100644 --- a/cmake/3rdparty/tinyexr.cmake +++ b/cmake/3rdparty/tinyexr.cmake @@ -2,9 +2,16 @@ if( TARGET tinyexr ) return() endif() -message("tinyexr") file( GLOB_RECURSE TINYEXR_SOURCES ${BIMG_DIR}/3rdparty/tinyexr/*.c ${BIMG_DIR}/3rdparty/tinyexr/*.h ) add_library( tinyexr STATIC ${TINYEXR_SOURCES} ) target_include_directories( tinyexr PUBLIC $ $ ) -set_target_properties( tinyexr PROPERTIES FOLDER "bgfx/3rdparty" ) \ No newline at end of file +set_target_properties( tinyexr PROPERTIES FOLDER "bgfx/3rdparty" ) + +if( BGFX_INSTALL ) + include(GNUInstallDirs) + install( + TARGETS tinyexr + EXPORT bgfx-config + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +endif() \ No newline at end of file From a8b0d4aea420e1939b6e3b7269bbe44b26d091df Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 18 Nov 2021 15:54:44 +0100 Subject: [PATCH 52/75] missing renderer --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 10f3c6d8..af647404 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 10f3c6d8e9710401ee8c67262175c0aceb912c91 +Subproject commit af64740412052ab0c9bbbf16b3be5e9fdb75db2f From d9353b458370336e7084ab9805bb730eb77844b4 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Fri, 19 Nov 2021 09:53:40 +0100 Subject: [PATCH 53/75] bgfx update --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index af647404..296460fb 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit af64740412052ab0c9bbbf16b3be5e9fdb75db2f +Subproject commit 296460fb4cd316de5618032ed05fc8db7bcabc32 From 92c60a56b3acee1c21fba81c908af12d9ddd123f Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 2 Dec 2021 09:51:43 +0100 Subject: [PATCH 54/75] update bgfx d3d12 --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 296460fb..881de0d9 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 296460fb4cd316de5618032ed05fc8db7bcabc32 +Subproject commit 881de0d96438b3a391e3d548381094d38b6b5a1d From 805dbe2c68f1ba35f7f43e3ef3a61669ef13d376 Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Thu, 16 Dec 2021 11:55:11 -0800 Subject: [PATCH 55/75] Add option to use EGL targets for OpenGL --- CMakeLists.txt | 23 ++++++++++++----------- cmake/bgfx.cmake | 7 ++++++- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24b991a1..3776fcf1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,17 +20,18 @@ if( APPLE AND NOT IOS ) set( CMAKE_CXX_FLAGS "-ObjC++" ) endif() -option( BGFX_BUILD_TOOLS "Build bgfx tools." ON ) -option( BGFX_BUILD_EXAMPLES "Build bgfx examples." ON ) -option( BGFX_INSTALL "Create installation target." ON ) -option( BGFX_INSTALL_EXAMPLES "Install examples and their runtimes." OFF ) -option( BGFX_CUSTOM_TARGETS "Include convenience custom targets." ON ) -option( BGFX_USE_OVR "Build with OVR support." OFF ) -option( BGFX_AMALGAMATED "Amalgamated bgfx build for faster compilation" OFF ) -option( BX_AMALGAMATED "Amalgamated bx build for faster compilation" OFF ) -option( BGFX_CONFIG_DEBUG "Enables debug configuration on all builds" OFF ) -option( BGFX_USE_DEBUG_SUFFIX "Add 'd' suffix to debug output targets" ON ) -option( BGFX_CONFIG_RENDERER_WEBGPU "Enables the webgpu renderer" OFF ) +option( BGFX_BUILD_TOOLS "Build bgfx tools." ON ) +option( BGFX_BUILD_EXAMPLES "Build bgfx examples." ON ) +option( BGFX_INSTALL "Create installation target." ON ) +option( BGFX_INSTALL_EXAMPLES "Install examples and their runtimes." OFF ) +option( BGFX_CUSTOM_TARGETS "Include convenience custom targets." ON ) +option( BGFX_USE_OVR "Build with OVR support." OFF ) +option( BGFX_AMALGAMATED "Amalgamated bgfx build for faster compilation" OFF ) +option( BX_AMALGAMATED "Amalgamated bx build for faster compilation" OFF ) +option( BGFX_CONFIG_DEBUG "Enables debug configuration on all builds" OFF ) +option( BGFX_USE_DEBUG_SUFFIX "Add 'd' suffix to debug output targets" ON ) +option( BGFX_CONFIG_RENDERER_WEBGPU "Enables the webgpu renderer" OFF ) +option( BGFX_OPENGL_USE_EGL "Use EGL targets for OpenGL" OFF ) set( BGFX_OPENGL_VERSION "" CACHE STRING "Specify minimum opengl version" ) set( BGFX_OPENGLES_VERSION "" CACHE STRING "Specify minimum OpenGL ES version" ) diff --git a/cmake/bgfx.cmake b/cmake/bgfx.cmake index a83f3bde..b4576089 100755 --- a/cmake/bgfx.cmake +++ b/cmake/bgfx.cmake @@ -93,7 +93,12 @@ if( UNIX AND NOT APPLE AND NOT EMSCRIPTEN AND NOT ANDROID ) #find_package(Threads REQUIRED) #find_library(LIBRT_LIBRARIES rt) #find_library(LIBDL_LIBRARIES dl) - target_link_libraries( bgfx PUBLIC ${X11_LIBRARIES} ${OPENGL_LIBRARIES}) + target_link_libraries( bgfx PUBLIC ${X11_LIBRARIES} ) + if( BGFX_OPENGL_USE_EGL ) + target_link_libraries( bgfx PUBLIC OpenGL::OpenGL OpenGL::EGL ) + else() + target_link_libraries( bgfx PUBLIC OpenGL::GL ) + endif() endif() # Exclude mm files if not on OS X From d3366b5dfd691aa7399ad2751edddb818880d6d9 Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Thu, 6 Jan 2022 14:55:17 -0800 Subject: [PATCH 56/75] Completely remove examples when turned off --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3776fcf1..009a2c10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,9 @@ if( BGFX_BUILD_TOOLS ) include( cmake/tools.cmake ) endif() -include( cmake/examples.cmake ) +if( BGFX_BUILD_EXAMPLES ) + include( cmake/examples.cmake ) +endif() if( BGFX_INSTALL ) include(GNUInstallDirs) From a8c19077d5b5adfaefbe5274edd62721b9431187 Mon Sep 17 00:00:00 2001 From: Sergio Ricardo Zebetto Masson Date: Fri, 4 Mar 2022 09:23:02 -0300 Subject: [PATCH 57/75] Updated bgfx --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 881de0d9..f17852e7 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 881de0d96438b3a391e3d548381094d38b6b5a1d +Subproject commit f17852e72650aaecee3a736cc7075aa79f982ec7 From 8c91136b6f70403657a75cd2c58a5b50896fe5e6 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Tue, 14 Jun 2022 11:36:26 +0200 Subject: [PATCH 58/75] update submodules --- bgfx | 2 +- bimg | 2 +- bx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bgfx b/bgfx index f17852e7..3c4a1093 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit f17852e72650aaecee3a736cc7075aa79f982ec7 +Subproject commit 3c4a10931dfca40164de7fdd7bafa13b95ada6c6 diff --git a/bimg b/bimg index 9e4d2b16..663f7241 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit 9e4d2b167ffb4ecf4dba625dee59f6be7cf2587a +Subproject commit 663f724186e26caf46494e389ed82409106205fb diff --git a/bx b/bx index bb86fe84..aa5090bb 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit bb86fe843b2b82b287e9b0c8916ff52f491bb437 +Subproject commit aa5090bbd8c39e84d483f4850a7d9ca7ff9241ed From 593f4177c37df12ea0fcb0f193e177695d929d54 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Tue, 14 Jun 2022 12:04:19 +0200 Subject: [PATCH 59/75] fix attribTypeIsFloat --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 3c4a1093..0ec039ad 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 3c4a10931dfca40164de7fdd7bafa13b95ada6c6 +Subproject commit 0ec039ad4acb78821eaa281053610921d74128c6 From eec6b12d3447416b809fe2779c8949852adb0260 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Wed, 22 Jun 2022 10:24:26 +0200 Subject: [PATCH 60/75] update bgfx submodule --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 0ec039ad..58c493fd 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 0ec039ad4acb78821eaa281053610921d74128c6 +Subproject commit 58c493fd554e7b933520cf7c2d4f520b9e064f01 From f0ee1a4d67f9fa510846a308c9667ccc5209b635 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Wed, 22 Jun 2022 11:51:00 +0200 Subject: [PATCH 61/75] fix windows build --- CMakeLists.txt | 10 ++++++++-- cmake/version.cmake | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 cmake/version.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f76a532..71571858 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,13 +16,19 @@ set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) +# __cplusplus value is not in sync with language version used. MVSC needs this flag to update it accordingly +# https://gitlab.kitware.com/cmake/cmake/-/issues/18837 +if (MSVC) + add_compile_options(/Zc:__cplusplus) + endif() + if( APPLE AND NOT IOS ) set( CMAKE_CXX_FLAGS "-ObjC++" ) endif() -option( BGFX_BUILD_TOOLS "Build bgfx tools." ON ) +option( BGFX_BUILD_TOOLS "Build bgfx tools." OFF ) option( BGFX_BUILD_EXAMPLES "Build bgfx examples." ON ) -option( BGFX_INSTALL "Create installation target." ON ) +option( BGFX_INSTALL "Create installation target." OFF ) option( BGFX_INSTALL_EXAMPLES "Install examples and their runtimes." OFF ) option( BGFX_CUSTOM_TARGETS "Include convenience custom targets." ON ) option( BGFX_AMALGAMATED "Amalgamated bgfx build for faster compilation" OFF ) diff --git a/cmake/version.cmake b/cmake/version.cmake new file mode 100644 index 00000000..a3aea8c1 --- /dev/null +++ b/cmake/version.cmake @@ -0,0 +1,37 @@ +# bgfx versioning scheme: +# bgfx 1.104.7082 +# ^ ^^^ ^^^^ +# | | +--- Commit number (https://github.com/bkaradzic/bgfx / git rev-list --count HEAD) +# | +------- API version (from https://github.com/bkaradzic/bgfx/blob/master/scripts/bgfx.idl#L4) +# +--------- Major revision (always 1) + +# BGFX_API_VERSION generated from https://github.com/bkaradzic/bgfx/blob/master/scripts/bgfx.idl#L4 +# bgfx/src/version.h: +# BGFX_REV_NUMBER +# BGFX_REV_SHA1 + +find_package(Git QUIET) + +execute_process(COMMAND "${GIT_EXECUTABLE}" -C bgfx log --pretty=format:'%h' -n 1 + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE GIT_REV + ERROR_QUIET) + +execute_process(COMMAND "${GIT_EXECUTABLE}" -C bgfx rev-list --count HEAD + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE GIT_REV_COUNT + ERROR_QUIET) + +# read version(100) from bgfx.idl +file(READ "${BGFX_DIR}/scripts/bgfx.idl" BGFX_IDL) +string(REGEX MATCH "version\\(([^\)]+)\\)" + BGFX_API_VERSION ${BGFX_IDL}) +set(BGFX_API_VERSION ${CMAKE_MATCH_1}) +set(BGFX_REV_NUMBER ${GIT_REV_COUNT}) +set(BGFX_REV ${GIT_REV}) + +# set project specific versions +set(PROJECT_VERSION 1.${BGFX_API_VERSION}.${BGFX_REV_NUMBER}) +set(PROJECT_VERSION_MAJOR 1) +set(PROJECT_VERSION_MINOR ${BGFX_API_VERSION}) +set(PROJECT_VERSION_PATCH ${BGFX_REV_NUMBER}) From c937a012809dd44c5748af89e8cb41d8520209f0 Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Fri, 24 Jun 2022 11:10:45 -0700 Subject: [PATCH 62/75] Update bgfx with WinRT fixes --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 58c493fd..9eacf2ee 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 58c493fd554e7b933520cf7c2d4f520b9e064f01 +Subproject commit 9eacf2ee0c75104ce5ebd000f5e2f43c7a285d1a From 4c33392be34fe41e478903b790b3123e4f1e6575 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Tue, 19 Jul 2022 10:14:25 +0200 Subject: [PATCH 63/75] bgfx update --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 9eacf2ee..59d8952a 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 9eacf2ee0c75104ce5ebd000f5e2f43c7a285d1a +Subproject commit 59d8952a1f0721633c1a3d0fa91ea1f5fd71350f From c4f807368e8a6aac4ace363d8348c5a89db047c8 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Tue, 19 Jul 2022 10:57:52 +0200 Subject: [PATCH 64/75] fix conflict --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 59d8952a..43636251 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 59d8952a1f0721633c1a3d0fa91ea1f5fd71350f +Subproject commit 436362519c52ae451b3c8023e97bb3b6fb9d615c From 3e91e0aa7c1cadfc29fa704c7f9250205c86d7cb Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 4 Aug 2022 16:26:03 +0200 Subject: [PATCH 65/75] update bgfx --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 43636251..6c683f3e 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 436362519c52ae451b3c8023e97bb3b6fb9d615c +Subproject commit 6c683f3e2e925a8fda89a8e65ae0d5899ea2ac45 From 53f94f5dbb9afe4103671c551fc085b9a53cf043 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Thu, 6 Oct 2022 18:13:07 +0200 Subject: [PATCH 66/75] bump submodules --- bgfx | 2 +- bimg | 2 +- bx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bgfx b/bgfx index 6c683f3e..e4ccf5d3 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 6c683f3e2e925a8fda89a8e65ae0d5899ea2ac45 +Subproject commit e4ccf5d3ff0710f93dfb3fa22678df5349a2d29d diff --git a/bimg b/bimg index 663f7241..0de8816a 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit 663f724186e26caf46494e389ed82409106205fb +Subproject commit 0de8816a8b155fe85583aa74f5bc93bdfb8910bb diff --git a/bx b/bx index aa5090bb..d2ad3bcc 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit aa5090bbd8c39e84d483f4850a7d9ca7ff9241ed +Subproject commit d2ad3bcc7a0863bb296d11b1917e52e35136f542 From 16d04547967cea49f5851683275d07a6fc0ce725 Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Thu, 1 Dec 2022 11:51:55 -0800 Subject: [PATCH 67/75] Update to latest bgfx submodules --- CMakeLists.txt | 83 +++++++++++++++---- bgfx | 2 +- bimg | 2 +- bx | 2 +- cmake/3rdparty/astc-codec.cmake | 36 -------- .../{astc.cmake => astc-encoder.cmake} | 27 +++--- cmake/bgfx.cmake | 42 +++++++++- cmake/bimg.cmake | 5 +- cmake/bx.cmake | 26 ++++-- cmake/tools.cmake | 18 ++-- 10 files changed, 160 insertions(+), 83 deletions(-) delete mode 100644 cmake/3rdparty/astc-codec.cmake rename cmake/3rdparty/{astc.cmake => astc-encoder.cmake} (50%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 065ea47d..0d4d86c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,14 @@ if( APPLE AND NOT IOS ) set( CMAKE_CXX_FLAGS "-ObjC++" ) endif() -option( BGFX_BUILD_TOOLS "Build bgfx tools." OFF ) +if (MSVC AND (MSVC_VERSION GREATER_EQUAL 1914)) + add_compile_options("/Zc:__cplusplus") +endif() + +option( BGFX_BUILD_TOOLS "Build bgfx tools." ON ) +option( BGFX_BUILD_TOOLS_SHADER "Build bgfx shader tools." ON ) +option( BGFX_BUILD_TOOLS_GEOMETRY "Build bgfx geometry tools." ON ) +option( BGFX_BUILD_TOOLS_TEXTURE "Build bgfx texture tools." ON ) option( BGFX_BUILD_EXAMPLES "Build bgfx examples." ON ) option( BGFX_INSTALL "Create installation target." OFF ) option( BGFX_INSTALL_EXAMPLES "Install examples and their runtimes." OFF ) @@ -41,6 +48,20 @@ set( BGFX_OPENGL_VERSION "" CACHE STRING "Specify minimum opengl version set( BGFX_OPENGLES_VERSION "" CACHE STRING "Specify minimum OpenGL ES version" ) set( BGFX_LIBRARY_TYPE "STATIC" CACHE STRING "Linking type for library" ) +set( BGFX_CONFIG_DEFAULT_MAX_ENCODERS "" CACHE STRING "Specify default maximum encoder count (multithreaded only)" ) +set( BGFX_CONFIG_MAX_DRAW_CALLS "" CACHE STRING "Specify maximum draw calls" ) +set( BGFX_CONFIG_MAX_VIEWS "" CACHE STRING "Specify maximum view count (should be a power of two)" ) +set( BGFX_CONFIG_MAX_FRAME_BUFFERS "" CACHE STRING "Specify maximum frame buffers" ) +set( BGFX_CONFIG_MAX_VERTEX_LAYOUTS "" CACHE STRING "Specify maximum vertex layouts" ) +set( BGFX_CONFIG_MAX_VERTEX_BUFFERS "" CACHE STRING "Specify maximum vertex buffer count" ) +set( BGFX_CONFIG_MAX_DYNAMIC_VERTEX_BUFFERS "" CACHE STRING "Specify maximum dynamic vertex buffer count" ) +set( BGFX_CONFIG_MAX_INDEX_BUFFERS "" CACHE STRING "Specify maximum index buffer count" ) +set( BGFX_CONFIG_MAX_DYNAMIC_INDEX_BUFFERS "" CACHE STRING "Specify maximum dynamic index buffer count" ) +set( BGFX_CONFIG_MAX_TEXTURES "" CACHE STRING "Specify maximum texture count" ) +set( BGFX_CONFIG_MAX_TEXTURE_SAMPLERS "" CACHE STRING "Specify maximum texture samplers" ) +set( BGFX_CONFIG_MAX_SHADERS "" CACHE STRING "Specify shader count" ) +set( BGFX_CONFIG_SORT_KEY_NUM_BITS_PROGRAM "" CACHE STRING "Specify maximum program count as 2^(program bits)" ) + set_property( CACHE BGFX_LIBRARY_TYPE PROPERTY STRINGS STATIC SHARED ) if( BGFX_LIBRARY_TYPE MATCHES "SHARED" ) @@ -125,9 +146,30 @@ if( BGFX_INSTALL ) # install bgfx install( TARGETS bgfx - EXPORT bgfx-config - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) - install( DIRECTORY ${BGFX_DIR}/include DESTINATION . ) + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ) + if( NOT BGFX_LIBRARY_TYPE MATCHES "SHARED" ) + install( TARGETS bimg bx astc-encoder edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ) + endif() + if (BGFX_CONFIG_RENDERER_WEBGPU) + install( TARGETS webgpu + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ) + endif() # install export install( @@ -139,18 +181,27 @@ if( BGFX_INSTALL ) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/bgfxToolUtils.cmake DESTINATION "${config_install_dir}") if( BGFX_BUILD_TOOLS ) - install( TARGETS shaderc - EXPORT bgfx-config - DESTINATION bin ) - install( TARGETS geometryc - EXPORT bgfx-config - DESTINATION bin ) - install( TARGETS texturec - EXPORT bgfx-config - DESTINATION bin ) - install( TARGETS texturev - EXPORT bgfx-config - DESTINATION bin ) + if (BGFX_BUILD_TOOLS_SHADER) + install( TARGETS shaderc + EXPORT "${TARGETS_EXPORT_NAME}" + DESTINATION "${CMAKE_INSTALL_BINDIR}" ) + endif() + if (BGFX_BUILD_TOOLS_GEOMETRY) + install( TARGETS geometryc + EXPORT "${TARGETS_EXPORT_NAME}" + DESTINATION "${CMAKE_INSTALL_BINDIR}" ) + install( TARGETS geometryv + EXPORT "${TARGETS_EXPORT_NAME}" + DESTINATION "${CMAKE_INSTALL_BINDIR}" ) + endif() + if (BGFX_BUILD_TOOLS_TEXTURE) + install( TARGETS texturec + EXPORT "${TARGETS_EXPORT_NAME}" + DESTINATION "${CMAKE_INSTALL_BINDIR}" ) + install( TARGETS texturev + EXPORT "${TARGETS_EXPORT_NAME}" + DESTINATION "${CMAKE_INSTALL_BINDIR}" ) + endif() endif() # install examples diff --git a/bgfx b/bgfx index e4ccf5d3..01865cd3 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit e4ccf5d3ff0710f93dfb3fa22678df5349a2d29d +Subproject commit 01865cd390bd88814a2c9f630775d17275dde114 diff --git a/bimg b/bimg index 0de8816a..85109d7c 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit 0de8816a8b155fe85583aa74f5bc93bdfb8910bb +Subproject commit 85109d7cdbe775a0ab72cf38510df525d5e8d3da diff --git a/bx b/bx index d2ad3bcc..aed1086c 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit d2ad3bcc7a0863bb296d11b1917e52e35136f542 +Subproject commit aed1086c48884b1b4f1c2f9af34c5198624263f6 diff --git a/cmake/3rdparty/astc-codec.cmake b/cmake/3rdparty/astc-codec.cmake deleted file mode 100644 index 047e9fda..00000000 --- a/cmake/3rdparty/astc-codec.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# bgfx.cmake - bgfx building in cmake -# Written in 2017 by Joshua Brookover - -# To the extent possible under law, the author(s) have dedicated all copyright -# and related and neighboring rights to this software to the public domain -# worldwide. This software is distributed without any warranty. - -# You should have received a copy of the CC0 Public Domain Dedication along with -# this software. If not, see . - -if( TARGET astc-codec ) - return() -endif() - -file( - GLOB - ASTC_CODEC_SOURCES - ${BIMG_DIR}/3rdparty/astc-codec/src/decoder/*.cc - ${BIMG_DIR}/3rdparty/astc-codec/src/decoder/*.h -) - -add_library( astc-codec STATIC ${ASTC_CODEC_SOURCES} ) -target_include_directories( astc-codec - PUBLIC - $ - $ - $ ) -set_target_properties( astc-codec PROPERTIES FOLDER "bgfx/3rdparty" ) - -if( BGFX_INSTALL ) - include(GNUInstallDirs) - install( - TARGETS astc-codec - EXPORT bgfx-config - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -endif() diff --git a/cmake/3rdparty/astc.cmake b/cmake/3rdparty/astc-encoder.cmake similarity index 50% rename from cmake/3rdparty/astc.cmake rename to cmake/3rdparty/astc-encoder.cmake index 6cb83057..b4cd0ce7 100644 --- a/cmake/3rdparty/astc.cmake +++ b/cmake/3rdparty/astc-encoder.cmake @@ -8,20 +8,21 @@ # You should have received a copy of the CC0 Public Domain Dedication along with # this software. If not, see . -if( TARGET astc ) +if( TARGET astc-encoder ) return() endif() -file( GLOB ASTC_SOURCES ${BIMG_DIR}/3rdparty/astc/*.cpp ${BIMG_DIR}/3rdparty/astc/*.h ) +file( + GLOB + ASTC_ENCODER_SOURCES + ${BIMG_DIR}/3rdparty/astc-encoder/source/*.cpp + ${BIMG_DIR}/3rdparty/astc-encoder/include/*.h +) -add_library( astc STATIC ${ASTC_SOURCES} ) -target_include_directories( astc PUBLIC $ ) -set_target_properties( astc PROPERTIES FOLDER "bgfx/3rdparty" ) - -if( BGFX_INSTALL ) - include(GNUInstallDirs) - install( - TARGETS astc - EXPORT bgfx-config - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -endif() +add_library( astc-encoder STATIC ${ASTC_ENCODER_SOURCES} ) +target_include_directories( astc-encoder + PUBLIC + $ + $ + $ ) +set_target_properties( astc-encoder PROPERTIES FOLDER "bgfx/3rdparty" ) diff --git a/cmake/bgfx.cmake b/cmake/bgfx.cmake index feadd209..f7f456a0 100755 --- a/cmake/bgfx.cmake +++ b/cmake/bgfx.cmake @@ -59,6 +59,33 @@ if( NOT ${BGFX_OPENGL_VERSION} STREQUAL "" ) target_compile_definitions( bgfx PRIVATE BGFX_CONFIG_RENDERER_OPENGL=${BGFX_OPENGL_VERSION}) endif() +if( NOT ${BGFX_CONFIG_DEFAULT_MAX_ENCODERS} STREQUAL "" ) + target_compile_definitions( bgfx + PUBLIC + "BGFX_CONFIG_DEFAULT_MAX_ENCODERS=$,${BGFX_CONFIG_DEFAULT_MAX_ENCODERS},1>" ) +endif() + +set(BGFX_CONFIG_OPTIONS "") +list(APPEND BGFX_CONFIG_OPTIONS + "BGFX_CONFIG_MAX_DRAW_CALLS" + "BGFX_CONFIG_MAX_VIEWS" + "BGFX_CONFIG_MAX_FRAME_BUFFERS" + "BGFX_CONFIG_MAX_VERTEX_LAYOUTS" + "BGFX_CONFIG_MAX_VERTEX_BUFFERS" + "BGFX_CONFIG_MAX_DYNAMIC_VERTEX_BUFFERS" + "BGFX_CONFIG_MAX_INDEX_BUFFERS" + "BGFX_CONFIG_MAX_DYNAMIC_INDEX_BUFFERS" + "BGFX_CONFIG_MAX_TEXTURES" + "BGFX_CONFIG_MAX_TEXTURE_SAMPLERS" + "BGFX_CONFIG_MAX_SHADERS" + "BGFX_CONFIG_SORT_KEY_NUM_BITS_PROGRAM" +) +foreach(BGFX_CONFIG_OPTION IN LISTS BGFX_CONFIG_OPTIONS) + if( NOT ${${BGFX_CONFIG_OPTION}} STREQUAL "" ) + target_compile_definitions( bgfx PUBLIC "${BGFX_CONFIG_OPTION}=${${BGFX_CONFIG_OPTION}}" ) + endif() +endforeach() + # Special Visual Studio Flags if( MSVC ) target_compile_definitions( bgfx PRIVATE "_CRT_SECURE_NO_WARNINGS" ) @@ -73,11 +100,24 @@ else() endif() +# directx-headers +set (DIRECTX_HEADERS) +if (UNIX AND NOT APPLE AND NOT EMSCRIPTEN AND NOT ANDROID) # Only Linux + set (DIRECTX_HEADERS + ${BGFX_DIR}/3rdparty/directx-headers/include/directx + ${BGFX_DIR}/3rdparty/directx-headers/include + ${BGFX_DIR}/3rdparty/directx-headers/include/wsl/stubs ) +elseif (WIN32) # Only Windows + set (DIRECTX_HEADERS + ${BGFX_DIR}/3rdparty/directx-headers/include/directx + ${BGFX_DIR}/3rdparty/directx-headers/include ) +endif() + # Includes target_include_directories( bgfx PRIVATE + ${DIRECTX_HEADERS} ${BGFX_DIR}/3rdparty - ${BGFX_DIR}/3rdparty/dxsdk/include ${BGFX_DIR}/3rdparty/khronos PUBLIC $ diff --git a/cmake/bimg.cmake b/cmake/bimg.cmake index b0bfa439..6bea2b49 100644 --- a/cmake/bimg.cmake +++ b/cmake/bimg.cmake @@ -9,8 +9,7 @@ # this software. If not, see . # Third party libs -include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/astc-codec.cmake ) -include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/astc.cmake ) +include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/astc-encoder.cmake ) include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/edtaa3.cmake ) include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc1.cmake ) include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc2.cmake ) @@ -39,7 +38,7 @@ target_include_directories( bimg $) # bimg dependencies -target_link_libraries( bimg bx astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr ) +target_link_libraries( bimg PUBLIC bx PRIVATE astc-encoder edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr ) # Put in a "bgfx" folder in Visual Studio set_target_properties( bimg PROPERTIES FOLDER "bgfx" ) diff --git a/cmake/bx.cmake b/cmake/bx.cmake index 03058c3d..cb498fdf 100644 --- a/cmake/bx.cmake +++ b/cmake/bx.cmake @@ -47,12 +47,26 @@ target_include_directories( bx $) # Build system specific configurations -if( MSVC ) - target_include_directories( bx PUBLIC $ ) -elseif( MINGW ) - target_include_directories( bx PUBLIC $ ) -elseif( APPLE ) - target_include_directories( bx PUBLIC $ ) +if( MINGW ) + target_include_directories( bx + PUBLIC + $ + $ ) +elseif( WIN32 ) + target_include_directories( bx + PUBLIC + $ + $ ) +elseif( APPLE ) # APPLE is technically UNIX... ORDERING MATTERS! + target_include_directories( bx + PUBLIC + $ + $ ) +elseif ( UNIX ) + target_include_directories( bx + PUBLIC + $ + $ ) endif() # All configurations diff --git a/cmake/tools.cmake b/cmake/tools.cmake index 1f0c345b..57736b7f 100644 --- a/cmake/tools.cmake +++ b/cmake/tools.cmake @@ -13,8 +13,16 @@ if( BGFX_CUSTOM_TARGETS ) set_target_properties( tools PROPERTIES FOLDER "bgfx/tools" ) endif() -include( ${CMAKE_CURRENT_LIST_DIR}/tools/geometryc.cmake ) -include( ${CMAKE_CURRENT_LIST_DIR}/tools/geometryv.cmake ) -include( ${CMAKE_CURRENT_LIST_DIR}/tools/shaderc.cmake ) -include( ${CMAKE_CURRENT_LIST_DIR}/tools/texturec.cmake ) -include( ${CMAKE_CURRENT_LIST_DIR}/tools/texturev.cmake ) +if( BGFX_BUILD_TOOLS_SHADER ) + include( ${CMAKE_CURRENT_LIST_DIR}/tools/shaderc.cmake ) +endif() + +if( BGFX_BUILD_TOOLS_GEOMETRY ) + include( ${CMAKE_CURRENT_LIST_DIR}/tools/geometryc.cmake ) + include( ${CMAKE_CURRENT_LIST_DIR}/tools/geometryv.cmake ) +endif() + +if( BGFX_BUILD_TOOLS_TEXTURE ) + include( ${CMAKE_CURRENT_LIST_DIR}/tools/texturec.cmake ) + include( ${CMAKE_CURRENT_LIST_DIR}/tools/texturev.cmake ) +endif() From f8f58aa2d103730640967a2bdb801016c6786b3a Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Thu, 1 Dec 2022 15:04:02 -0800 Subject: [PATCH 68/75] Update bgfx --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 01865cd3..2ffbaa6e 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 01865cd390bd88814a2c9f630775d17275dde114 +Subproject commit 2ffbaa6eeda5c2455ed6f4e9cb262092b3706332 From 14dfea29b01bbb34e81ea5c02a2c14233ef9c50f Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Thu, 2 Mar 2023 16:18:01 -0800 Subject: [PATCH 69/75] Update bgfx to latest with WinUI3 support --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index 2ffbaa6e..44827166 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 2ffbaa6eeda5c2455ed6f4e9cb262092b3706332 +Subproject commit 44827166cd6bc8dddc6e8e9aaf22b8d639319390 From 863f5950a5bdd3dfa5f74b933514e8a6f7c56cc2 Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Thu, 2 Mar 2023 16:21:06 -0800 Subject: [PATCH 70/75] Update bx and bimg to match latest bgfx --- bimg | 2 +- bx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bimg b/bimg index 85109d7c..7afa2419 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit 85109d7cdbe775a0ab72cf38510df525d5e8d3da +Subproject commit 7afa2419254fd466c013a51bdeb0bee3022619c4 diff --git a/bx b/bx index aed1086c..fa1411e4 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit aed1086c48884b1b4f1c2f9af34c5198624263f6 +Subproject commit fa1411e4aa111c8b004c97660ab31ba1a5287835 From e78bc2e93c26d505a2280504c0052b8c0c1c40b1 Mon Sep 17 00:00:00 2001 From: Andy Fillebrown Date: Sat, 24 Jun 2023 15:36:54 -0400 Subject: [PATCH 71/75] Update submodules bgfx, bimg and bx to get bgfx clear rect fix --- bgfx | 2 +- bimg | 2 +- bx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bgfx b/bgfx index 44827166..be48e04b 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 44827166cd6bc8dddc6e8e9aaf22b8d639319390 +Subproject commit be48e04bbc29e691bc380eb562740cb9e90dbbbc diff --git a/bimg b/bimg index 7afa2419..ec02df82 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit 7afa2419254fd466c013a51bdeb0bee3022619c4 +Subproject commit ec02df824a763b2e2ae31e19c674ba0bc88c0695 diff --git a/bx b/bx index fa1411e4..8153ff35 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit fa1411e4aa111c8b004c97660ab31ba1a5287835 +Subproject commit 8153ff35ae872debd7cc0a81e645b65045ab39d0 From b133fef4c6ca5583bdc37acd46fdc65010844cdc Mon Sep 17 00:00:00 2001 From: Andy Fillebrown Date: Tue, 18 Jul 2023 22:22:17 -0400 Subject: [PATCH 72/75] Update submodule bgfx to fix Apple build on old versions of Xcode --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index be48e04b..946c2f7d 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit be48e04bbc29e691bc380eb562740cb9e90dbbbc +Subproject commit 946c2f7d4f1086ad662329427ed231dc7a7898f0 From 3494db1634e4078d6f83126d9d9f8afdd98ccee1 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet <1312968+CedricGuillemet@users.noreply.github.com> Date: Mon, 5 Feb 2024 11:56:59 +0100 Subject: [PATCH 73/75] fix BX_CONFIG_DEBUG flag --- cmake/bgfx.cmake | 4 +--- cmake/bx.cmake | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmake/bgfx.cmake b/cmake/bgfx.cmake index f7f456a0..4c0bb5fa 100755 --- a/cmake/bgfx.cmake +++ b/cmake/bgfx.cmake @@ -92,14 +92,12 @@ if( MSVC ) endif() # Add debug config required in bx headers since bx is private -target_compile_definitions( bgfx PRIVATE "$<$:BGFX_CONFIG_DEBUG=1>" "BGFX_CONFIG_MULTITHREADED=$") -if (BGFX_CONFIG_DEBUG) +if (BX_CONFIG_DEBUG) target_compile_definitions( bgfx PUBLIC "BX_CONFIG_DEBUG=1" ) else() target_compile_definitions( bgfx PUBLIC "BX_CONFIG_DEBUG=0" ) endif() - # directx-headers set (DIRECTX_HEADERS) if (UNIX AND NOT APPLE AND NOT EMSCRIPTEN AND NOT ANDROID) # Only Linux diff --git a/cmake/bx.cmake b/cmake/bx.cmake index cb498fdf..591a0538 100644 --- a/cmake/bx.cmake +++ b/cmake/bx.cmake @@ -79,9 +79,7 @@ if ( WINDOWS_STORE ) target_compile_definitions( bx PRIVATE "_CRT_SECURE_NO_WARNINGS" ) endif () -target_compile_definitions( bx PRIVATE "$<$:BX_CONFIG_DEBUG=1>" ) - -if (BGFX_CONFIG_DEBUG) +if (BX_CONFIG_DEBUG) target_compile_definitions( bx PUBLIC "BX_CONFIG_DEBUG=1" ) else() target_compile_definitions( bx PUBLIC "BX_CONFIG_DEBUG=0" ) From 682daf298ebb54613dd5268d35c061a8a3c6a3f3 Mon Sep 17 00:00:00 2001 From: Gary Hsu Date: Thu, 2 May 2024 17:33:31 -0700 Subject: [PATCH 74/75] Update to latest submodules --- CMakeLists.txt | 2 +- bgfx | 2 +- bimg | 2 +- bx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d4d86c9..411e0909 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ cmake_minimum_required( VERSION 3.0 ) project( bgfx ) set_property( GLOBAL PROPERTY USE_FOLDERS ON ) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) diff --git a/bgfx b/bgfx index 946c2f7d..ef681af2 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 946c2f7d4f1086ad662329427ed231dc7a7898f0 +Subproject commit ef681af2068a2b8b15919e8f789cc7e590e220b7 diff --git a/bimg b/bimg index ec02df82..e9fa0cef 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit ec02df824a763b2e2ae31e19c674ba0bc88c0695 +Subproject commit e9fa0ceff2df3399011af136c82652c81655c1d3 diff --git a/bx b/bx index 8153ff35..34ba9c7a 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 8153ff35ae872debd7cc0a81e645b65045ab39d0 +Subproject commit 34ba9c7a5cf6ee6eb80eb471842a2cffd7afb187 From 98bdf46b56ee4b7350b5337c8bf3938a8495900b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:28:56 +0000 Subject: [PATCH 75/75] build(deps): bump bimg from `e9fa0ce` to `2afa64c` Bumps [bimg](https://github.com/bkaradzic/bimg) from `e9fa0ce` to `2afa64c`. - [Commits](https://github.com/bkaradzic/bimg/compare/e9fa0ceff2df3399011af136c82652c81655c1d3...2afa64c14c1e3dd5d28412ee03bee0dfe7242f03) --- updated-dependencies: - dependency-name: bimg dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- bimg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bimg b/bimg index e9fa0cef..2afa64c1 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit e9fa0ceff2df3399011af136c82652c81655c1d3 +Subproject commit 2afa64c14c1e3dd5d28412ee03bee0dfe7242f03