From bb9cd1b1593898c0f1a6919222913e3db6a30aeb Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 2 Apr 2017 11:41:04 +0300 Subject: [PATCH] Removed special initialization of legacy render styles Workaround for Apple's GCC 4.0.1 is now completely pointless --- src/r_data/renderstyle.cpp | 39 -------------------------------------- 1 file changed, 39 deletions(-) diff --git a/src/r_data/renderstyle.cpp b/src/r_data/renderstyle.cpp index 49628c881..987de82b9 100644 --- a/src/r_data/renderstyle.cpp +++ b/src/r_data/renderstyle.cpp @@ -42,9 +42,6 @@ CVAR (Int, r_drawfuzz, 1, CVAR_ARCHIVE) // Convert legacy render styles to flexible render styles. -// Apple's GCC 4.0.1 apparently wants to initialize the AsDWORD member of FRenderStyle -// rather than the struct before it, which goes against the standard. -#ifndef __APPLE__ FRenderStyle LegacyRenderStyles[STYLE_Count] = { { { STYLEOP_None, STYLEALPHA_Zero, STYLEALPHA_Zero, 0 } }, /* STYLE_None */ @@ -62,42 +59,6 @@ FRenderStyle LegacyRenderStyles[STYLE_Count] = { { STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_One, STYLEF_ColorIsFixed } }, /* STYLE_AddStencil */ { { STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_One, STYLEF_RedIsAlpha | STYLEF_ColorIsFixed } }, /* STYLE_AddShaded */ }; -#else -FRenderStyle LegacyRenderStyles[STYLE_Count]; - -static const uint8_t Styles[STYLE_Count * 4] = -{ - STYLEOP_None, STYLEALPHA_Zero, STYLEALPHA_Zero, 0, - STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_InvSrc, STYLEF_Alpha1, - STYLEOP_Fuzz, STYLEALPHA_Src, STYLEALPHA_InvSrc, 0, - STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_InvSrc, STYLEF_TransSoulsAlpha, - STYLEOP_FuzzOrAdd, STYLEALPHA_Src, STYLEALPHA_InvSrc, 0, - STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_InvSrc, STYLEF_Alpha1 | STYLEF_ColorIsFixed, - STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_InvSrc, 0, - STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_One, 0, - STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_InvSrc, STYLEF_RedIsAlpha | STYLEF_ColorIsFixed, - STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_InvSrc, STYLEF_ColorIsFixed, - STYLEOP_Shadow, 0, 0, 0, - STYLEOP_RevSub, STYLEALPHA_Src, STYLEALPHA_One, 0, - STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_One, STYLEF_Alpha1 | STYLEF_ColorIsFixed, - STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_One, STYLEF_RedIsAlpha | STYLEF_ColorIsFixed, -}; - -static struct LegacyInit -{ - LegacyInit() - { - for (int i = 0; i < STYLE_Count; ++i) - { - LegacyRenderStyles[i].BlendOp = Styles[i*4]; - LegacyRenderStyles[i].SrcAlpha = Styles[i*4+1]; - LegacyRenderStyles[i].DestAlpha = Styles[i*4+2]; - LegacyRenderStyles[i].Flags = Styles[i*4+3]; - } - } -} DoLegacyInit; - -#endif double GetAlpha(int type, double alpha) {