git.rm.cloudns.org Git - xonotic/darkplaces.git/log

divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 17 Jun 2010 21:53:45 +0000 (21:53 +0000)]

UNMERGE
optimize away NOP wave functions in one more case

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 26 Jun 2010 20:46:57 +0000 (20:46 +0000)]

UNMERGE
make sure dynamicvertex gets set by deformvertexes commands

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 2 Jul 2010 02:24:32 +0000 (02:24 +0000)]

UNMERGE
fix a bunch of warnings if compiling darkplaces as C++ in MSVC2008

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 2 Jul 2010 09:00:08 +0000 (09:00 +0000)]

UNMERGE
created new MSVC2008 project files and solution from scratch
fixed several warnings in MSVC2008

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 3 Jul 2010 10:27:16 +0000 (10:27 +0000)]

UNMERGE
implemented Direct3D9 renderer (off by default), not very optimized but almost completely functional

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Sat, 3 Jul 2010 10:33:30 +0000 (10:33 +0000)]

UNMERGE
updated glsl and cg (now also directly compiled as hlsl) shaders - integrated the r_bloom_colorsubtract behavior into the shader rather than relying on fixed function blending in an extra pass, this should be a little faster...

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Mon, 5 Jul 2010 08:30:22 +0000 (08:30 +0000)]

UNMERGE
remove the #define list at the start of the embedded default.glsl, it
was unintended (this list is prepended by r_glsl_dumpshader)

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

commit | commitdiff | tree

divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Fri, 9 Jul 2010 17:21:51 +0000 (17:21 +0000)]

UNMERGE
cleanup mempool use when generating a shadow mesh (one instance that used "loadmodel->mempool" that shouldn't)

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:11:05 +0000 (10:11 +0000)]

UNMERGE
fix a warning in mingw

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:11:20 +0000 (10:11 +0000)]

UNMERGE
fix a warning in mingw

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:11:44 +0000 (10:11 +0000)]

UNMERGE
fix more warnings in mingw

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:12:46 +0000 (10:12 +0000)]

UNMERGE
fix a warning in mingw
changed a model->brush.data_nodes check to data_leafs instead

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:13:01 +0000 (10:13 +0000)]

UNMERGE
fix more mingw warnings

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:13:17 +0000 (10:13 +0000)]

UNMERGE
fix a mingw warning

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Wed, 14 Jul 2010 10:14:07 +0000 (10:14 +0000)]

UNMERGE
fix a mingw warning

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 15 Jul 2010 12:38:52 +0000 (12:38 +0000)]

UNMERGE
improved r_shadows 2 shadowmapping setup code a bit, especially the
debugging code snippets

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 15 Jul 2010 12:39:14 +0000 (12:39 +0000)]

UNMERGE
fix r_shadows 2 shadowmapping by rendering to the correct depth range in
GL again

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

commit | commitdiff | tree

divverent divverent@d7cf8633-e32d-0410-b094-e92efae38249 [Sun, 25 Jul 2010 14:56:25 +0000 (14:56 +0000)]

UNMERGE
fix a nasty bug in refraction/water renders. It is evil that GL20TU_FIRST must be matching, out of all texture units, the one of normalmaps.

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Mon, 9 Aug 2010 17:32:26 +0000 (17:32 +0000)]

UNMERGE
fix a few warnings

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 19 Aug 2010 14:36:01 +0000 (14:36 +0000)]

UNMERGE
load d3dx9_*.dll dynamically to get D3DXCompileShader to fix a compile
error with mingw headers, this also means it doesn't matter which
version is present on the user's system

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 19 Aug 2010 14:38:49 +0000 (14:38 +0000)]

UNMERGE
fix almost all g++ -pedantic warnings

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

commit | commitdiff | tree

havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 [Thu, 19 Aug 2010 15:15:32 +0000 (15:15 +0000)]

UNMERGE
fix a compile error

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

remove more unused code

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

remove another unused variable

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

remove two unused vars

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

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

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

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

change clamping logic

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

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

fix ambient sounds in prologic

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

fix a compile error and some warnings

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

ProLogic patch by Joris Nijnuis, with some fixes

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

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

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

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

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

Fix a couple HLSL shader warnings

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

Forgot to put back the paranoid code

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

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

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

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

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

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

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

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

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

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

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

fix leaktest

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

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

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

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

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

fix leaktest

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

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

TraceBrush: use in Collision_ClipToGenericEntity

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

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

Fix stencil shadows in D3D9

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

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

fix an inverted return value

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

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

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

add a type cast for C++

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

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

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

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

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