OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master'

Browse source 
# Conflicts:
#	src/v_video.cpp
This commit is contained in:
Rachael Alexanderson 2017-03-03 16:29:33 -05:00
commit 21a8964bea
36 changed files with 388 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/textures/ddstexture.cpp
View file

@ -126,7 +126,7 @@ struct DDSURFACEDESC2
DWORD Width;
union
{
SDWORD Pitch;
int32_t Pitch;
DWORD LinearSize;
};
DWORD Depth;
@ -172,7 +172,7 @@ protected:
BYTE RShiftL, GShiftL, BShiftL, AShiftL;
BYTE RShiftR, GShiftR, BShiftR, AShiftR;
SDWORD Pitch;
int32_t Pitch;
DWORD LinearSize;
static void CalcBitShift (DWORD mask, BYTE *lshift, BYTE *rshift);