]> git.xonotic.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 19 Aug 2010 17:44:57 +0000 (17:44 +0000)]
UNMERGE
fix compilation of sdl and server builds when SUPPORTD3D is defined

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10407 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=a03b36647e6f8648eb9cec6170b226a707452012

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Mon, 23 Aug 2010 15:09:37 +0000 (15:09 +0000)]
UNMERGE
split and overhauled R_Upload into two functions:
R_UploadPartialTexture - does a partial update for real, not used by
anything if gl_nopartialtextureupdates is on
R_UploadFullTexture - takes only new pixel data, does appropriate
scaling and uploads to video memory

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10416 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=7a98ba933dc5de54c8ae6556ac48c3ff067f33ee

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 24 Aug 2010 17:16:29 +0000 (17:16 +0000)]
UNMERGE
fix previous warning fix that only worked properly for MINGW

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10417 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=1e6056400d6d93a7045ffc6be5546c7468a243f3

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 24 Aug 2010 17:19:14 +0000 (17:19 +0000)]
UNMERGE
fix some HLSL shader compile errors
disable check for gl_vbo in one part of surface setup code

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10418 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=346a62627336fb1f89c9342b4d32b154b1338c1a

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 24 Aug 2010 17:26:01 +0000 (17:26 +0000)]
UNMERGE
overhauled dynamic vertex rendering in DX9 based on research by mh that showed the DrawIndexedPrimitiveUP function is many times faster than using dynamic vertex buffers
applied a patch from mh to the D3D Present handling to better cope with lost devices

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10419 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=133289ecaac8633e9a71e3ce68eac43360844e35

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Mon, 30 Aug 2010 00:36:32 +0000 (00:36 +0000)]
UNMERGE
fix components parameter on a few TexCoordPointer normal3f calls, thanks
to kyre for reporting this bug

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10430 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=796d03386decaf9af1f674aaf25616686524cc4d

13 years agoUNMERGE
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 31 Aug 2010 07:28:24 +0000 (07:28 +0000)]
UNMERGE
get rid of calculating vertexmesh animcache buffers if we do not need the vertexmesh... fixes performance of steel storm

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10431 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=010f524039d1780063484288f9a832b473709a6b

13 years agoUNMERGE
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 31 Aug 2010 10:53:54 +0000 (10:53 +0000)]
UNMERGE
generate s- and t-vector of deformVertexes only if really needed (optimization for depthfirst pass mainly)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10432 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=c93c208ad76c4ba3cff084544d862d3285829135

13 years agoUNMERGE
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 4 Sep 2010 15:39:43 +0000 (15:39 +0000)]
UNMERGE
optimize R_AnimCache_UpdateEntityMeshBuffers to use memcpy instead of VectorCopy, Steel Storm 150fps -> 167fps (now only effective in D3D mode, as this path is usually not used any more in OpenGL)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10441 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=8e6b20a776721497beebfbb19ce34d6111082098

13 years agoUNMERGE
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 11 Sep 2010 09:54:18 +0000 (09:54 +0000)]
UNMERGE
Ignored MSVC build directories
Silenced a warning in MSVC 2008

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10456 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=3c548bdcd17c203e381914e2bad9240646b52e85

13 years agoUNMERGE
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 12 Sep 2010 01:38:43 +0000 (01:38 +0000)]
UNMERGE
Fix stencil shadows in D3D9

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10457 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=fe2b0e78a4b355c52930d781af275e1c580136d0

