Skip to content

[bgfx] [bimg] [bx] Add new port #10465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BurningEnlightenment wants to merge 6 commits into from
Closed

[bgfx] [bimg] [bx] Add new port #10465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d39406f
[bx] Add bx port version af9ccf@2020-03-14
BurningEnlightenment Mar 14, 2020
922aeec
[bimg] Add bimg port version 2020-03-15
BurningEnlightenment Mar 15, 2020
2993eb8
[bgfx] Add initial port with 78675e@2020-03-15
BurningEnlightenment Mar 18, 2020
e819f12
[bx] Add cmake transitive dependency discovery
BurningEnlightenment Mar 21, 2020
524bcb2
[bimg] Add cmake transitive dependency discovery
BurningEnlightenment Mar 21, 2020
d15f219
[bgfx] Switch back to vendored ogl/vulkan headers
BurningEnlightenment Mar 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/bgfx/10-renderdoc-include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/debug_renderdoc.cpp b/src/debug_renderdoc.cpp
index 37c4e27..e2e2c97 100644
--- a/src/debug_renderdoc.cpp
+++ b/src/debug_renderdoc.cpp
@@ -9,7 +9,7 @@
# if BX_PLATFORM_WINDOWS
# include <psapi.h>
# endif // BX_PLATFORM_WINDOWS
-# include <renderdoc/renderdoc_app.h>
+# include <renderdoc_app.h>

