replace fb with I_VideoBuffer (#1453)

This commit is contained in:
Roman Fomin 2024-02-09 16:12:44 +07:00 committed by GitHub
parent 2787af02ef
commit 95c8ddedd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -211,8 +211,6 @@ static int f_y;
static int f_w; static int f_w;
static int f_h; static int f_h;
static byte* fb; // pseudo-frame buffer
static mpoint_t m_paninc; // how far the window pans each tic (map coords) static mpoint_t m_paninc; // how far the window pans each tic (map coords)
static fixed_t mtof_zoommul; // how far the window zooms each tic (map coords) static fixed_t mtof_zoommul; // how far the window zooms each tic (map coords)
static fixed_t ftom_zoommul; // how far the window zooms each tic (fb coords) static fixed_t ftom_zoommul; // how far the window zooms each tic (fb coords)
@ -487,7 +485,6 @@ void AM_initVariables(void)
static event_t st_notify = { ev_keyup, AM_MSGENTERED }; static event_t st_notify = { ev_keyup, AM_MSGENTERED };
automapactive = true; automapactive = true;
fb = I_VideoBuffer;
m_paninc.x = m_paninc.y = 0; m_paninc.x = m_paninc.y = 0;
ftom_zoommul = FRACUNIT; ftom_zoommul = FRACUNIT;
@ -1051,7 +1048,7 @@ void AM_Ticker (void)
static void AM_clearFB(int color) static void AM_clearFB(int color)
{ {
int h = f_h; int h = f_h;
byte *src = fb; byte *src = I_VideoBuffer;
while (h--) while (h--)
{ {
memset(src, color, f_w); memset(src, color, f_w);
@ -1234,7 +1231,7 @@ static void AM_drawFline_Vanilla(fline_t* fl, int color)
} }
#endif #endif
#define PUTDOT(xx,yy,cc) fb[(yy)*video.pitch+(xx)]=(cc) #define PUTDOT(xx,yy,cc) I_VideoBuffer[(yy)*video.pitch+(xx)]=(cc)
dx = fl->b.x - fl->a.x; dx = fl->b.x - fl->a.x;
ax = 2 * (dx<0 ? -dx : dx); ax = 2 * (dx<0 ? -dx : dx);
@ -1288,7 +1285,7 @@ static void AM_drawFline_Vanilla(fline_t* fl, int color)
// //
static void AM_putWuDot(int x, int y, int color, int weight) static void AM_putWuDot(int x, int y, int color, int weight)
{ {
byte *dest = &fb[y * video.pitch + x]; byte *dest = &I_VideoBuffer[y * video.pitch + x];
unsigned int *fg2rgb = Col2RGB8[weight]; unsigned int *fg2rgb = Col2RGB8[weight];
unsigned int *bg2rgb = Col2RGB8[64 - weight]; unsigned int *bg2rgb = Col2RGB8[64 - weight];
unsigned int fg, bg; unsigned int fg, bg;