MGislv
/
Quake3e
1
0
Fork 0
Code Releases Activity

Added FAQ and change log to docs 

Disabled WASAPI for msvc builds
This commit is contained in:
ec- 2021-01-16 19:54:47 +02:00
parent 6e308a22aa
commit 7a04c83cdb
6 changed files with 1105 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -107,7 +107,7 @@ jobs:
copy code\win32\msvc2017\output\quake3e.ded.exe bin\quake3e.ded${{ matrix.suffix }}.exe
msbuild code\win32\msvc2017\renderer.vcxproj -m -p:Configuration=${{ matrix.config }},Platform=${{ matrix.platform }}
msbuild code\win32\msvc2017\quake3e.vcxproj -m -p:TargetName=quake3e,Configuration=${{ matrix.config }},Platform=${{ matrix.platform }}
msbuild code\win32\msvc2017\quake3e.vcxproj -m -p:TargetName=quake3e,Configuration=${{ matrix.config }},Platform=${{ matrix.platform }},UseWasapi=USE_WASAPI=0
copy code\win32\msvc2017\output\quake3e.exe bin\quake3e${{ matrix.suffix }}.exe
@ -115,7 +115,7 @@ jobs:
msbuild code\win32\msvc2017\quake3e.vcxproj -t:Clean -m -p:TargetName=quake3e,Configuration=${{ matrix.config }},Platform=${{ matrix.platform }}
msbuild code\win32\msvc2017\renderervk.vcxproj -m -p:Configuration=${{ matrix.config }},Platform=${{ matrix.platform }}
msbuild code\win32\msvc2017\quake3e.vcxproj -m -p:TargetName=quake3e,Configuration=${{ matrix.config }},Platform=${{ matrix.platform }}
msbuild code\win32\msvc2017\quake3e.vcxproj -m -p:TargetName=quake3e,Configuration=${{ matrix.config }},Platform=${{ matrix.platform }},UseWasapi=USE_WASAPI=0
copy code\win32\msvc2017\output\quake3e.exe bin\quake3e-vulkan${{ matrix.suffix }}.exe

2
.mailmap
View File

@ -1,2 +0,0 @@
Eugene <tweels@gmail.com> <eugene@832414e2-6573-9c40-a513-caa1f8131539>
Eugene <tweels@gmail.com>

12
code/win32/msvc2017/quake3e.vcxproj
View File

@ -118,7 +118,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\libcurl\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_CURL;CURL_STATICLIB;USE_VULKAN_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_CURL;CURL_STATICLIB;USE_VULKAN_API;$(UseWASAPI);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
@ -147,7 +147,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\libcurl\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_CURL;CURL_STATICLIB;USE_VULKAN_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_CURL;CURL_STATICLIB;USE_VULKAN_API;$(UseWASAPI);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
@ -174,7 +174,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\libcurl\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_VULKAN_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_VULKAN_API;$(UseWASAPI);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
@ -200,7 +200,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\libcurl\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SKIPIDLOGO;USE_CURL;CURL_STATICLIB;USE_VULKAN_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SKIPIDLOGO;USE_CURL;CURL_STATICLIB;USE_VULKAN_API;$(UseWASAPI);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
@ -228,7 +228,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\libcurl\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SKIPIDLOGO;USE_CURL;CURL_STATICLIB;USE_VULKAN_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SKIPIDLOGO;USE_CURL;CURL_STATICLIB;USE_VULKAN_API;$(UseWASAPI);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
@ -256,7 +256,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\libcurl\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SKIPIDLOGO;USE_VULKAN_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SKIPIDLOGO;USE_VULKAN_API;$(UseWASAPI);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>

24
code/win32/win_snd.c
View File

@ -29,10 +29,12 @@ static qboolean dsound_init;
// Visual Studio 2012+ or MINGW
#if ( _MSC_VER >= 1700 ) || defined(MINGW)
#define USE_WASAPI
#ifndef USE_WASAPI
#define USE_WASAPI 1
#endif
#endif
#ifdef USE_WASAPI
#if USE_WASAPI
static qboolean wasapi_init;
#include <mmreg.h>
@ -691,7 +693,7 @@ SNDDMA_Shutdown
*/
void SNDDMA_Shutdown( void ) {
Com_DPrintf( "Shutting down sound system\n" );
#ifdef USE_WASAPI
#if USE_WASAPI
if ( wasapi_init ) {
Done_WASAPI();
}
@ -732,7 +734,7 @@ void SNDDMA_Shutdown( void ) {
pDSPBuf = NULL;
dsound_init = qfalse;
#ifdef USE_WASAPI
#if USE_WASAPI
wasapi_init = qfalse;
#endif
memset( &dma, 0, sizeof( dma ) );
@ -751,7 +753,7 @@ Returns false if failed
*/
qboolean SNDDMA_Init( void ) {
#ifdef USE_WASAPI
#if USE_WASAPI
const char *defdrv;
cvar_t *s_driver;
@ -770,13 +772,13 @@ qboolean SNDDMA_Init( void ) {
memset( &dma, 0, sizeof( dma ) );
dsound_init = qfalse;
#ifdef USE_WASAPI
#if USE_WASAPI
wasapi_init = qfalse;
#endif
if ( CoInitialize( NULL ) != S_OK ) {
return qfalse;
}
#ifdef USE_WASAPI
#if USE_WASAPI
if ( Q_stricmp( s_driver->string, "wasapi" ) == 0 && SNDDMA_InitWASAPI() ) {
dma.driver = "WASAPI";
wasapi_init = qtrue;
@ -947,7 +949,7 @@ how many sample are required to fill it up.
===============
*/
int SNDDMA_GetDMAPos( void ) {
#ifdef USE_WASAPI
#if USE_WASAPI
if ( wasapi_init ) {
// restart sound system if needed
if ( doSndRestart ) {
@ -985,7 +987,7 @@ void SNDDMA_BeginPainting( void ) {
DWORD *pbuf, *pbuf2;
HRESULT hresult;
DWORD dwStatus;
#ifdef USE_WASAPI
#if USE_WASAPI
if ( wasapi_init ) {
EnterCriticalSection( &cs );
return;
@ -1040,7 +1042,7 @@ Also unlocks the dsound buffer
===============
*/
void SNDDMA_Submit( void ) {
#ifdef USE_WASAPI
#if USE_WASAPI
if ( wasapi_init ) {
LeaveCriticalSection( &cs );
return;
@ -1061,7 +1063,7 @@ When we change windows we need to do this
=================
*/
void SNDDMA_Activate( void ) {
#ifdef USE_WASAPI
#if USE_WASAPI
if ( wasapi_init ) {
if ( inPlay == 0 ) {
doSndRestart = qtrue;

15
docs/quake3e-FAQ.txt Normal file
View File

@ -0,0 +1,15 @@
Q: \r_mode doesn't work for fullscreen
A: dedicated cvar \r_modeFullscreen now is used for fullscreen,
set its value to "" if you want to use \r_mode again
Q: what mouse mode is used for raw input?
A: \in_mouse 1
Q: cnq3' raw input feels different
A: try \in_lagged 1
Q: how to minimize/restore game window by ALT+X key, for example?
A: set \in_minimize "alt+x" ; in_restart
Q: non-US/EN keyboard input is not working as before
A: \in_forceCharset 0

1069
docs/quake3e-changes.txt Normal file
View File

File diff suppressed because it is too large Load Diff