13 years agoUNMERGE
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 14 Sep 2010 20:49:41 +0000 (20:49 +0000)]
UNMERGE
Set r_shadow_shadowmap2dcolortexture as first rendertarget when doing shadowmaps, sadly this didn't fix the shadowmaps but it at least fixed the white sky.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10462 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=24eb9d93a8cdc6a8c8bac7f821a40eea5a262387

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 16 Sep 2010 08:45:34 +0000 (08:45 +0000)]
UNMERGE
on D3D9 renderer do not allow textures to be uploaded with a size smaller than 2xN or Nx2 because the REF rasterizer refuses these (which makes PIX debugging hard)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10463 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=ff37132b0137d1e241c185a73e18d6fbc3c3cdb3

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 16 Sep 2010 09:14:39 +0000 (09:14 +0000)]
UNMERGE
restructure the previous fix so it actually does something

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10464 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=f3581bd039cdb478dfd0e7bbc48a66bad593ae7a

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 16 Sep 2010 10:58:28 +0000 (10:58 +0000)]
UNMERGE
change D3D9 implementation of TEXTYPE_SHADOWMAP textures to use CreateDepthStencilSurface instead of CreateTexture, this fixes lots of errors (PIX works, REF rasterizer works, etc)
implement freeing of D3D9 textures
disable the texture size padding on D3D9 as it was not the cause of PIX trouble

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10465 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=3b8498c0b8b8ae1740c13519d3ceea8d9823774e

13 years agoUNMERGE
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 16 Sep 2010 22:20:24 +0000 (22:20 +0000)]
UNMERGE
Added debug shaderflags used by the shader compiler which is needed to debug the shaders in pix
Also added saving of vertstring and fragstring to disk and D3DXCompileShaderFromFileA to load them, this helps when debugging shaders in pix ( all commented out )

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10466 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=24d6306967a695130789ada49e6a7f0e58f4fbad

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 08:56:55 +0000 (08:56 +0000)]
UNMERGE
remove r_shadow_texturetype cvar (now always uses 2D textures), remove shadowmap cube and rect support
removed GL_ARB_texture_rectangle texture support throughout engine (nothing using it)
refactored D3D9 path in R_Mesh_SetRenderTargets in unsuccessful attempt to fix D3D9 shadowmapping

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10467 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=5896a10952478d0f0f805aca72f1bb268ace7d81

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 09:16:30 +0000 (09:16 +0000)]
UNMERGE
enable Tomaz's PIX-friendly shader debugging code if gl_paranoid is 1
made CHECKGLERROR not crash if qglGetError is NULL (as in D3D9 renderer for example)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10468 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=5f5982cec6cf87e5a9d729ba73ec387b03d1f58a

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 11:24:52 +0000 (11:24 +0000)]
UNMERGE
fix a crash in D3D9 with r_sky 0
cleaned up some shadowmap debugging code in D3D9 shader

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10469 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=9ed81e318d66aa533b9c494d61b0609ba19499de

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 11:28:24 +0000 (11:28 +0000)]
UNMERGE
in D3D9 mode do not use the VSDCT cubemap because the ShadowMap_Parameters are completely incompatible in the D3D9 renderer

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10470 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=f9e8d27908695f31f979cc07f96e5d8e312e4af4

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 14:19:14 +0000 (14:19 +0000)]
UNMERGE
fix some bugs in the HLSL shader, mostly to do with r_shadow_deferred
change texture unit for shadowmaps to 15 rather than 11 because this fixes a conflict between r_shadow_deferred 1 and r_shadows 2

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10471 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=30d2b84076b90be73d1838f1c396edcfd9989c69

13 years agoUNMERGE
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 22:47:20 +0000 (22:47 +0000)]
UNMERGE
More debug code for shaders, this time it preprocesses the shader before saving it as an .fx file

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10472 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=e1adc7df0732e7b25af3fc9ca3a82c2f1782fda4

13 years agoUNMERGE
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 22:47:57 +0000 (22:47 +0000)]
UNMERGE
Forgot to put back the paranoid code

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10473 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=84e35ab21fc6f198614cf12441e8338af19058cb

13 years agoUNMERGE
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 17 Sep 2010 22:58:16 +0000 (22:58 +0000)]
UNMERGE
Fix a couple HLSL shader warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10474 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=36d70aa30a19f9e2fc038b6f82ea193736527292

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 18 Sep 2010 12:47:03 +0000 (12:47 +0000)]
UNMERGE
don't use D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL because it clears the backbuffer depth on SetDepthStencilSurface calls

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10475 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=886269645343d27bed3ea58c9b32ae9bc872ead2

