diff --git a/neo/cmake-vs2015-32bit-windows10-vulkan.bat b/neo/cmake-vs2015-32bit-windows10-vulkan.bat deleted file mode 100644 index 0cc80d2a..00000000 --- a/neo/cmake-vs2015-32bit-windows10-vulkan.bat +++ /dev/null @@ -1,6 +0,0 @@ -cd .. -del /s /q build -mkdir build -cd build -cmake -G "Visual Studio 14" -DCMAKE_INSTALL_PREFIX=../bin/windows10-32 -DWINDOWS10=ON -DUSE_VULKAN=ON ../neo -pause \ No newline at end of file diff --git a/neo/cmake-vs2015-64bit-windows10-vulkan.bat b/neo/cmake-vs2015-64bit-windows10-vulkan.bat deleted file mode 100644 index 081be30b..00000000 --- a/neo/cmake-vs2015-64bit-windows10-vulkan.bat +++ /dev/null @@ -1,6 +0,0 @@ -cd .. -del /s /q build -mkdir build -cd build -cmake -G "Visual Studio 14 Win64" -DCMAKE_INSTALL_PREFIX=../bin/windows10-64 -DWINDOWS10=ON -DUSE_VULKAN=ON ../neo -pause \ No newline at end of file diff --git a/neo/cmake-vs2017-32bit-windows10-vulkan.bat b/neo/cmake-vs2017-32bit-windows10-vulkan.bat new file mode 100644 index 00000000..ba255064 --- /dev/null +++ b/neo/cmake-vs2017-32bit-windows10-vulkan.bat @@ -0,0 +1,6 @@ +cd .. +del /s /q build +mkdir build +cd build +cmake -G "Visual Studio 15" -DWINDOWS10=ON -DUSE_VULKAN=ON ../neo +pause \ No newline at end of file diff --git a/neo/cmake-vs2017-32bit-windows10.bat b/neo/cmake-vs2017-32bit-windows10.bat index fc91b3a0..cde00869 100644 --- a/neo/cmake-vs2017-32bit-windows10.bat +++ b/neo/cmake-vs2017-32bit-windows10.bat @@ -2,5 +2,5 @@ cd .. del /s /q build mkdir build cd build -cmake -G "Visual Studio 15" -DCMAKE_INSTALL_PREFIX=../bin/windows10-32 -DWINDOWS10=ON ../neo +cmake -G "Visual Studio 15" -DWINDOWS10=ON ../neo pause \ No newline at end of file diff --git a/neo/cmake-vs2017-32bit.bat b/neo/cmake-vs2017-32bit.bat index 48bac6d4..23f93c48 100644 --- a/neo/cmake-vs2017-32bit.bat +++ b/neo/cmake-vs2017-32bit.bat @@ -2,5 +2,5 @@ cd .. del /s /q build mkdir build cd build -cmake -G "Visual Studio 15" -DCMAKE_INSTALL_PREFIX=../bin/windows7-32 -DWINDOWS10=OFF ../neo +cmake -G "Visual Studio 15" -DWINDOWS10=OFF ../neo pause \ No newline at end of file diff --git a/neo/cmake-vs2017-64bit-windows10-vulkan.bat b/neo/cmake-vs2017-64bit-windows10-vulkan.bat new file mode 100644 index 00000000..d67e1a7d --- /dev/null +++ b/neo/cmake-vs2017-64bit-windows10-vulkan.bat @@ -0,0 +1,6 @@ +cd .. +del /s /q build +mkdir build +cd build +cmake -G "Visual Studio 15 Win64" -DWINDOWS10=ON -DUSE_VULKAN=ON -DUSE_FFMPEG=ON ../neo +pause \ No newline at end of file diff --git a/neo/cmake-vs2017-64bit-windows10.bat b/neo/cmake-vs2017-64bit-windows10.bat index fe789da7..f1860371 100644 --- a/neo/cmake-vs2017-64bit-windows10.bat +++ b/neo/cmake-vs2017-64bit-windows10.bat @@ -2,5 +2,5 @@ cd .. del /s /q build mkdir build cd build -cmake -G "Visual Studio 15 Win64" -DCMAKE_INSTALL_PREFIX=../bin/windows10-64 -DWINDOWS10=ON ../neo +cmake -G "Visual Studio 15 Win64" -DWINDOWS10=ON ../neo pause \ No newline at end of file diff --git a/neo/cmake-vs2017-64bit.bat b/neo/cmake-vs2017-64bit.bat index 092e5b3d..8a5ffd8b 100644 --- a/neo/cmake-vs2017-64bit.bat +++ b/neo/cmake-vs2017-64bit.bat @@ -2,5 +2,5 @@ cd .. del /s /q build mkdir build cd build -cmake -G "Visual Studio 15 Win64" -DCMAKE_INSTALL_PREFIX=../bin/windows7-64 ../neo +cmake -G "Visual Studio 15 Win64" ../neo pause \ No newline at end of file diff --git a/neo/cmake-vs2019-32bit-windows10.bat b/neo/cmake-vs2019-32bit-windows10.bat index c5cc4f90..67f58a8f 100644 --- a/neo/cmake-vs2019-32bit-windows10.bat +++ b/neo/cmake-vs2019-32bit-windows10.bat @@ -2,5 +2,5 @@ cd .. del /s /q build mkdir build cd build -cmake -G "Visual Studio 16" -A Win32 -DCMAKE_INSTALL_PREFIX=../bin/windows10-32 -DWINDOWS10=ON ../neo +cmake -G "Visual Studio 16" -A Win32 -DWINDOWS10=ON ../neo pause \ No newline at end of file diff --git a/neo/cmake-vs2019-32bit.bat b/neo/cmake-vs2019-32bit.bat index abd847a0..aa1c1340 100644 --- a/neo/cmake-vs2019-32bit.bat +++ b/neo/cmake-vs2019-32bit.bat @@ -2,5 +2,5 @@ cd .. del /s /q build mkdir build cd build -cmake -G "Visual Studio 16" -A Win32 -DCMAKE_INSTALL_PREFIX=../bin/windows7-32 -DWINDOWS10=OFF ../neo +cmake -G "Visual Studio 16" -A Win32 -DWINDOWS10=OFF ../neo pause \ No newline at end of file diff --git a/neo/cmake-vs2019-64bit-windows10.bat b/neo/cmake-vs2019-64bit-windows10.bat index 0a2c55ec..2e58a968 100644 --- a/neo/cmake-vs2019-64bit-windows10.bat +++ b/neo/cmake-vs2019-64bit-windows10.bat @@ -2,5 +2,5 @@ cd .. del /s /q build mkdir build cd build -cmake -G "Visual Studio 16" -A x64 -DCMAKE_INSTALL_PREFIX=../bin/windows10-64 -DWINDOWS10=ON ../neo +cmake -G "Visual Studio 16" -A x64 -DWINDOWS10=ON ../neo pause \ No newline at end of file diff --git a/neo/cmake-vs2019-64bit.bat b/neo/cmake-vs2019-64bit.bat index 2f4801ca..89aae3aa 100644 --- a/neo/cmake-vs2019-64bit.bat +++ b/neo/cmake-vs2019-64bit.bat @@ -2,5 +2,5 @@ cd .. del /s /q build mkdir build cd build -cmake -G "Visual Studio 16" -A x64 -DCMAKE_INSTALL_PREFIX=../bin/windows7-64 ../neo +cmake -G "Visual Studio 16" -A x64 ../neo pause \ No newline at end of file diff --git a/neo/renderer/Image.h b/neo/renderer/Image.h index 183fee75..256f21bc 100644 --- a/neo/renderer/Image.h +++ b/neo/renderer/Image.h @@ -394,7 +394,12 @@ public: ActuallyLoadImage( true ); } +#if defined( USE_VULKAN ) + return ( void* )( intptr_t )image; +#else return ( void* )( intptr_t )texnum; +#endif + } // DG end diff --git a/neo/renderer/Vulkan/RenderBackend_VK.cpp b/neo/renderer/Vulkan/RenderBackend_VK.cpp index a3f865d4..1a117e06 100644 --- a/neo/renderer/Vulkan/RenderBackend_VK.cpp +++ b/neo/renderer/Vulkan/RenderBackend_VK.cpp @@ -2355,4 +2355,35 @@ void Framebuffer::Check() void Framebuffer::CheckFramebuffers() { // TODO +} + +/* +============================================================================================== + +IMGUI RENDERING + +============================================================================================== +*/ +#include "../../libs/imgui/imgui.h" + +void idRenderBackend::ImGui_Init() +{ + // TODO +} + +void idRenderBackend::ImGui_Shutdown() +{ + // TODO + + //ImGui::GetIO().Fonts->TexID = 0; +} + +// This is the main rendering function that you have to implement and provide to ImGui (via setting up 'RenderDrawListsFn' in the ImGuiIO structure) +// If text or lines are blurry when integrating ImGui in your engine: +// - in your Render function, try translating your projection matrix by (0.5f,0.5f) or (0.375f,0.375f) +void idRenderBackend::ImGui_RenderDrawLists( ImDrawData* draw_data ) +{ + // TODO + + renderProgManager.Unbind(); } \ No newline at end of file