Commit graph

1234 commits

Author SHA1 Message Date
Eric Wasylishen
4800fbde34 sys_sdl_win.: call timeBeginPeriod(1) to set OS timer resolution to 1ms.
Works around buffer underruns with directsound and SDL2, but also will
make Sleep()/SDL_Dleay() accurate to 1ms which should help framerate
stability.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1200 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-04-14 18:01:33 +00:00
Eric Wasylishen
bcd429b4e3 Com_Game_f: print reminder message to player about "exec quake.rc"
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1199 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-04-03 19:03:17 +00:00
Ozkan Sezer
86a9748ddb constify NET_QSocketGetTime() and NET_QSocketGetAddressString()
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1198 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-04-01 09:30:10 +00:00
Ozkan Sezer
6854552809 recompiled SDL-1.2 with a fix for sdl bug #2049 backported.
also patched for windows to ensure vsnprintf() null terminates the string.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1197 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-28 20:40:36 +00:00
Ozkan Sezer
9c035ca2d5 recompiled SDL2 for windows and osx with a few patches from current
hg for bugs 1825, 2835, and 2049, also with xaudio2 driver disabled
for windows which seems more trouble than its worth.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1196 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-27 10:05:06 +00:00
Ozkan Sezer
6ed63fc0f5 codecs, windows: rebuilt opus and opusfile for x64 with a patch applied to use xmm intrinsics for lrintf() with mingw-w64
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1195 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-20 20:47:23 +00:00
Ozkan Sezer
859eefccc4 minor reorganization of windows includes
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1194 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-18 00:00:05 +00:00
Eric Wasylishen
9f8bf689c2 Xcode proj: Rename build product for SDL2 target to QuakeSpasm-SDL2.app
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1193 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-17 22:35:00 +00:00
Ozkan Sezer
59fe64c7ab update the plain text doc for possibly better readability.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1192 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-17 21:56:01 +00:00
Eric Wasylishen
5684bb72f6 Regenerate Quakespasm.{html,txt}
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1191 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-17 21:32:09 +00:00
Eric Wasylishen
e6dbe3e1ea Update docs with changes in 0.90.1
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1190 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-17 21:32:04 +00:00
Ozkan Sezer
085767f3ef remove unused GLUT.framework from Xcode project file
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1189 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-14 20:56:31 +00:00
Eric Wasylishen
dbed5c9426 GLSL gamma: implement some suggestions from Spike - remove redundant glClear, remove matrix changes (not used in programmable pipeline), change filter mode to nearest (no filtering will happen anyway)
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1188 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-08 21:13:26 +00:00
Ozkan Sezer
5f48964315 recompile SDL2 for windows from latest upstream hg repo, r9379
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1187 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-08 12:55:38 +00:00
Ozkan Sezer
4af2098b35 recompiled SDL2 for osx with a patch for SDL bug #2718 applied. also used
the -no_function_starts and -no_data_in_code_info linker flags to avoid
generation of LC_FUNCTION_STARTS and LC_DATA_IN_CODE load commands in the
final image, so that the library is usable with Xcode 3.2.6 and its tools.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1186 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-03 20:00:07 +00:00
Ozkan Sezer
1bcd8f76f4 rebuild some music decoders for windows and macosx:
- update vorbis to xiph.org svn r19451 (fixes xiph.org bug #2139)
- update libmpg123 to latest 1.22.0 release
- update libmikmod to v3.3.8/mercurial repo snapshot 2015-02-28.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1185 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-03 00:10:09 +00:00
Ozkan Sezer
09c4341d9a rebuild SDL2 from upstream mercurial repo (2015-03-02, rev. 9375.)
do set svn:mime-type application/octet-stream on SDL binary files.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1184 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 22:23:12 +00:00
Ozkan Sezer
de4c27b793 change windows makefiles so that they aren't for cross-building by default;
keep the cross-build stuff only in the scripts. update the explanations in
windows and darwin makefiles.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1183 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 22:04:26 +00:00
Ozkan Sezer
3e1eae3e47 Makefile.darwin (SDL_FRAMEWORK_PATH): seems like older OSX ld does not
treat '-F dir' the same as '-Fdir' and fails, so directly use -Fdir as
LDFLAGS, instead of -Wl,-F,dir .


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1182 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 22:03:18 +00:00
Ozkan Sezer
00846e545d fix the cross-build scripts after r1180.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1181 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 22:01:12 +00:00
Eric Wasylishen
b737b8a29f Update makefiles to use local SDL/SDL2 copies. Add sdl[2]-config. Patch from szo.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1180 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 21:43:04 +00:00
Ozkan Sezer
0475361169 remove empty directory
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1179 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 08:37:02 +00:00
Eric Wasylishen
96f7d2004f gl_vidsdl.c: remove AMD driver special case which disabled GLSL mdl renderer, as the latest drivers fixed the bug that was working around
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1178 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 03:13:58 +00:00
Eric Wasylishen
5b008f218b Windows/CodeBlocks: Add -lmingw32 to linker options to fix "undefined reference to `WinMain@16'" error,
as suggested here: http://stackoverflow.com/questions/18115153/undefined-reference-to-winmain16-when-using-sdl

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1177 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 03:13:53 +00:00
Eric Wasylishen
2e792e917d Windows/VS projects: add post build event to copy dll files to build target directory, to avoid having to do it by hand
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1176 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 03:13:48 +00:00
Eric Wasylishen
c972307236 MacOSX: unpack SDL/SDL2 from tgz. Update Xcode project to refer to these local copies instead of searching in /Library/Frameworks
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1175 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 03:13:41 +00:00
Eric Wasylishen
85c0d47043 Unzip SDL2.zip, SDL.zip into quakespasm/Windows
Update .cbp and .vcproj file to refer to our copy of SDL/SDL2 rather than looking in C:\

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1174 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 03:13:16 +00:00
Ozkan Sezer
b6570041e3 snd_sdl.c: remove superfluous SDL_PauseAudio() and SDL_LockAudio() calls from the Shutdown() proc.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1173 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-27 14:01:23 +00:00
Ozkan Sezer
1eb675b5b3 Mod_LoadAllSkins(): change name[] size from 32 to 64 (MAX_QPATH) -- consistent with fbr_mask_name[]
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1172 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-27 14:00:49 +00:00
Eric Wasylishen
91196a618f Disable GLSL alias model renderer on Win32+ATI/AMD until szo's bug with models drawing black can be fixed.
Replace GLAlias_SupportsShaders() with gl_glsl_alias_able variable.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1171 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-20 00:24:05 +00:00
Eric Wasylishen
39bd217f6c gl_rmisc.c: allow glsl gamma to be used in combination with -novbo
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1170 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-20 00:23:44 +00:00
Ozkan Sezer
6ddd983eb8 snd_flac.c, snd_mpg123.c: fix incorrect usage of decoder function
return value in RewindStream procedures.
bgmusic.c (BGM_UpdateStream): print msg if stream rewinding fails.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1169 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-19 08:37:13 +00:00
Eric Wasylishen
ea65ff0c6d gl_texmgr.c: fix GL_DeleteTexture not clearing deleted textures out of our currently-bound-texture cache for all TMU's
Fixes a bug where if you do "map e1m6" then "kill", the fullbright part of the key texture is missing (drawn in black) - this bug was introduced in 0.90.0.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1168 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-19 00:50:54 +00:00
Ozkan Sezer
2e67519fc5 recompile FLAC decoder (again) fixing a regression after the CVE-2014-9028
fix, and applying a fix for another metadata vulnerability.  (xiph.org git,
commits b4b2910, fed0dfa, and 033af7b.)


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1167 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-18 12:47:47 +00:00
Ozkan Sezer
2ddcc5023d recompile FLAC decoder fix NULL de-reference which can really only happen on a malformed file (xiph.org git, commit 875be0a)
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1166 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-15 20:11:18 +00:00
Ozkan Sezer
1c26cc3c9d add some extra safety checks to pak loading
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1165 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-08 08:00:56 +00:00
Eric Wasylishen
4c4ef48fcd gl_vidsdl.c: Experimental support for SDL2's new SDL_WINDOW_FULLSCREEN_DESKTOP mode.
When cvar vid_desktopfullscreen is set to 1, fullscreen mode ignores vid_width/vid_height and uses the desktop resolution. SDL docs recommend using this, it's supposed to offer better OS integration.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1164 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-07 00:05:06 +00:00
Eric Wasylishen
4618546e6c TexMgr_SafeTextureSize: take advantage of NPOT textures for mdl skins, 2d graphics, etc. Uses about 35% less texture memory on start.bsp.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1163 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-06 06:46:08 +00:00
Eric Wasylishen
7be39c651e TexMgr_ReloadImages: put in a workaround for the bug reported by Steven where fullscreen toggle on jam3_tronyn.bsp with -heapsize 65536 causes corrupted textures
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1162 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-06 05:21:39 +00:00
Ozkan Sezer
bc89fbea05 build_cross_win[32|64]-sdl2.sh: new scripts for me to cross-build on my linux.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1161 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-04 10:00:13 +00:00
Eric Wasylishen
603d2a6f76 sbar.c: don't skip redrawing the status bar if we're doing glsl gamma, since it would get gamma correction applied multiple times.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1160 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-04 03:57:06 +00:00
Ozkan Sezer
fdb39f3206 oslibs (macosx, windows): recompile SDL2 from hg-20150202 snapshot
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1159 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-04 00:00:45 +00:00
Eric Wasylishen
a568c712c1 tab completion: lower size of filelist_item_t name buffer from MAX_OSPATH to 32 to avoid filling up the zone memory (this limits the length of maps / games you can tab-complete).
Prior to r1153 it was 32 for maps and MAX_OSPATH for mods.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1158 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-01-26 23:35:55 +00:00
Eric Wasylishen
1311398e80 New gamma correction implementation using glsl. Enabled by default on OpenGL2. Disable with -noglslgamma.
Avoids general bugginess of hardware gamma, doesn't affect the whole screen in windowed mode like HW gamma. Should fix http://sourceforge.net/p/quakespasm/bugs/5/

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1157 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-01-26 20:18:45 +00:00
Eric Wasylishen
1a5c428100 VID_Restart: delete all GL textures before calling VID_SetMode. SDL2 reuses the gl context when changing modes, so the TexMgr_ReloadImages call after the mode change was leaking textures.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1156 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-01-26 20:18:39 +00:00
Eric Wasylishen
3b1c8a97ff RecursiveLightPoint: add casts to double to force 64-bit precision, fixes zombie at the start of jam3_ericw.bsp from incorrectly being lit up in SSE builds.
See also: http://forums.inside3d.com/viewtopic.php?f=3&t=5620

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1155 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-01-26 06:46:53 +00:00
Eric Wasylishen
6970b01052 GLAlias_GetUniformLocation: refactor to GL_GetUniformLocation, take program as an argument
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1154 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-01-25 20:29:30 +00:00
Eric Wasylishen
c31fb37b20 Refactor argument completion for "game" and "map" so all of the code is shared.
TODO: currently using a char[MAX_OSPATH] buffer to store map/mod names in the completion list which is probably unnecessairly large

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1153 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-01-24 08:26:14 +00:00
Eric Wasylishen
f0778c45b5 Autocompletion of mod names for the "game" command.
Copied from the "map" autocompletion code, now I should probably refactor because most of the code could be shared.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1152 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-01-24 07:02:47 +00:00
Eric Wasylishen
112c8b68b8 Alias model rendering fast-path using OpenGL 2.
In GL_MakeAliasModelDisplayLists, after saving the standerd triangle strips and fans onto the hunk, if the system is GL2 capable, we also save a second version of the mdl on the hunk designed to be loaded into a VBO (GL_MakeAliasModelDisplayLists_VBO). In R_NewMap, and on video mode changes, we call GLMesh_LoadVertexBuffers which loops over all precached mdl's and loads the data into a pair of VBO's (vertices and vertex indices).

Finally, in R_DrawAliasModel, assuming no rendering options are disabling the fast-path (r_drawflat 1, r_lightmap 1, or r_fullbright 1 would disable it), we call GL_DrawAliasFrame_GLSL, which sets up all of the bindings and draws the (possibly lerped) mdl in one glDrawElements call.

Special thanks to MH for some of the code from RMQEngine and the general concept.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1151 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-01-20 18:59:15 +00:00