qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 00:30:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[sw] Remove pixbytes from sw_ctx_t

Browse source 
It's no longer needed as the sw renderer is 8-bit only.
This commit is contained in:
Bill Currie 2022-03-21 14:36:57 +09:00
parent b82a353a20
commit 4c90c3c4bb
3 changed files with 34 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/vid_sw.h
View file

@ -3,7 +3,6 @@
struct vrect_s; struct vrect_s;
typedef struct sw_ctx_s { typedef struct sw_ctx_s {
int pixbytes;
void (*choose_visual) (struct sw_ctx_s *ctx); void (*choose_visual) (struct sw_ctx_s *ctx);
void (*create_context) (struct sw_ctx_s *ctx); void (*create_context) (struct sw_ctx_s *ctx);
void (*set_palette) (struct sw_ctx_s *ctx, const byte *palette); void (*set_palette) (struct sw_ctx_s *ctx, const byte *palette);

1
libs/video/targets/vid_win_sw.c
View file

@ -469,7 +469,6 @@ sw_ctx_t *
Win_SW_Context (void) Win_SW_Context (void)
{ {
sw_ctx_t *ctx = calloc (1, sizeof (sw_ctx_t)); sw_ctx_t *ctx = calloc (1, sizeof (sw_ctx_t));
ctx->pixbytes = 1;
ctx->set_palette = win_set_palette; ctx->set_palette = win_set_palette;
ctx->choose_visual = win_choose_visual; ctx->choose_visual = win_choose_visual;
ctx->create_context = win_create_context; ctx->create_context = win_create_context;

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

@ -307,7 +307,7 @@ x11_put_image (vrect_t *rects)
Flush the given rectangles from the view buffer to the screen. Flush the given rectangles from the view buffer to the screen.
*/ */
static void static void
x11_sw8_update (sw_ctx_t *ctx, vrect_t *rects) x11_sw8_8_update (sw_ctx_t *ctx, vrect_t *rects)
{ {
while (rects) { while (rects) {
switch (x_visinfo->depth) { switch (x_visinfo->depth) {
@ -327,6 +327,32 @@ x11_sw8_update (sw_ctx_t *ctx, vrect_t *rects)
r_data->scr_fullupdate = 0; r_data->scr_fullupdate = 0;
} }
static void
x11_sw8_16_update (sw_ctx_t *ctx, vrect_t *rects)
{
while (rects) {
st2_fixup (x_framebuffer[current_framebuffer],
rects->x, rects->y, rects->width, rects->height);
x11_put_image (rects);
rects = rects->next;
}
XSync (x_disp, False);
r_data->scr_fullupdate = 0;
}
static void
x11_sw8_24_update (sw_ctx_t *ctx, vrect_t *rects)
{
while (rects) {
st3_fixup (x_framebuffer[current_framebuffer],
rects->x, rects->y, rects->width, rects->height);
x11_put_image (rects);
rects = rects->next;
}
XSync (x_disp, False);
r_data->scr_fullupdate = 0;
}
#if 0
static void static void
x11_sw16_16_update (sw_ctx_t *ctx, vrect_t *rects) x11_sw16_16_update (sw_ctx_t *ctx, vrect_t *rects)
{ {
@ -411,7 +437,7 @@ x11_sw32_update (sw_ctx_t *ctx, vrect_t *rects)
XSync (x_disp, False); XSync (x_disp, False);
r_data->scr_fullupdate = 0; r_data->scr_fullupdate = 0;
} }
#endif
static void static void
x11_choose_visual (sw_ctx_t *ctx) x11_choose_visual (sw_ctx_t *ctx)
{ {
@ -441,31 +467,16 @@ x11_choose_visual (sw_ctx_t *ctx)
x_cmap = XCreateColormap (x_disp, x_win, x_vis, AllocAll); x_cmap = XCreateColormap (x_disp, x_win, x_vis, AllocAll);
x_vis = x_visinfo->visual; x_vis = x_visinfo->visual;
ctx->update = x11_sw8_update; ctx->update = x11_sw8_8_update;
switch (x_visinfo->depth) { switch (x_visinfo->depth) {
case 8: case 8:
ctx->pixbytes = 1; ctx->update = x11_sw8_8_update;
ctx->update = x11_sw8_update;
break; break;
case 16: case 16:
if (ctx->pixbytes > 2) { ctx->update = x11_sw8_16_update;
ctx->pixbytes = 2;
}
if (ctx->pixbytes == 2) {
ctx->update = x11_sw16_16_update;
}
break; break;
case 24: case 24:
switch (ctx->pixbytes) { ctx->update = x11_sw8_24_update;
case 1:
break;
case 2:
ctx->update = x11_sw16_32_update;
break;
case 4:
ctx->update = x11_sw32_update;
break;
}
break; break;
} }
@ -584,7 +595,6 @@ ResetSharedFrameBuffers (void)
static void static void
x11_init_buffers (void *data) x11_init_buffers (void *data)
{ {
sw_ctx_t *ctx = data;
if (doShm) if (doShm)
ResetSharedFrameBuffers (); ResetSharedFrameBuffers ();
else else
@ -592,7 +602,7 @@ x11_init_buffers (void *data)
current_framebuffer = 0; current_framebuffer = 0;
viddef.rowbytes = ctx->pixbytes * viddef.width; viddef.rowbytes = viddef.width;
if (x_visinfo->depth != 8) { if (x_visinfo->depth != 8) {
if (viddef.buffer) if (viddef.buffer)
free (viddef.buffer); free (viddef.buffer);
@ -651,11 +661,10 @@ sw_ctx_t *
X11_SW_Context (void) X11_SW_Context (void)
{ {
sw_ctx_t *ctx = calloc (1, sizeof (sw_ctx_t)); sw_ctx_t *ctx = calloc (1, sizeof (sw_ctx_t));
ctx->pixbytes = 1;
ctx->set_palette = x11_set_palette; ctx->set_palette = x11_set_palette;
ctx->choose_visual = x11_choose_visual; ctx->choose_visual = x11_choose_visual;
ctx->create_context = x11_create_context; ctx->create_context = x11_create_context;
ctx->update = x11_sw8_update; ctx->update = x11_sw8_8_update;
return ctx; return ctx;
} }