13 years agoUNMERGE
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 18 Sep 2010 22:45:49 +0000 (22:45 +0000)]
UNMERGE
Fixed the x axis flipped shadows, 1 step closer to getting all this to work perfecty in d3d9

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10476 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=633439b8c943def5f39a8be5b460733ba3c1fd07

13 years agoUNMERGE
tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 [Tue, 21 Sep 2010 19:35:20 +0000 (19:35 +0000)]
UNMERGE
Fixed dynamic light shadowmapping in D3D, still gotta fix them in deferred

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10477 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=4352792d696b5831ffd9ab0f3ec2b91b89f24708

13 years agoUNMERGE
havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 22 Sep 2010 16:21:11 +0000 (16:21 +0000)]
UNMERGE
fix a compile error and some warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10480 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=c37fd1ded7fac519b126bd630360af1c3890003a

13 years agoUNMERGE
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 24 Sep 2010 11:07:27 +0000 (11:07 +0000)]
UNMERGE
remove two unused vars

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10486 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=23e8d3a5f0d0e364566b87daaa59451ea59a6919

13 years agoUNMERGE
divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 24 Sep 2010 11:11:11 +0000 (11:11 +0000)]
UNMERGE
remove more unused code

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10488 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=88f0fcbd983dae9880e48b6bc457eabd9bd7017d

13 years agoremove more unused code
divverent [Fri, 24 Sep 2010 11:11:11 +0000 (11:11 +0000)]
remove more unused code

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10488 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=88f0fcbd983dae9880e48b6bc457eabd9bd7017d

13 years agoremove another unused variable
divverent [Fri, 24 Sep 2010 11:07:38 +0000 (11:07 +0000)]
remove another unused variable

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10487 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=3abcf03e35e08fb069730d6b632e695b5a2eebe5

13 years agoremove two unused vars
divverent [Fri, 24 Sep 2010 11:07:27 +0000 (11:07 +0000)]
remove two unused vars

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10486 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=23e8d3a5f0d0e364566b87daaa59451ea59a6919

13 years agofix another bug in the prologic patch :)
divverent [Fri, 24 Sep 2010 10:36:53 +0000 (10:36 +0000)]
fix another bug in the prologic patch :)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10485 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=8c6316428e12d958ece5d75d2f7c4d28fd6a1a03

13 years agoReset the stable branch to the current DP trunk, as D3D9 support seems to be quite...
Rudolf Polzer [Fri, 24 Sep 2010 09:53:03 +0000 (11:53 +0200)]
Reset the stable branch to the current DP trunk, as D3D9 support seems to be quite stabilized regarding OpenGL issues now. Still about 5% slower than OpenGL, as it seems.
The old branch has been archived to divVerent/archive/div0-stable-before-d3d9.

::stable-branch::reset=1710425a7fdf365e177bc70dae4b89eea90df13e

