- removed Softpoly from the startup screen and its enabling define in the project.

Since this not only crashes but also has totally unfitting lighting, which is unlikely to be fixed it really makes no sense offering this to the users.
Vulkan may also have to be disabled for release builds because it's not working yet but that needs to be fixed later and should eventually be supported.
This commit is contained in:
Christoph Oelckers 2020-09-20 21:15:16 +02:00
parent 78be8f866b
commit c1a8d55d24
3 changed files with 3 additions and 6 deletions

View file

@ -207,9 +207,9 @@ if( MSVC )
# Function-level linking # Function-level linking
# Disable run-time type information # Disable run-time type information
if ( HAVE_VULKAN ) if ( HAVE_VULKAN )
set( ALL_C_FLAGS "/GF /Gy /permissive- /DHAVE_VULKAN /DHAVE_SOFTPOLY" ) set( ALL_C_FLAGS "/GF /Gy /permissive- /DHAVE_VULKAN" )
else() else()
set( ALL_C_FLAGS "/GF /Gy /permissive- /DHAVE_SOFTPOLY" ) set( ALL_C_FLAGS "/GF /Gy /permissive-" )
endif() endif()
# Use SSE 2 as minimum always as the true color drawers needs it for __vectorcall # Use SSE 2 as minimum always as the true color drawers needs it for __vectorcall

View file

@ -680,7 +680,6 @@ set( POLYRENDER_SOURCES
# without being compiled. # without being compiled.
set( NOT_COMPILED_SOURCE_FILES set( NOT_COMPILED_SOURCE_FILES
${OTHER_SYSTEM_SOURCES} ${OTHER_SYSTEM_SOURCES}
${POLYRENDER_SOURCES}
sc_man_scanner.h sc_man_scanner.h
common/engine/sc_man_scanner.re common/engine/sc_man_scanner.re
common/scripting/frontend/zcc-parse.lemon common/scripting/frontend/zcc-parse.lemon
@ -704,7 +703,6 @@ set( VM_JIT_SOURCES
set( FASTMATH_SOURCES set( FASTMATH_SOURCES
common/rendering/gl_load/gl_load.c common/rendering/gl_load/gl_load.c
common/rendering/polyrenderer/poly_all.cpp
common/textures/hires/hqnx/init.cpp common/textures/hires/hqnx/init.cpp
common/textures/hires/hqnx/hq2x.cpp common/textures/hires/hqnx/hq2x.cpp
common/textures/hires/hqnx/hq3x.cpp common/textures/hires/hqnx/hq3x.cpp
@ -755,7 +753,7 @@ set (POLYBACKEND_SOURCES
common/rendering/polyrenderer/backend/poly_hwtexture.cpp common/rendering/polyrenderer/backend/poly_hwtexture.cpp
common/rendering/polyrenderer/backend/poly_renderstate.cpp common/rendering/polyrenderer/backend/poly_renderstate.cpp
) )
set (FASTMATH_SOURCES ${FASTMATH_SOURCES} ${POLYBACKEND_SOURCES}) set (FASTMATH_SOURCES ${FASTMATH_SOURCES})
set (PCH_SOURCES set (PCH_SOURCES

View file

@ -28,7 +28,6 @@ BEGIN
PUSHBUTTON "E&xit",IDCANCEL,166,228,50,14 PUSHBUTTON "E&xit",IDCANCEL,166,228,50,14
CONTROL "&OpenGL",IDC_WELCOME_VULKAN1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,167,41,10 CONTROL "&OpenGL",IDC_WELCOME_VULKAN1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,167,41,10
CONTROL "&Vulkan",IDC_WELCOME_VULKAN2,"Button",BS_AUTORADIOBUTTON,13,177,37,10 CONTROL "&Vulkan",IDC_WELCOME_VULKAN2,"Button",BS_AUTORADIOBUTTON,13,177,37,10
CONTROL "&SoftPoly",IDC_WELCOME_VULKAN3,"Button",BS_AUTORADIOBUTTON,13,188,43,10
END END
IDD_CRASHDIALOG DIALOGEX 0, 0, 415, 308 IDD_CRASHDIALOG DIALOGEX 0, 0, 415, 308