]> git.xonotic.org Git - xonotic/darkplaces.git/commit
projects / xonotic / darkplaces.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: a5ac53e) | patch
UNMERGE
authorhavoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Fri, 17 Sep 2010 14:19:14 +0000 (14:19 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 24 Sep 2010 20:00:06 +0000 (22:00 +0200)
commit7921ced5ffdf115575a6b77a851468a4c6a20c78
tree832e541d580077b776cba48734ca897239f81273tree | snapshot
parenta5ac53e937b8efd9a9175a7b3f4926ab91874026commit | diff
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
gl_rmain.c diff | blob | history
r_shadow.c diff | blob | history
render.h diff | blob | history