13 years agoallow bgmvolume to be > 1 to be able to exceed mastervolume (but this and other ...
divverent [Thu, 23 Sep 2010 05:17:14 +0000 (05:17 +0000)]
allow bgmvolume to be > 1 to be able to exceed mastervolume (but this and other "> 1" values are still clamped to 10, i.e. 10 dB); apply ReplayGain in SND_Spatialize instead of early when setting channel volume to better guard against clipping

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10484 d7cf8633-e32d-0410-b094-e92efae38249

13 years agochange clamping logic
divverent [Thu, 23 Sep 2010 05:17:09 +0000 (05:17 +0000)]
change clamping logic

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10483 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoexpand volume accuracy from 8bit to 16bit; allow channel volume values to be > 1...
divverent [Thu, 23 Sep 2010 05:17:05 +0000 (05:17 +0000)]
expand volume accuracy from 8bit to 16bit; allow channel volume values to be > 1, and clamp the resulting volume

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10482 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix ambient sounds in prologic
divverent [Thu, 23 Sep 2010 04:40:22 +0000 (04:40 +0000)]
fix ambient sounds in prologic

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10481 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a compile error and some warnings
havoc [Wed, 22 Sep 2010 16:21:11 +0000 (16:21 +0000)]
fix a compile error and some warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10480 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoProLogic patch by Joris Nijnuis, with some fixes
divverent [Wed, 22 Sep 2010 16:11:52 +0000 (16:11 +0000)]
ProLogic patch by Joris Nijnuis, with some fixes

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10479 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoFix GAME_XONOTIC beging misplaced in gamemode_t->gamemode_info causing "gamemode...
vortex [Tue, 21 Sep 2010 21:49:23 +0000 (21:49 +0000)]
Fix GAME_XONOTIC beging misplaced in gamemode_t->gamemode_info causing "gamemode" to be initialized wrong. CSQC now knows "view_punchvector" and "view_punchangle" globals which is what it used to be.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10478 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=4f738fb758eadca11d76db88b8db2e2d45f9e261

13 years agoFix GAME_XONOTIC beging misplaced in gamemode_t->gamemode_info causing "gamemode...
vortex [Tue, 21 Sep 2010 21:49:23 +0000 (21:49 +0000)]
Fix GAME_XONOTIC beging misplaced in gamemode_t->gamemode_info causing "gamemode" to be initialized wrong. CSQC now knows "view_punchvector" and "view_punchangle" globals which is what it used to be.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10478 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoFixed dynamic light shadowmapping in D3D, still gotta fix them in deferred
tomaz [Tue, 21 Sep 2010 19:35:20 +0000 (19:35 +0000)]
Fixed dynamic light shadowmapping in D3D, still gotta fix them in deferred

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10477 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoFixed the x axis flipped shadows, 1 step closer to getting all this to work perfecty...
tomaz [Sat, 18 Sep 2010 22:45:49 +0000 (22:45 +0000)]
Fixed the x axis flipped shadows, 1 step closer to getting all this to work perfecty in d3d9

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10476 d7cf8633-e32d-0410-b094-e92efae38249

13 years agodon't use D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL because it clears the backbuffer depth...
havoc [Sat, 18 Sep 2010 12:47:03 +0000 (12:47 +0000)]
don't use D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL because it clears the backbuffer depth on SetDepthStencilSurface calls

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10475 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoFix a couple HLSL shader warnings
tomaz [Fri, 17 Sep 2010 22:58:16 +0000 (22:58 +0000)]
Fix a couple HLSL shader warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10474 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoForgot to put back the paranoid code
tomaz [Fri, 17 Sep 2010 22:47:57 +0000 (22:47 +0000)]
Forgot to put back the paranoid code

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10473 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoMore debug code for shaders, this time it preprocesses the shader before saving it...
tomaz [Fri, 17 Sep 2010 22:47:20 +0000 (22:47 +0000)]
More debug code for shaders, this time it preprocesses the shader before saving it as an .fx file

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10472 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix some bugs in the HLSL shader, mostly to do with r_shadow_deferred
havoc [Fri, 17 Sep 2010 14:19:14 +0000 (14:19 +0000)]
fix some bugs in the HLSL shader, mostly to do with r_shadow_deferred
change texture unit for shadowmaps to 15 rather than 11 because this fixes a conflict between r_shadow_deferred 1 and r_shadows 2

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10471 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoin D3D9 mode do not use the VSDCT cubemap because the ShadowMap_Parameters are comple...
havoc [Fri, 17 Sep 2010 11:28:24 +0000 (11:28 +0000)]
in D3D9 mode do not use the VSDCT cubemap because the ShadowMap_Parameters are completely incompatible in the D3D9 renderer

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10470 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix a crash in D3D9 with r_sky 0
havoc [Fri, 17 Sep 2010 11:24:52 +0000 (11:24 +0000)]
fix a crash in D3D9 with r_sky 0
cleaned up some shadowmap debugging code in D3D9 shader

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10469 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoenable Tomaz's PIX-friendly shader debugging code if gl_paranoid is 1
havoc [Fri, 17 Sep 2010 09:16:30 +0000 (09:16 +0000)]
enable Tomaz's PIX-friendly shader debugging code if gl_paranoid is 1
made CHECKGLERROR not crash if qglGetError is NULL (as in D3D9 renderer for example)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10468 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoremove r_shadow_texturetype cvar (now always uses 2D textures), remove shadowmap...
havoc [Fri, 17 Sep 2010 08:56:55 +0000 (08:56 +0000)]
remove r_shadow_texturetype cvar (now always uses 2D textures), remove shadowmap cube and rect support
removed GL_ARB_texture_rectangle texture support throughout engine (nothing using it)
refactored D3D9 path in R_Mesh_SetRenderTargets in unsuccessful attempt to fix D3D9 shadowmapping

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10467 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoAdded debug shaderflags used by the shader compiler which is needed to debug the...
tomaz [Thu, 16 Sep 2010 22:20:24 +0000 (22:20 +0000)]
Added debug shaderflags used by the shader compiler which is needed to debug the shaders in pix
Also added saving of vertstring and fragstring to disk and D3DXCompileShaderFromFileA to load them, this helps when debugging shaders in pix ( all commented out )

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10466 d7cf8633-e32d-0410-b094-e92efae38249

13 years agochange D3D9 implementation of TEXTYPE_SHADOWMAP textures to use CreateDepthStencilSur...
havoc [Thu, 16 Sep 2010 10:58:28 +0000 (10:58 +0000)]
change D3D9 implementation of TEXTYPE_SHADOWMAP textures to use CreateDepthStencilSurface instead of CreateTexture, this fixes lots of errors (PIX works, REF rasterizer works, etc)
implement freeing of D3D9 textures
disable the texture size padding on D3D9 as it was not the cause of PIX trouble

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10465 d7cf8633-e32d-0410-b094-e92efae38249

13 years agorestructure the previous fix so it actually does something
havoc [Thu, 16 Sep 2010 09:14:39 +0000 (09:14 +0000)]
restructure the previous fix so it actually does something

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10464 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoon D3D9 renderer do not allow textures to be uploaded with a size smaller than 2xN...
havoc [Thu, 16 Sep 2010 08:45:34 +0000 (08:45 +0000)]
on D3D9 renderer do not allow textures to be uploaded with a size smaller than 2xN or Nx2 because the REF rasterizer refuses these (which makes PIX debugging hard)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10463 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix leaktest
divverent [Tue, 14 Sep 2010 19:17:37 +0000 (19:17 +0000)]
fix leaktest

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10461 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=dbba88193908a87435fae15ccf8c28d76f36def7

13 years agoadd comments so I know which plane type is which
divverent [Tue, 14 Sep 2010 18:46:45 +0000 (18:46 +0000)]
add comments so I know which plane type is which

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10460 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=175ee5655dc60d9bce48e942716fde78503dc514

13 years agoTraceBrush: use in Collision_ClipToGenericEntity
divverent [Tue, 14 Sep 2010 18:46:41 +0000 (18:46 +0000)]
TraceBrush: use in Collision_ClipToGenericEntity

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10459 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=8932241cf6202daaa27b839eba3198eae61f75f7

13 years agoadd a TraceBrush function to all model types, and implement it for BIH and Q3BSP
divverent [Tue, 14 Sep 2010 18:46:37 +0000 (18:46 +0000)]
add a TraceBrush function to all model types, and implement it for BIH and Q3BSP

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10458 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b86dc159d01c93c80a00afe9f40e48dd0a8206d6

13 years agoSet r_shadow_shadowmap2dcolortexture as first rendertarget when doing shadowmaps...
tomaz [Tue, 14 Sep 2010 20:49:41 +0000 (20:49 +0000)]
Set r_shadow_shadowmap2dcolortexture as first rendertarget when doing shadowmaps, sadly this didn't fix the shadowmaps but it at least fixed the white sky.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10462 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix leaktest
divverent [Tue, 14 Sep 2010 19:17:37 +0000 (19:17 +0000)]
fix leaktest

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10461 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadd comments so I know which plane type is which
divverent [Tue, 14 Sep 2010 18:46:45 +0000 (18:46 +0000)]
add comments so I know which plane type is which

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10460 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoTraceBrush: use in Collision_ClipToGenericEntity
divverent [Tue, 14 Sep 2010 18:46:41 +0000 (18:46 +0000)]
TraceBrush: use in Collision_ClipToGenericEntity

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10459 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadd a TraceBrush function to all model types, and implement it for BIH and Q3BSP
divverent [Tue, 14 Sep 2010 18:46:37 +0000 (18:46 +0000)]
add a TraceBrush function to all model types, and implement it for BIH and Q3BSP

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10458 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoFix stencil shadows in D3D9
tomaz [Sun, 12 Sep 2010 01:38:43 +0000 (01:38 +0000)]
Fix stencil shadows in D3D9

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10457 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoIgnored MSVC build directories
tomaz [Sat, 11 Sep 2010 09:54:18 +0000 (09:54 +0000)]
Ignored MSVC build directories
Silenced a warning in MSVC 2008

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10456 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix an inverted return value
divverent [Sat, 11 Sep 2010 00:20:09 +0000 (00:20 +0000)]
fix an inverted return value

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10455 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix an inverted return value
divverent [Sat, 11 Sep 2010 00:20:09 +0000 (00:20 +0000)]
fix an inverted return value

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10455 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e31ea19a584eb7675ebb9133d665d44ef9438a3e

13 years agoadd a type cast for C++
divverent [Fri, 10 Sep 2010 23:23:22 +0000 (23:23 +0000)]
add a type cast for C++

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10454 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=9e160a615b83477f8eec2ba38e16afff6ea9bac4

13 years agoadd a type cast for C++
divverent [Fri, 10 Sep 2010 23:23:22 +0000 (23:23 +0000)]
add a type cast for C++

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10454 d7cf8633-e32d-0410-b094-e92efae38249

13 years agomake the win32 case compile too (hope it doesn't break TOO horribly above 4G RAM...
divverent [Fri, 10 Sep 2010 11:42:56 +0000 (11:42 +0000)]
make the win32 case compile too (hope it doesn't break TOO horribly above 4G RAM, someone please test)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10453 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=abbafda6735457111f0fffa4e168d84b0a530d85

13 years agoadd sys_memsize_virtual and sys_memsize_physical info cvars
divverent [Fri, 10 Sep 2010 11:26:57 +0000 (11:26 +0000)]
add sys_memsize_virtual and sys_memsize_physical info cvars

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10452 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=36bcd3b371a113ce5cf3e91f7143e18672fe9c93

13 years agomake the win32 case compile too (hope it doesn't break TOO horribly above 4G RAM...
divverent [Fri, 10 Sep 2010 11:42:56 +0000 (11:42 +0000)]
make the win32 case compile too (hope it doesn't break TOO horribly above 4G RAM, someone please test)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10453 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoadd sys_memsize_virtual and sys_memsize_physical info cvars
divverent [Fri, 10 Sep 2010 11:26:57 +0000 (11:26 +0000)]
add sys_memsize_virtual and sys_memsize_physical info cvars

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10452 d7cf8633-e32d-0410-b094-e92efae38249

13 years agodo sound occlusion only once per sound, not once per listener channel
divverent [Thu, 9 Sep 2010 07:37:50 +0000 (07:37 +0000)]
do sound occlusion only once per sound, not once per listener channel

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10451 d7cf8633-e32d-0410-b094-e92efae38249

13 years agodo sound occlusion only once per sound, not once per listener channel
divverent [Thu, 9 Sep 2010 07:37:50 +0000 (07:37 +0000)]
do sound occlusion only once per sound, not once per listener channel

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10451 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=1c4c36dd5a6587988ac63db25c246c96fba749f4

13 years agoremove sparks if slower than sqrt(0.03)
divverent [Thu, 9 Sep 2010 06:55:01 +0000 (06:55 +0000)]
remove sparks if slower than sqrt(0.03)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10450 d7cf8633-e32d-0410-b094-e92efae38249

13 years agosound occlusion: use PVS by default, make the cvar able to toggle between PVS and...
divverent [Thu, 9 Sep 2010 06:54:58 +0000 (06:54 +0000)]
sound occlusion: use PVS by default, make the cvar able to toggle between PVS and LineOfSight occlusion

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10449 d7cf8633-e32d-0410-b094-e92efae38249

13 years agofix two warpzone related PVS bugs
divverent [Thu, 9 Sep 2010 06:54:55 +0000 (06:54 +0000)]
fix two warpzone related PVS bugs

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10448 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoremove sparks if slower than sqrt(0.03)
divverent [Thu, 9 Sep 2010 06:55:01 +0000 (06:55 +0000)]
remove sparks if slower than sqrt(0.03)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10450 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a47d6d807b1b080ae1c56e6c17c2fec217cd8e89

13 years agosound occlusion: use PVS by default, make the cvar able to toggle between PVS and...
divverent [Thu, 9 Sep 2010 06:54:58 +0000 (06:54 +0000)]
sound occlusion: use PVS by default, make the cvar able to toggle between PVS and LineOfSight occlusion

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10449 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=00f9f334acf035b06ca4381b1af3f3b75af5826a

13 years agofix two warpzone related PVS bugs
divverent [Thu, 9 Sep 2010 06:54:55 +0000 (06:54 +0000)]
fix two warpzone related PVS bugs

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10448 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=44eae3fb425b13b170cbb479017715bb03e9d30c

13 years agonew option -benchmarkruns - if specified, the given number of benchmark runs is perfo...
divverent [Tue, 7 Sep 2010 07:37:02 +0000 (07:37 +0000)]
new option -benchmarkruns - if specified, the given number of benchmark runs is performed for -benchmark

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10447 d7cf8633-e32d-0410-b094-e92efae38249

13 years agonew option -benchmarkruns - if specified, the given number of benchmark runs is perfo...
divverent [Tue, 7 Sep 2010 07:37:02 +0000 (07:37 +0000)]
new option -benchmarkruns - if specified, the given number of benchmark runs is performed for -benchmark

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10447 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b035320854424884c174e6b33092f63c4158a3a3

13 years agofix CSQC being unable to use the "effects" field as its fieldoffset never got initialized
divverent [Mon, 6 Sep 2010 06:21:51 +0000 (06:21 +0000)]
fix CSQC being unable to use the "effects" field as its fieldoffset never got initialized

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10446 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e46b145fb645c005413c7f34360d1d02498f8898

13 years agoAllow to type the utf8 Euro currency sign (to work around windows-1252 encoding)
divverent [Mon, 6 Sep 2010 05:09:56 +0000 (05:09 +0000)]
Allow to type the utf8 Euro currency sign (to work around windows-1252 encoding)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10445 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=2521205903a3cab3b36f3450485a266a4e86085f

13 years agomake ctrl-key shortcuts in message mode display chars from the charmap even with...
divverent [Mon, 6 Sep 2010 05:09:53 +0000 (05:09 +0000)]
make ctrl-key shortcuts in message mode display chars from the charmap even with utf8 enabled

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10444 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=442772ff530cb93073f2ea7207de762ec74d34ce

13 years agofix CSQC being unable to use the "effects" field as its fieldoffset never got initialized
divverent [Mon, 6 Sep 2010 06:21:51 +0000 (06:21 +0000)]
fix CSQC being unable to use the "effects" field as its fieldoffset never got initialized

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10446 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoAllow to type the utf8 Euro currency sign (to work around windows-1252 encoding)
divverent [Mon, 6 Sep 2010 05:09:56 +0000 (05:09 +0000)]
Allow to type the utf8 Euro currency sign (to work around windows-1252 encoding)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10445 d7cf8633-e32d-0410-b094-e92efae38249

13 years agomake ctrl-key shortcuts in message mode display chars from the charmap even with...
divverent [Mon, 6 Sep 2010 05:09:53 +0000 (05:09 +0000)]
make ctrl-key shortcuts in message mode display chars from the charmap even with utf8 enabled

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10444 d7cf8633-e32d-0410-b094-e92efae38249

13 years agonew cvars: r_drawparticles_nearclip_min and r_drawparticles_nearclip_max, use a range...
divverent [Sun, 5 Sep 2010 17:34:29 +0000 (17:34 +0000)]
new cvars: r_drawparticles_nearclip_min and r_drawparticles_nearclip_max, use a range and fading for near clip of particles for speed optimization (fade them out before they become fullscreen)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10443 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=6f6da45f360f10451ac20ca2c1fa1c64dd992239

13 years agonew cvars: r_drawparticles_nearclip_min and r_drawparticles_nearclip_max, use a range...
divverent [Sun, 5 Sep 2010 17:34:29 +0000 (17:34 +0000)]
new cvars: r_drawparticles_nearclip_min and r_drawparticles_nearclip_max, use a range and fading for near clip of particles for speed optimization (fade them out before they become fullscreen)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10443 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoreorganize sv_public code; add a level -3 that blocks at getchallenge level, but...
divverent [Sun, 5 Sep 2010 15:48:51 +0000 (15:48 +0000)]
reorganize sv_public code; add a level -3 that blocks at getchallenge level, but -2 blocks at connect level (srcon needs getchallenge, so -3 also blocks srcon); also sv_public -2 will make connect attempts show the string in sv_public_rejectreason

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10442 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=62b1a43c04dd50f4e8a0bfa00974eb880c3b0795

13 years agoreorganize sv_public code; add a level -3 that blocks at getchallenge level, but...
divverent [Sun, 5 Sep 2010 15:48:51 +0000 (15:48 +0000)]
reorganize sv_public code; add a level -3 that blocks at getchallenge level, but -2 blocks at connect level (srcon needs getchallenge, so -3 also blocks srcon); also sv_public -2 will make connect attempts show the string in sv_public_rejectreason

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10442 d7cf8633-e32d-0410-b094-e92efae38249

13 years agooptimize R_AnimCache_UpdateEntityMeshBuffers to use memcpy instead of VectorCopy...
divverent [Sat, 4 Sep 2010 15:39:43 +0000 (15:39 +0000)]
optimize R_AnimCache_UpdateEntityMeshBuffers to use memcpy instead of VectorCopy, Steel Storm 150fps -> 167fps (now only effective in D3D mode, as this path is usually not used any more in OpenGL)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10441 d7cf8633-e32d-0410-b094-e92efae38249

13 years agoclean up u8_StringLengthNoColors
divverent [Sat, 4 Sep 2010 15:32:12 +0000 (15:32 +0000)]
clean up u8_StringLengthNoColors

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10440 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=bb3eeea785546930f5820116a01058a0b86718c9

13 years agoSince u8_prevbyte skips invalid chars on purpose, it can go before the ] if invalid...
divverent [Sat, 4 Sep 2010 15:32:09 +0000 (15:32 +0000)]
Since u8_prevbyte skips invalid chars on purpose, it can go before the ] if invalid utf8 chars get pasted in the console edit line. It's even possible to delete the ].
Fix this bug by giving to u8_prevbyte the edit line without ].

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10439 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=de39b9746aa912589462b418e2a9af3d69b063c2