martin
/
protot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Applied local modifications to bgfx

simple_math_single_header
Martin Felis 2018-02-03 17:41:07 +01:00
parent f716a228f4
commit 412eab5dff
4 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_user.h vendored
View File

@ -44,7 +44,7 @@ namespace ImGui
#include "widgets/color_picker.h" #include "widgets/color_picker.h"
#include "widgets/color_wheel.h" #include "widgets/color_wheel.h"
// #include "widgets/dock.h" #include "widgets/dock.h"
#include "widgets/file_list.h" #include "widgets/file_list.h"
#include "widgets/gizmo.h" #include "widgets/gizmo.h"
#include "widgets/memory_editor.h" #include "widgets/memory_editor.h"

3
3rdparty/bgfx/examples/common/imgui/imgui.cpp vendored
View File

@ -299,10 +299,13 @@ struct OcornutImguiContext
, 0 , 0
, bgfx::copy(data, width*height*4) , bgfx::copy(data, width*height*4)
); );
ImGui::InitDockContext();
} }
void destroy() void destroy()
{ {
ImGui::ShutdownDockContext();
ImGui::Shutdown(); ImGui::Shutdown();
bgfx::destroy(s_tex); bgfx::destroy(s_tex);

46
3rdparty/bgfx/local_modifications.diff vendored Normal file
View File

@ -0,0 +1,46 @@
diff --git a/3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_user.h b/3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_user.h
index daebb8d..10cfcee 100644
--- a/3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_user.h
+++ b/3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_user.h
@@ -44,7 +44,7 @@ namespace ImGui
#include "widgets/color_picker.h"
#include "widgets/color_wheel.h"
-// #include "widgets/dock.h"
+#include "widgets/dock.h"
#include "widgets/file_list.h"
#include "widgets/gizmo.h"
#include "widgets/memory_editor.h"
diff --git a/3rdparty/bgfx/examples/common/imgui/imgui.cpp b/3rdparty/bgfx/examples/common/imgui/imgui.cpp
index b634b87..2cf78ad 100644
--- a/3rdparty/bgfx/examples/common/imgui/imgui.cpp
+++ b/3rdparty/bgfx/examples/common/imgui/imgui.cpp
@@ -299,10 +299,13 @@ struct OcornutImguiContext
, 0
, bgfx::copy(data, width*height*4)
);
+
+ ImGui::InitDockContext();
}
void destroy()
{
+ ImGui::ShutdownDockContext();
ImGui::Shutdown();
bgfx::destroy(s_tex);
diff --git a/3rdparty/bgfx/src/amalgamated.cpp b/3rdparty/bgfx/src/amalgamated.cpp
index 542436d..6d81fc6 100644
--- a/3rdparty/bgfx/src/amalgamated.cpp
+++ b/3rdparty/bgfx/src/amalgamated.cpp
@@ -19,8 +19,8 @@
#include "renderer_gl.cpp"
#include "renderer_vk.cpp"
#include "renderer_gnm.cpp"
-// #include "shader_dxbc.cpp"
-// #include "shader_dx9bc.cpp"
+#include "shader_dxbc.cpp"
+#include "shader_dx9bc.cpp"
#include "shader_spirv.cpp"
#include "topology.cpp"
#include "vertexdecl.cpp"

4
3rdparty/bgfx/src/amalgamated.cpp vendored
View File

@ -19,8 +19,8 @@
#include "renderer_gl.cpp" #include "renderer_gl.cpp"
#include "renderer_vk.cpp" #include "renderer_vk.cpp"
#include "renderer_gnm.cpp" #include "renderer_gnm.cpp"
// #include "shader_dxbc.cpp" #include "shader_dxbc.cpp"
// #include "shader_dx9bc.cpp" #include "shader_dx9bc.cpp"
#include "shader_spirv.cpp" #include "shader_spirv.cpp"
#include "topology.cpp" #include "topology.cpp"
#include "vertexdecl.cpp" #include "vertexdecl.cpp"