Skip to content

Commit 603415f

Browse files
bghgarybghgary
authored
Update to latest bgfx (#1176)
1 parent c2a5c23 commit 603415f

File tree

6 files changed

+50
-11
lines changed

6 files changed

+50
-11
lines changed

‎Dependencies/CMakeLists.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,8 @@ elseif(GRAPHICS_API STREQUAL "OpenGL")
4343
elseif(GRAPHICS_API STREQUAL "Vulkan")
4444
target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_RENDERER_VULKAN=1)
4545
endif()
46-
set_property(TARGET astc PROPERTY FOLDER Dependencies/bgfx/3rdparty)
47-
set_property(TARGET astc PROPERTY UNITY_BUILD false)
48-
set_property(TARGET astc-codec PROPERTY FOLDER Dependencies/bgfx/3rdparty)
49-
set_property(TARGET astc-codec PROPERTY UNITY_BUILD false)
46+
set_property(TARGET astc-encoder PROPERTY FOLDER Dependencies/bgfx/3rdparty)
47+
set_property(TARGET astc-encoder PROPERTY UNITY_BUILD false)
5048
set_property(TARGET edtaa3 PROPERTY FOLDER Dependencies/bgfx/3rdparty)
5149
set_property(TARGET etc1 PROPERTY FOLDER Dependencies/bgfx/3rdparty)
5250
set_property(TARGET etc2 PROPERTY FOLDER Dependencies/bgfx/3rdparty)
@@ -62,8 +60,7 @@ endif()
6260
set_property(TARGET bgfx PROPERTY FOLDER Dependencies/bgfx)
6361
set_property(TARGET bimg PROPERTY FOLDER Dependencies/bgfx)
6462
set_property(TARGET bx PROPERTY FOLDER Dependencies/bgfx)
65-
disable_warnings(astc)
66-
disable_warnings(astc-codec)
63+
disable_warnings(astc-encoder)
6764
disable_warnings(edtaa3)
6865
disable_warnings(etc1)
6966
disable_warnings(etc2)

‎Dependencies/bgfx.cmake‎

‎Install/Install.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ endfunction()
2424
install_targets(arcana)
2525

2626
## bgfx
27-
install_targets(astc astc-codec edtaa3 etc1 etc2 iqa nvtt pvrtc squish tinyexr bgfx bimg bx)
27+
install_targets(astc-encoder edtaa3 etc1 etc2 iqa nvtt pvrtc squish tinyexr bgfx bimg bx)
2828

2929
## glslang
3030
install_targets(GenericCodeGen glslang MachineIndependent OGLCompiler OSDependent SPIRV)

‎Plugins/ExternalTexture/Source/ExternalTexture_D3D11.cpp‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,20 @@
2424
#define DXGI_FORMAT_ASTC_8X5_UNORM_SRGB DXGI_FORMAT(155)
2525
#define DXGI_FORMAT_ASTC_8X6_UNORM DXGI_FORMAT(158)
2626
#define DXGI_FORMAT_ASTC_8X6_UNORM_SRGB DXGI_FORMAT(159)
27+
#define DXGI_FORMAT_ASTC_8X8_UNORM DXGI_FORMAT(162)
28+
#define DXGI_FORMAT_ASTC_8X8_UNORM_SRGB DXGI_FORMAT(163)
2729
#define DXGI_FORMAT_ASTC_10X5_UNORM DXGI_FORMAT(166)
2830
#define DXGI_FORMAT_ASTC_10X5_UNORM_SRGB DXGI_FORMAT(167)
31+
#define DXGI_FORMAT_ASTC_10X6_UNORM DXGI_FORMAT(170)
32+
#define DXGI_FORMAT_ASTC_10X6_UNORM_SRGB DXGI_FORMAT(171)
33+
#define DXGI_FORMAT_ASTC_10X8_UNORM DXGI_FORMAT(174)
34+
#define DXGI_FORMAT_ASTC_10X8_UNORM_SRGB DXGI_FORMAT(175)
35+
#define DXGI_FORMAT_ASTC_10X10_UNORM DXGI_FORMAT(178)
36+
#define DXGI_FORMAT_ASTC_10X10_UNORM_SRGB DXGI_FORMAT(179)
37+
#define DXGI_FORMAT_ASTC_12X10_UNORM DXGI_FORMAT(182)
38+
#define DXGI_FORMAT_ASTC_12X10_UNORM_SRGB DXGI_FORMAT(183)
39+
#define DXGI_FORMAT_ASTC_12X12_UNORM DXGI_FORMAT(186)
40+
#define DXGI_FORMAT_ASTC_12X12_UNORM_SRGB DXGI_FORMAT(187)
2941

