Skip to content

Commit 84e54fc

Browse files
bkaradzic-microsoftbkaradzicCopilot
authored
Updated bgfx.cmake. (#1803)
Co-authored-by: Branimir Karadzic <branimirkaradzic@gmail.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: af4ea82e-5fb0-4e56-b71a-f8ff3932d033
1 parent 2c98ca8 commit 84e54fc

4 files changed

Lines changed: 21 additions & 1 deletion

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ FetchContent_Declare(base-n
3535
EXCLUDE_FROM_ALL)
3636
FetchContent_Declare(bgfx.cmake
3737
GIT_REPOSITORY https://github.com/BabylonJS/bgfx.cmake.git
38-
GIT_TAG 6c5515826c428337b7cbc0a5a7cc6d12325ce72b
38+
GIT_TAG 5c98749de48e8609a62e5c1fd2cfffbbd970588e
3939
EXCLUDE_FROM_ALL)
4040
FetchContent_Declare(CMakeExtensions
4141
GIT_REPOSITORY https://github.com/BabylonJS/CMakeExtensions.git

‎Plugins/ExternalTexture/Source/ExternalTexture_D3D11.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ namespace
5454
{ DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC2_UNORM_SRGB }, // BC2
5555
{ DXGI_FORMAT_BC3_UNORM, DXGI_FORMAT_BC3_UNORM_SRGB }, // BC3
5656
{ DXGI_FORMAT_BC4_UNORM, DXGI_FORMAT_UNKNOWN }, // BC4
57+
{ DXGI_FORMAT_BC4_SNORM, DXGI_FORMAT_UNKNOWN }, // BC4S
5758
{ DXGI_FORMAT_BC5_UNORM, DXGI_FORMAT_UNKNOWN }, // BC5
59+
{ DXGI_FORMAT_BC5_SNORM, DXGI_FORMAT_UNKNOWN }, // BC5S
5860
{ DXGI_FORMAT_BC6H_SF16, DXGI_FORMAT_UNKNOWN }, // BC6H
61+
{ DXGI_FORMAT_BC6H_UF16, DXGI_FORMAT_UNKNOWN }, // BC6HU
5962
{ DXGI_FORMAT_BC7_UNORM, DXGI_FORMAT_BC7_UNORM_SRGB }, // BC7
6063
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // ETC1
6164
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // ETC2
@@ -140,6 +143,7 @@ namespace
140143
{ DXGI_FORMAT_B5G5R5A1_UNORM, DXGI_FORMAT_UNKNOWN }, // BGR5A1
141144
{ DXGI_FORMAT_B5G5R5A1_UNORM, DXGI_FORMAT_UNKNOWN }, // RGB5A1
142145
{ DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_FORMAT_UNKNOWN }, // RGB10A2
146+
{ DXGI_FORMAT_R10G10B10A2_UINT, DXGI_FORMAT_UNKNOWN }, // RGB10A2U
143147
{ DXGI_FORMAT_R11G11B10_FLOAT, DXGI_FORMAT_UNKNOWN }, // RG11B10F
144148
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // UnknownDepth
145149
{ DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_UNKNOWN }, // D16
@@ -149,6 +153,7 @@ namespace
149153
{ DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_UNKNOWN }, // D16F
150154
{ DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_UNKNOWN }, // D24F
151155
{ DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_UNKNOWN }, // D32F
156+
{ DXGI_FORMAT_R32G8X24_TYPELESS, DXGI_FORMAT_UNKNOWN }, // D32FS8
152157
{ DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_UNKNOWN }, // D0S8
153158
};
154159
static_assert(bgfx::TextureFormat::Count == BX_COUNTOF(s_textureFormat));

‎Plugins/ExternalTexture/Source/ExternalTexture_D3D12.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ namespace
5454
{ DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC2_UNORM_SRGB }, // BC2
5555
{ DXGI_FORMAT_BC3_UNORM, DXGI_FORMAT_BC3_UNORM_SRGB }, // BC3
5656
{ DXGI_FORMAT_BC4_UNORM, DXGI_FORMAT_UNKNOWN }, // BC4
57+
{ DXGI_FORMAT_BC4_SNORM, DXGI_FORMAT_UNKNOWN }, // BC4S
5758
{ DXGI_FORMAT_BC5_UNORM, DXGI_FORMAT_UNKNOWN }, // BC5
59+
{ DXGI_FORMAT_BC5_SNORM, DXGI_FORMAT_UNKNOWN }, // BC5S
5860
{ DXGI_FORMAT_BC6H_SF16, DXGI_FORMAT_UNKNOWN }, // BC6H
61+
{ DXGI_FORMAT_BC6H_UF16, DXGI_FORMAT_UNKNOWN }, // BC6HU
5962
{ DXGI_FORMAT_BC7_UNORM, DXGI_FORMAT_BC7_UNORM_SRGB }, // BC7
6063
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // ETC1
6164
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // ETC2
@@ -140,6 +143,7 @@ namespace
140143
{ DXGI_FORMAT_B5G5R5A1_UNORM, DXGI_FORMAT_UNKNOWN }, // BGR5A1
141144
{ DXGI_FORMAT_B5G5R5A1_UNORM, DXGI_FORMAT_UNKNOWN }, // RGB5A1
142145
{ DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_FORMAT_UNKNOWN }, // RGB10A2
146+
{ DXGI_FORMAT_R10G10B10A2_UINT, DXGI_FORMAT_UNKNOWN }, // RGB10A2U
143147
{ DXGI_FORMAT_R11G11B10_FLOAT, DXGI_FORMAT_UNKNOWN }, // RG11B10F
144148
{ DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN }, // UnknownDepth
145149
{ DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_UNKNOWN }, // D16
@@ -149,6 +153,7 @@ namespace
149153
{ DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_UNKNOWN }, // D16F
150154
{ DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_UNKNOWN }, // D24F
151155
{ DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_UNKNOWN }, // D32F
156+
{ DXGI_FORMAT_R32G8X24_TYPELESS, DXGI_FORMAT_UNKNOWN }, // D32FS8
152157
{ DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_UNKNOWN }, // D0S8
153158
};
154159
static_assert(bgfx::TextureFormat::Count == BX_COUNTOF(s_textureFormat));

