OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'zdoom/master' into qzdoom

Browse source 
# Conflicts:
#	src/CMakeLists.txt
#	src/doomtype.h
#	src/r_drawt.cpp
This commit is contained in:
Magnus Norddahl 2016-12-07 18:35:27 +01:00
commit 9ed02a6aec
17 changed files with 76 additions and 4681 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/r_main.cpp
View file

@ -825,9 +825,6 @@ void R_SetupBuffer ()
{
dc_pitch = pitch;
R_InitFuzzTable (pitch);
#if defined(X86_ASM) || defined(X64_ASM)
ASM_PatchPitch ();
#endif
}
dc_destorg = lineptr;
dc_destheight = RenderTarget->GetHeight() - viewwindowy;