OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Added IsBgra() to DCanvas

Browse source 
Changed SWRender output format to be decided by IsBgra()
This commit is contained in:
Magnus Norddahl 2016-05-31 09:36:18 +02:00
commit 05220a7133
24 changed files with 139 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/f_wipe.cpp
View file

@ -33,8 +33,6 @@
// SCREEN WIPE PACKAGE
//
EXTERN_CVAR(Bool, r_swtruecolor)
static int CurrentWipeType;
static short *wipe_scr_start;
@ -385,7 +383,7 @@ static bool (*wipes[])(int) =
// Returns true if the wipe should be performed.
bool wipe_StartScreen (int type)
{
if (r_swtruecolor)
if (screen->IsBgra())
return false;
CurrentWipeType = clamp(type, 0, wipe_NUMWIPES - 1);
@ -401,7 +399,7 @@ bool wipe_StartScreen (int type)
void wipe_EndScreen (void)
{
if (r_swtruecolor)
if (screen->IsBgra())
return;
if (CurrentWipeType)
@ -420,7 +418,7 @@ bool wipe_ScreenWipe (int ticks)
{
bool rc;
if (r_swtruecolor)
if (screen->IsBgra())
return true;
if (CurrentWipeType == wipe_None)
@ -436,7 +434,7 @@ bool wipe_ScreenWipe (int ticks)
// Final things for the wipe
void wipe_Cleanup()
{
if (r_swtruecolor)
if (screen->IsBgra())
return;
if (wipe_scr_start != NULL)