]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
UNMERGE
authorhavoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Sat, 3 Jul 2010 10:33:30 +0000 (10:33 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 24 Sep 2010 20:00:50 +0000 (22:00 +0200)
commit88e9ec9eb7b6d1986fc8c0ca162e567ab544b82b
tree4ed1174e43c962d1a7090678e8aafa5566b19bbf
parent3ce78f36002bf316174776bb88c4aa9d814adce2
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
gl_rmain.c