3042
// Copied from renderer_d3d11.cpp
3143
namespace
@@ -59,11 +71,19 @@ namespace
5971
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // ATCE
6072
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // ATCI
6173
{ DXGI_FORMAT_ASTC_4X4_UNORM, DXGI_FORMAT_ASTC_4X4_UNORM_SRGB }, // ASTC4x4
74+
{ DXGI_FORMAT_ASTC_5X4_UNORM, DXGI_FORMAT_ASTC_5X4_UNORM_SRGB }, // ASTC5x4
6275
{ DXGI_FORMAT_ASTC_5X5_UNORM, DXGI_FORMAT_ASTC_5X5_UNORM_SRGB }, // ASTC5x5
76+
{ DXGI_FORMAT_ASTC_6X5_UNORM, DXGI_FORMAT_ASTC_6X5_UNORM_SRGB }, // ASTC6x5
6377
{ DXGI_FORMAT_ASTC_6X6_UNORM, DXGI_FORMAT_ASTC_6X6_UNORM_SRGB }, // ASTC6x6
6478
{ DXGI_FORMAT_ASTC_8X5_UNORM, DXGI_FORMAT_ASTC_8X5_UNORM_SRGB }, // ASTC8x5
6579
{ DXGI_FORMAT_ASTC_8X6_UNORM, DXGI_FORMAT_ASTC_8X6_UNORM_SRGB }, // ASTC8x6
80+
{ DXGI_FORMAT_ASTC_8X8_UNORM, DXGI_FORMAT_ASTC_8X8_UNORM_SRGB }, // ASTC8x8
6681
{ DXGI_FORMAT_ASTC_10X5_UNORM, DXGI_FORMAT_ASTC_10X5_UNORM_SRGB }, // ASTC10x5
82+
{ DXGI_FORMAT_ASTC_10X6_UNORM, DXGI_FORMAT_ASTC_10X6_UNORM_SRGB }, // ASTC10x6
83+
{ DXGI_FORMAT_ASTC_10X8_UNORM, DXGI_FORMAT_ASTC_10X8_UNORM_SRGB }, // ASTC10x8
84+
{ DXGI_FORMAT_ASTC_10X10_UNORM, DXGI_FORMAT_ASTC_10X10_UNORM_SRGB}, // ASTC10x10
85+
{ DXGI_FORMAT_ASTC_12X10_UNORM, DXGI_FORMAT_ASTC_12X10_UNORM_SRGB}, // ASTC12x10
86+
{ DXGI_FORMAT_ASTC_12X12_UNORM, DXGI_FORMAT_ASTC_12X12_UNORM_SRGB}, // ASTC12x12
6787
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // Unknown
6888
{ DXGI_FORMAT_R1_UNORM, DXGI_FORMAT_UNKNOWN }, // R1
6989
{ DXGI_FORMAT_A8_UNORM, DXGI_FORMAT_UNKNOWN }, // A8

‎Plugins/ExternalTexture/Source/ExternalTexture_D3D12.cpp‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,20 @@
2424
#define DXGI_FORMAT_ASTC_8X5_UNORM_SRGB DXGI_FORMAT(155)
2525
#define DXGI_FORMAT_ASTC_8X6_UNORM DXGI_FORMAT(158)
2626
#define DXGI_FORMAT_ASTC_8X6_UNORM_SRGB DXGI_FORMAT(159)
27+
#define DXGI_FORMAT_ASTC_8X8_UNORM DXGI_FORMAT(162)
28+
#define DXGI_FORMAT_ASTC_8X8_UNORM_SRGB DXGI_FORMAT(163)
2729
#define DXGI_FORMAT_ASTC_10X5_UNORM DXGI_FORMAT(166)
2830
#define DXGI_FORMAT_ASTC_10X5_UNORM_SRGB DXGI_FORMAT(167)
31+
#define DXGI_FORMAT_ASTC_10X6_UNORM DXGI_FORMAT(170)
32+
#define DXGI_FORMAT_ASTC_10X6_UNORM_SRGB DXGI_FORMAT(171)
33+
#define DXGI_FORMAT_ASTC_10X8_UNORM DXGI_FORMAT(174)
34+
#define DXGI_FORMAT_ASTC_10X8_UNORM_SRGB DXGI_FORMAT(175)
35+
#define DXGI_FORMAT_ASTC_10X10_UNORM DXGI_FORMAT(178)
36+
#define DXGI_FORMAT_ASTC_10X10_UNORM_SRGB DXGI_FORMAT(179)
37+
#define DXGI_FORMAT_ASTC_12X10_UNORM DXGI_FORMAT(182)
38+
#define DXGI_FORMAT_ASTC_12X10_UNORM_SRGB DXGI_FORMAT(183)
39+
#define DXGI_FORMAT_ASTC_12X12_UNORM DXGI_FORMAT(186)
40+
#define DXGI_FORMAT_ASTC_12X12_UNORM_SRGB DXGI_FORMAT(187)
2941

