qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 06:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[x11] Clean up duplicate code in software updates

Browse source 
The actual x11 update code was identical between all versions, so it was
moved into the one function.
This commit is contained in:
Bill Currie 2021-11-03 22:22:37 +09:00
parent 16d1232b91
commit af56e9242b
1 changed files with 32 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
libs/video/targets/vid_x11_sw.c
View file

@ -278,6 +278,30 @@ st3_fixup (XImage * framebuf, int x, int y, int width, int height)
} }
} }
static void
x11_put_image (vrect_t *rects)
{
if (doShm) {
if (!XShmPutImage (x_disp, x_win, x_gc,
x_framebuffer[current_framebuffer],
rects->x, rects->y, rects->x, rects->y,
rects->width, rects->height, True)) {
Sys_Error ("VID_Update: XShmPutImage failed");
}
oktodraw = false;
while (!oktodraw)
X11_ProcessEvent ();
current_framebuffer = !current_framebuffer;
} else {
if (XPutImage (x_disp, x_win, x_gc, x_framebuffer[0],
rects->x, rects->y, rects->x, rects->y,
rects->width, rects->height)) {
Sys_Error ("VID_Update: XPutImage failed");
}
}
}
/* /*
Flush the given rectangles from the view buffer to the screen. Flush the given rectangles from the view buffer to the screen.
*/ */
@ -295,27 +319,8 @@ x11_sw8_update (sw_ctx_t *ctx, vrect_t *rects)
rects->x, rects->y, rects->width, rects->height); rects->x, rects->y, rects->width, rects->height);
break; break;
} }
if (doShm) { x11_put_image (rects);
if (!XShmPutImage (x_disp, x_win, x_gc, rects = rects->next;
x_framebuffer[current_framebuffer],
rects->x, rects->y, rects->x, rects->y,
rects->width, rects->height, True)) {
Sys_Error ("VID_Update: XShmPutImage failed");
}
oktodraw = false;
while (!oktodraw)
X11_ProcessEvent ();
rects = rects->next;
current_framebuffer = !current_framebuffer;
} else {
if (XPutImage (x_disp, x_win, x_gc, x_framebuffer[0],
rects->x, rects->y, rects->x, rects->y,
rects->width, rects->height)) {
Sys_Error ("VID_Update: XPutImage failed");
}
rects = rects->next;
}
} }
XSync (x_disp, False); XSync (x_disp, False);
r_data->scr_fullupdate = 0; r_data->scr_fullupdate = 0;
@ -341,27 +346,8 @@ x11_sw16_16_update (sw_ctx_t *ctx, vrect_t *rects)
*dest++ = *src++; *dest++ = *src++;
} }
} }
if (doShm) { x11_put_image (rects);
if (!XShmPutImage (x_disp, x_win, x_gc, rects = rects->next;
x_framebuffer[current_framebuffer],
rects->x, rects->y, rects->x, rects->y,
rects->width, rects->height, True)) {
Sys_Error ("VID_Update: XShmPutImage failed");
}
oktodraw = false;
while (!oktodraw)
X11_ProcessEvent ();
rects = rects->next;
current_framebuffer = !current_framebuffer;
} else {
if (XPutImage (x_disp, x_win, x_gc, x_framebuffer[0],
rects->x, rects->y, rects->x, rects->y,
rects->width, rects->height)) {
Sys_Error ("VID_Update: XPutImage failed");
}
rects = rects->next;
}
} }
XSync (x_disp, False); XSync (x_disp, False);
r_data->scr_fullupdate = 0; r_data->scr_fullupdate = 0;
@ -391,27 +377,8 @@ x11_sw16_32_update (sw_ctx_t *ctx, vrect_t *rects)
| ((c & 0x001f) << 3); | ((c & 0x001f) << 3);
} }
} }
if (doShm) { x11_put_image (rects);
if (!XShmPutImage (x_disp, x_win, x_gc, rects = rects->next;
x_framebuffer[current_framebuffer],
rects->x, rects->y, rects->x, rects->y,
rects->width, rects->height, True)) {
Sys_Error ("VID_Update: XShmPutImage failed");
}
oktodraw = false;
while (!oktodraw)
X11_ProcessEvent ();
rects = rects->next;
current_framebuffer = !current_framebuffer;
} else {
if (XPutImage (x_disp, x_win, x_gc, x_framebuffer[0],
rects->x, rects->y, rects->x, rects->y,
rects->width, rects->height)) {
Sys_Error ("VID_Update: XPutImage failed");
}
rects = rects->next;
}
} }
XSync (x_disp, False); XSync (x_disp, False);
r_data->scr_fullupdate = 0; r_data->scr_fullupdate = 0;
@ -437,27 +404,8 @@ x11_sw32_update (sw_ctx_t *ctx, vrect_t *rects)
*dest++ = *src++; *dest++ = *src++;
} }
} }
if (doShm) { x11_put_image (rects);
if (!XShmPutImage (x_disp, x_win, x_gc, rects = rects->next;
x_framebuffer[current_framebuffer],
rects->x, rects->y, rects->x, rects->y,
rects->width, rects->height, True)) {
Sys_Error ("VID_Update: XShmPutImage failed");
}
oktodraw = false;
while (!oktodraw)
X11_ProcessEvent ();
rects = rects->next;
current_framebuffer = !current_framebuffer;
} else {
if (XPutImage (x_disp, x_win, x_gc, x_framebuffer[0],
rects->x, rects->y, rects->x, rects->y,
rects->width, rects->height)) {
Sys_Error ("VID_Update: XPutImage failed");
}
rects = rects->next;
}
} }
XSync (x_disp, False); XSync (x_disp, False);
r_data->scr_fullupdate = 0; r_data->scr_fullupdate = 0;