From 250cac607938ba5b12536050d6c6a369bcb27f27 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Fri, 24 Nov 2023 12:28:55 +0900 Subject: [PATCH] [vid] Remove direct draw interface It has been dead for a long time. --- include/d_iface.h | 2 - libs/video/targets/vid_win.c | 71 ------------------------------------ libs/video/targets/vid_x11.c | 12 ------ 3 files changed, 85 deletions(-) diff --git a/include/d_iface.h b/include/d_iface.h index ec4ac6bf9..5d5d4937d 100644 --- a/include/d_iface.h +++ b/include/d_iface.h @@ -156,8 +156,6 @@ extern vec3_t r_pright, r_pup, r_ppn, r_porigin; void D_Aff8Patch (const byte *pcolormap); -void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height); -void D_EndDirectRect (int x, int y, int width, int height); void D_PolysetDraw (void); void D_PolysetDrawFinalVerts (finalvert_t *fv, int numverts); void D_PolysetSetEdgeTable (void); diff --git a/libs/video/targets/vid_win.c b/libs/video/targets/vid_win.c index 359628515..515a8347e 100644 --- a/libs/video/targets/vid_win.c +++ b/libs/video/targets/vid_win.c @@ -39,77 +39,6 @@ static vid_internal_t vid_internal; -#if 0 -static byte backingbuf[48 * 24]; -#endif - -void -D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height) -{ -#if 0 - int i, j, reps = 1, repshift = 0; - vrect_t rect; - - if (!viddef.initialized || !win_sw_context) - return; - - if (!viddef.buffer) - return; - - for (i = 0; i < (height << repshift); i += reps) { - for (j = 0; j < reps; j++) { - memcpy (&backingbuf[(i + j) * 24], - viddef.buffer + x + ((y << repshift) + i + - j) * viddef.rowbytes, width); - - memcpy (viddef.buffer + x + - ((y << repshift) + i + j) * viddef.rowbytes, - &pbitmap[(i >> repshift) * width], width); - } - } - - rect.x = x; - rect.y = y; - rect.width = width; - rect.height = height << repshift; - rect.next = NULL; - - win_sw_context->update (win_sw_context, &rect); -#endif -} - - -void -D_EndDirectRect (int x, int y, int width, int height) -{ -#if 0 - int i, j, reps = 1, repshift = 0; - vrect_t rect; - - if (!viddef.initialized || !win_sw_context) - return; - - if (!viddef.buffer) - return; - - for (i = 0; i < (height << repshift); i += reps) { - for (j = 0; j < reps; j++) { - memcpy (viddef.buffer + x + - ((y << repshift) + i + j) * viddef.rowbytes, - &backingbuf[(i + j) * 24], width); - } - } - - rect.x = x; - rect.y = y; - rect.width = width; - rect.height = height << repshift; - rect.next = NULL; - - win_sw_context->update (win_sw_context, &rect); -#endif -} - static void VID_shutdown (void *data) { diff --git a/libs/video/targets/vid_x11.c b/libs/video/targets/vid_x11.c index 6a3294df9..6dd1ae7d9 100644 --- a/libs/video/targets/vid_x11.c +++ b/libs/video/targets/vid_x11.c @@ -69,18 +69,6 @@ static vid_internal_t vid_internal; int VID_options_items = 1; -void -D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height) -{ -// direct drawing of the "accessing disk" icon isn't supported -} - -void -D_EndDirectRect (int x, int y, int width, int height) -{ -// direct drawing of the "accessing disk" icon isn't supported -} - static void X11_VID_Shutdown (void) {