namespace bgfx
{
22 changes: 22 additions & 0 deletions ports/bgfx/20-d3dx12-include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/src/renderer_d3d12.h b/src/renderer_d3d12.h
index 2e5a5b2..08fb386 100644
--- a/src/renderer_d3d12.h
+++ b/src/renderer_d3d12.h
@@ -37,7 +37,7 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wmissing-field-initializers");
#if BX_PLATFORM_XBOXONE
# include <d3dx12_x.h>
#else
-# include <d3dx12.h>
+# include "d3dx12.h"
#endif // BX_PLATFORM_XBOXONE
BX_PRAGMA_DIAGNOSTIC_POP();

@@ -67,7 +67,7 @@ extern "C" struct PIXEventsThreadInfo* WINAPI bgfx_PIXGetThreadInfo();
extern "C" uint64_t WINAPI bgfx_PIXEventsReplaceBlock(bool _getEarliestTime);
# endif // BX_PLATFORM_WINDOWS

-# include <pix3.h>
+# include "pix3.h"

# define _PIX3_BEGINEVENT(_commandList, _color, _name) PIXBeginEvent(_commandList, _color, _name)
# define _PIX3_SETMARKER(_commandList, _color, _name) PIXSetMarker(_commandList, _color, _name)
69 changes: 69 additions & 0 deletions ports/bgfx/40-stb-include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
diff --git a/3rdparty/dear-imgui/imstb_rectpack.h b/3rdparty/dear-imgui/imstb_rectpack.h
index 1562c5a..bf9e307 100644
--- a/3rdparty/dear-imgui/imstb_rectpack.h
+++ b/3rdparty/dear-imgui/imstb_rectpack.h
@@ -1 +1 @@
-#include <stb/stb_rect_pack.h>
+#include <stb_rect_pack.h>
diff --git a/3rdparty/dear-imgui/imstb_textedit.h b/3rdparty/dear-imgui/imstb_textedit.h
index f1ea098..24051c0 100644
--- a/3rdparty/dear-imgui/imstb_textedit.h
+++ b/3rdparty/dear-imgui/imstb_textedit.h
@@ -1 +1 @@
-#include <stb/stb_textedit.h>
+#include <stb_textedit.h>
diff --git a/3rdparty/dear-imgui/imstb_truetype.h b/3rdparty/dear-imgui/imstb_truetype.h
index 9b6a811..a84325d 100644
--- a/3rdparty/dear-imgui/imstb_truetype.h
+++ b/3rdparty/dear-imgui/imstb_truetype.h
@@ -1 +1 @@
-#include <stb/stb_truetype.h>
+#include <stb_truetype.h>
diff --git a/3rdparty/dear-imgui/stb_rect_pack.h b/3rdparty/dear-imgui/stb_rect_pack.h
index 1562c5a..bf9e307 100644
--- a/3rdparty/dear-imgui/stb_rect_pack.h
+++ b/3rdparty/dear-imgui/stb_rect_pack.h
@@ -1 +1 @@
-#include <stb/stb_rect_pack.h>
+#include <stb_rect_pack.h>
diff --git a/3rdparty/dear-imgui/stb_textedit.h b/3rdparty/dear-imgui/stb_textedit.h
index f1ea098..24051c0 100644
--- a/3rdparty/dear-imgui/stb_textedit.h
+++ b/3rdparty/dear-imgui/stb_textedit.h
@@ -1 +1 @@
-#include <stb/stb_textedit.h>
+#include <stb_textedit.h>
diff --git a/3rdparty/dear-imgui/stb_truetype.h b/3rdparty/dear-imgui/stb_truetype.h
index 9b6a811..a84325d 100644
--- a/3rdparty/dear-imgui/stb_truetype.h
+++ b/3rdparty/dear-imgui/stb_truetype.h
@@ -1 +1 @@
-#include <stb/stb_truetype.h>
+#include <stb_truetype.h>
diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp
index 3455832..c4b001f 100644
--- a/examples/common/imgui/imgui.cpp
+++ b/examples/common/imgui/imgui.cpp
@@ -453,7 +453,7 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wtype-limits"); // warning: comparison
#define STBTT_malloc(_size, _userData) memAlloc(_size, _userData)
#define STBTT_free(_ptr, _userData) memFree(_ptr, _userData)
#define STB_RECT_PACK_IMPLEMENTATION
-#include <stb/stb_rect_pack.h>
+#include <stb_rect_pack.h>
#define STB_TRUETYPE_IMPLEMENTATION
-#include <stb/stb_truetype.h>
+#include <stb_truetype.h>
BX_PRAGMA_DIAGNOSTIC_POP();
diff --git a/examples/common/nanovg/fontstash.h b/examples/common/nanovg/fontstash.h
index 7285d7e..bd19e15 100644
--- a/examples/common/nanovg/fontstash.h
+++ b/examples/common/nanovg/fontstash.h
@@ -266,7 +266,7 @@ static void fons__tmpfree(void* ptr, void* up);
#endif // 0

#define STBTT_DEF extern
-#include <stb/stb_truetype.h>
+#include <stb_truetype.h>

struct FONSttFontImpl {
stbtt_fontinfo font;
13 changes: 13 additions & 0 deletions ports/bgfx/50-cgltf-include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/tools/geometryc/geometryc.cpp b/tools/geometryc/geometryc.cpp
index 23eed3f..88da534 100644
--- a/tools/geometryc/geometryc.cpp
+++ b/tools/geometryc/geometryc.cpp
@@ -17,7 +17,7 @@ namespace stl = tinystl;
#include <meshoptimizer/src/meshoptimizer.h>

#define CGLTF_IMPLEMENTATION
-#include <cgltf/cgltf.h>
+#include <cgltf.h>

#define BGFX_GEOMETRYC_VERSION_MAJOR 1
#define BGFX_GEOMETRYC_VERSION_MINOR 0
15 changes: 15 additions & 0 deletions ports/bgfx/60-freetype-include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/examples/common/font/font_manager.cpp b/examples/common/font/font_manager.cpp
index 0da5c17..9c4918e 100644
--- a/examples/common/font/font_manager.cpp
+++ b/examples/common/font/font_manager.cpp
@@ -16,7 +16,9 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4611) // warning C4611 : interaction between '
#pragma push_macro("interface")
#endif
#undef interface
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
#if BX_COMPILER_MSVC || BX_COMPILER_GCC >= 40300
#pragma pop_macro("interface")
#endif
30 changes: 30 additions & 0 deletions ports/bgfx/70-glslang-include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
diff --git a/tools/shaderc/shaderc_metal.cpp b/tools/shaderc/shaderc_metal.cpp
index 4adf739..cd78b2a 100644
--- a/tools/shaderc/shaderc_metal.cpp
+++ b/tools/shaderc/shaderc_metal.cpp
@@ -10,8 +10,8 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4100) // error C4100: 'inclusionDepth' : unref
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4265) // error C4265: 'spv::spirvbin_t': class has virtual functions, but destructor is not virtual
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wshadow") // warning: declaration of 'userData' shadows a member of 'glslang::TShader::Includer::IncludeResult'
#define ENABLE_OPT 1
-#include <ShaderLang.h>
-#include <ResourceLimits.h>
+#include <glslang/Public/ShaderLang.h>
+#include <glslang/Include/ResourceLimits.h>
#include <SPIRV/SPVRemapper.h>
#include <SPIRV/GlslangToSpv.h>
#define SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
diff --git a/tools/shaderc/shaderc_spirv.cpp b/tools/shaderc/shaderc_spirv.cpp
index 23b8831..db3cda1 100644
--- a/tools/shaderc/shaderc_spirv.cpp
+++ b/tools/shaderc/shaderc_spirv.cpp
@@ -10,8 +10,8 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4100) // error C4100: 'inclusionDepth' : unref
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4265) // error C4265: 'spv::spirvbin_t': class has virtual functions, but destructor is not virtual
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wshadow") // warning: declaration of 'userData' shadows a member of 'glslang::TShader::Includer::IncludeResult'
#define ENABLE_OPT 1
-#include <ShaderLang.h>
-#include <ResourceLimits.h>
+#include <glslang/Public/ShaderLang.h>
+#include <glslang/Include/ResourceLimits.h>
#include <SPIRV/SPVRemapper.h>
#include <SPIRV/GlslangToSpv.h>
#define SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
Loading