3042
// Copied from renderer_d3d12.cpp
3143
namespace
@@ -36,7 +48,7 @@ namespace
3648
DXGI_FORMAT m_fmtSrgb;
3749
};
3850

39-
static const TextureFormatInfo s_textureFormat[] =
51+
const TextureFormatInfo s_textureFormat[] =
4052
{
4153
{ DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC1_UNORM_SRGB }, // BC1
4254
{ DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC2_UNORM_SRGB }, // BC2
@@ -59,11 +71,19 @@ namespace
5971
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // ATCE
6072
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // ATCI
6173
{ DXGI_FORMAT_ASTC_4X4_UNORM, DXGI_FORMAT_ASTC_4X4_UNORM_SRGB }, // ASTC4x4
74+
{ DXGI_FORMAT_ASTC_5X4_UNORM, DXGI_FORMAT_ASTC_5X4_UNORM_SRGB }, // ASTC5x4
6275
{ DXGI_FORMAT_ASTC_5X5_UNORM, DXGI_FORMAT_ASTC_5X5_UNORM_SRGB }, // ASTC5x5
76+
{ DXGI_FORMAT_ASTC_6X5_UNORM, DXGI_FORMAT_ASTC_6X5_UNORM_SRGB }, // ASTC6x5
6377
{ DXGI_FORMAT_ASTC_6X6_UNORM, DXGI_FORMAT_ASTC_6X6_UNORM_SRGB }, // ASTC6x6
6478
{ DXGI_FORMAT_ASTC_8X5_UNORM, DXGI_FORMAT_ASTC_8X5_UNORM_SRGB }, // ASTC8x5
6579
{ DXGI_FORMAT_ASTC_8X6_UNORM, DXGI_FORMAT_ASTC_8X6_UNORM_SRGB }, // ASTC8x6
80+
{ DXGI_FORMAT_ASTC_8X8_UNORM, DXGI_FORMAT_ASTC_8X8_UNORM_SRGB }, // ASTC8x8
6681
{ DXGI_FORMAT_ASTC_10X5_UNORM, DXGI_FORMAT_ASTC_10X5_UNORM_SRGB }, // ASTC10x5
82+
{ DXGI_FORMAT_ASTC_10X6_UNORM, DXGI_FORMAT_ASTC_10X6_UNORM_SRGB }, // ASTC10x6
83+
{ DXGI_FORMAT_ASTC_10X8_UNORM, DXGI_FORMAT_ASTC_10X8_UNORM_SRGB }, // ASTC10x8
84+
{ DXGI_FORMAT_ASTC_10X10_UNORM, DXGI_FORMAT_ASTC_10X10_UNORM_SRGB}, // ASTC10x10
85+
{ DXGI_FORMAT_ASTC_12X10_UNORM, DXGI_FORMAT_ASTC_12X10_UNORM_SRGB}, // ASTC12x10
86+
{ DXGI_FORMAT_ASTC_12X12_UNORM, DXGI_FORMAT_ASTC_12X12_UNORM_SRGB}, // ASTC12x12
6787
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // Unknown
6888
{ DXGI_FORMAT_R1_UNORM, DXGI_FORMAT_UNKNOWN }, // R1
6989
{ DXGI_FORMAT_A8_UNORM, DXGI_FORMAT_UNKNOWN }, // A8
@@ -73,7 +93,7 @@ namespace
7393
{ DXGI_FORMAT_R8_SNORM, DXGI_FORMAT_UNKNOWN }, // R8S
7494
{ DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_UNKNOWN }, // R16
7595
{ DXGI_FORMAT_R16_SINT, DXGI_FORMAT_UNKNOWN }, // R16I
76-
{ DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_UNKNOWN }, // R16U
96+
{ DXGI_FORMAT_R16_UINT, DXGI_FORMAT_UNKNOWN }, // R16U
7797
{ DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_UNKNOWN }, // R16F
7898
{ DXGI_FORMAT_R16_SNORM, DXGI_FORMAT_UNKNOWN }, // R16S
7999
{ DXGI_FORMAT_R32_SINT, DXGI_FORMAT_UNKNOWN }, // R32I

‎Plugins/NativeEngine/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ endif()
2828

2929
add_library(NativeEngine ${SOURCES})
3030

31-
target_include_directories(NativeEngine PUBLIC "Include")
31+
target_include_directories(NativeEngine
32+
PUBLIC "Include"
33+
PRIVATE "${BIMG_DIR}/3rdparty")
3234

3335
target_link_to_dependencies(NativeEngine
3436
PUBLIC JsRuntime

0 commit comments

Comments
 (0)