zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-29 07:22:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

SoftPoly only worked with Vulkan support on POSIX platforms (#1036)

Browse source 
* - CMake: fix wrong filename.

* - Fixed: SoftPoly only worked with Vulkan support on POSIX platforms.
This commit is contained in:
dondiego 2020-02-15 23:41:52 +01:00 committed by GitHub
parent 7a86e7f043
commit e13e034cc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -559,7 +559,7 @@ if( HAVE_MMX )
gamedata/textures/hires/hqnx_asm/hq2x_asm.cpp gamedata/textures/hires/hqnx_asm/hq2x_asm.cpp
gamedata/textures/hires/hqnx_asm/hq3x_asm.cpp gamedata/textures/hires/hqnx_asm/hq3x_asm.cpp
gamedata/textures/hires/hqnx_asm/hq4x_asm.cpp gamedata/textures/hires/hqnx_asm/hq4x_asm.cpp
gamedata/textures/hires/gl_hqresize.cpp gamedata/textures/hires/hqresize.cpp
PROPERTIES COMPILE_FLAGS "-mmmx" ) PROPERTIES COMPILE_FLAGS "-mmmx" )
endif( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) endif( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
endif( HAVE_MMX ) endif( HAVE_MMX )

6
src/posix/sdl/sdlglvideo.cpp
View file

@ -432,10 +432,10 @@ SDLVideo::SDLVideo ()
} }
#endif // !SDL2_STATIC_LIBRARY #endif // !SDL2_STATIC_LIBRARY
Priv::softpolyEnabled = vid_preferbackend == 2;
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
Priv::vulkanEnabled = vid_preferbackend == 1 Priv::vulkanEnabled = vid_preferbackend == 1
&& Priv::Vulkan_GetDrawableSize && Priv::Vulkan_GetInstanceExtensions && Priv::Vulkan_CreateSurface; && Priv::Vulkan_GetDrawableSize && Priv::Vulkan_GetInstanceExtensions && Priv::Vulkan_CreateSurface;
Priv::softpolyEnabled = vid_preferbackend == 2;
if (Priv::vulkanEnabled) if (Priv::vulkanEnabled)
{ {
@ -446,11 +446,11 @@ SDLVideo::SDLVideo ()
Priv::vulkanEnabled = false; Priv::vulkanEnabled = false;
} }
} }
else if (Priv::softpolyEnabled) #endif
if (Priv::softpolyEnabled)
{ {
Priv::CreateWindow(SDL_WINDOW_HIDDEN); Priv::CreateWindow(SDL_WINDOW_HIDDEN);
} }
#endif
} }
SDLVideo::~SDLVideo () SDLVideo::~SDLVideo ()