‎Plugins/ExternalTexture/Source/ExternalTexture_Metal.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ namespace
5151
constexpr MTL::PixelFormat kMtlPixelFormatBGRA8Unorm = MTL::PixelFormat(80);
5252
constexpr MTL::PixelFormat kMtlPixelFormatBGRA8Unorm_sRGB = MTL::PixelFormat(81);
5353
constexpr MTL::PixelFormat kMtlPixelFormatRGB10A2Unorm = MTL::PixelFormat(90);
54+
constexpr MTL::PixelFormat kMtlPixelFormatRGB10A2Uint = MTL::PixelFormat(91);
5455
constexpr MTL::PixelFormat kMtlPixelFormatRG11B10Float = MTL::PixelFormat(92);
5556
constexpr MTL::PixelFormat kMtlPixelFormatRGB9E5Float = MTL::PixelFormat(93);
5657
constexpr MTL::PixelFormat kMtlPixelFormatRG32Uint = MTL::PixelFormat(103);
@@ -71,8 +72,11 @@ namespace
7172
constexpr MTL::PixelFormat kMtlPixelFormatBC3_RGBA = MTL::PixelFormat(134);
7273
constexpr MTL::PixelFormat kMtlPixelFormatBC3_RGBA_sRGB = MTL::PixelFormat(135);
7374
constexpr MTL::PixelFormat kMtlPixelFormatBC4_RUnorm = MTL::PixelFormat(140);
75+
constexpr MTL::PixelFormat kMtlPixelFormatBC4_RSnorm = MTL::PixelFormat(141);
7476
constexpr MTL::PixelFormat kMtlPixelFormatBC5_RGUnorm = MTL::PixelFormat(142);
77+
constexpr MTL::PixelFormat kMtlPixelFormatBC5_RGSnorm = MTL::PixelFormat(143);
7578
constexpr MTL::PixelFormat kMtlPixelFormatBC6H_RGBFloat = MTL::PixelFormat(150);
79+
constexpr MTL::PixelFormat kMtlPixelFormatBC6H_RGBUfloat = MTL::PixelFormat(151);
7680
constexpr MTL::PixelFormat kMtlPixelFormatBC7_RGBAUnorm = MTL::PixelFormat(152);
7781
constexpr MTL::PixelFormat kMtlPixelFormatBC7_RGBAUnorm_sRGB = MTL::PixelFormat(153);
7882
constexpr MTL::PixelFormat kMtlPixelFormatPVRTC_RGB_2BPP = MTL::PixelFormat(160);
@@ -125,6 +129,7 @@ namespace
125129
constexpr MTL::PixelFormat kMtlPixelFormatDepth32Float = MTL::PixelFormat(252);
126130
constexpr MTL::PixelFormat kMtlPixelFormatStencil8 = MTL::PixelFormat(253);
127131
constexpr MTL::PixelFormat kMtlPixelFormatDepth24Unorm_Stencil8 = MTL::PixelFormat(255);
132+
constexpr MTL::PixelFormat kMtlPixelFormatDepth32Float_Stencil8 = MTL::PixelFormat(260);
128133
}
129134

