id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-24 02:32:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Vulkan version compiles again

Browse source
This commit is contained in:
Robert Beckebans 2019-10-31 13:18:04 +01:00
parent 0b18bcad49
commit 377562506a
14 changed files with 56 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
neo/cmake-vs2015-32bit-windows10-vulkan.bat
View file

@ -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

6
neo/cmake-vs2015-64bit-windows10-vulkan.bat
View file

@ -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

6
neo/cmake-vs2017-32bit-windows10-vulkan.bat Normal file
View file

@ -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

2
neo/cmake-vs2017-32bit-windows10.bat
View file

@ -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

2
neo/cmake-vs2017-32bit.bat
View file

@ -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

6
neo/cmake-vs2017-64bit-windows10-vulkan.bat Normal file
View file

@ -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

2
neo/cmake-vs2017-64bit-windows10.bat
View file

@ -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

2
neo/cmake-vs2017-64bit.bat
View file

@ -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

2
neo/cmake-vs2019-32bit-windows10.bat
View file

@ -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

2
neo/cmake-vs2019-32bit.bat
View file

@ -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

2
neo/cmake-vs2019-64bit-windows10.bat
View file

@ -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

2
neo/cmake-vs2019-64bit.bat
View file

@ -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

5
neo/renderer/Image.h
View file

@ -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

31
neo/renderer/Vulkan/RenderBackend_VK.cpp
View file

@ -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();
}