130135
// Copied from renderer_mtl.cpp
@@ -142,8 +147,11 @@ namespace
142147
{ kMtlPixelFormatBC2_RGBA, kMtlPixelFormatBC2_RGBA_sRGB, }, // BC2
143148
{ kMtlPixelFormatBC3_RGBA, kMtlPixelFormatBC3_RGBA_sRGB, }, // BC3
144149
{ kMtlPixelFormatBC4_RUnorm, kMtlPixelFormatInvalid, }, // BC4
150+
{ kMtlPixelFormatBC4_RSnorm, kMtlPixelFormatInvalid, }, // BC4S
145151
{ kMtlPixelFormatBC5_RGUnorm, kMtlPixelFormatInvalid, }, // BC5
152+
{ kMtlPixelFormatBC5_RGSnorm, kMtlPixelFormatInvalid, }, // BC5S
146153
{ kMtlPixelFormatBC6H_RGBFloat, kMtlPixelFormatInvalid, }, // BC6H
154+
{ kMtlPixelFormatBC6H_RGBUfloat, kMtlPixelFormatInvalid, }, // BC6HU
147155
{ kMtlPixelFormatBC7_RGBAUnorm, kMtlPixelFormatBC7_RGBAUnorm_sRGB, }, // BC7
148156
{ kMtlPixelFormatInvalid, kMtlPixelFormatInvalid, }, // ETC1
149157
{ kMtlPixelFormatETC2_RGB8, kMtlPixelFormatETC2_RGB8_sRGB, }, // ETC2
@@ -228,6 +236,7 @@ namespace
228236
{ kMtlPixelFormatBGR5A1Unorm, kMtlPixelFormatInvalid, }, // BGR5A1
229237
{ kMtlPixelFormatBGR5A1Unorm, kMtlPixelFormatInvalid, }, // RGB5A1
230238
{ kMtlPixelFormatRGB10A2Unorm, kMtlPixelFormatInvalid, }, // RGB10A2
239+
{ kMtlPixelFormatRGB10A2Uint, kMtlPixelFormatInvalid, }, // RGB10A2U
231240
{ kMtlPixelFormatRG11B10Float, kMtlPixelFormatInvalid, }, // RG11B10F
232241
{ kMtlPixelFormatInvalid, kMtlPixelFormatInvalid, }, // UnknownDepth
233242
{ kMtlPixelFormatDepth16Unorm, kMtlPixelFormatInvalid, }, // D16
@@ -237,6 +246,7 @@ namespace
237246
{ kMtlPixelFormatDepth32Float, kMtlPixelFormatInvalid, }, // D16F
238247
{ kMtlPixelFormatDepth32Float, kMtlPixelFormatInvalid, }, // D24F
239248
{ kMtlPixelFormatDepth32Float, kMtlPixelFormatInvalid, }, // D32F
249+
{ kMtlPixelFormatDepth32Float_Stencil8, kMtlPixelFormatInvalid, }, // D32FS8
240250
{ kMtlPixelFormatStencil8, kMtlPixelFormatInvalid, }, // D0S8
241251
};
242252
static_assert(bgfx::TextureFormat::Count == BX_COUNTOF(s_textureFormat) );

0 commit comments

Comments
 (0)