Whitespace, optimizations to VID_Update()

This commit is contained in:
Jeff Teunissen 2000-11-21 07:42:23 +00:00
parent 979a5b7e47
commit ded66b1bde

View file

@ -1,7 +1,7 @@
/*
vid_x11.c
general x11 video driver
General X11 video driver
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999-2000 contributors of the QuakeForge project
@ -31,52 +31,54 @@
*/
#define _BSD
#include <config.h>
#include <config.h>
#include <ctype.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <ctype.h>
#include <sys/time.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <sys/ipc.h>
#include <sys/shm.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/keysym.h>
#include <X11/extensions/XShm.h>
#include "qendian.h"
#include "qargs.h"
#include "quakedef.h"
#include "d_local.h"
#include "keys.h"
#include "cvar.h"
#include "menu.h"
#include "sys.h"
#include "cmd.h"
#include "input.h"
#include "draw.h"
#include "console.h"
#include "va.h"
#include "client.h"
#include "input.h"
#include "context_x11.h"
#ifdef HAVE_VIDMODE
# include <X11/extensions/xf86vmode.h>
#endif
#include "dga_check.h"
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <X11/extensions/XShm.h>
#ifdef HAVE_VIDMODE
# include <X11/extensions/xf86vmode.h>
#endif
#include "client.h"
#include "cmd.h"
#include "console.h"
#include "context_x11.h"
#include "cvar.h"
#include "d_local.h"
#include "dga_check.h"
#include "draw.h"
#include "input.h"
#include "input.h"
#include "keys.h"
#include "menu.h"
#include "qargs.h"
#include "qendian.h"
#include "quakedef.h"
#include "sys.h"
#include "va.h"
extern viddef_t vid; // global video state
unsigned short d_8to16table[256];
@ -86,7 +88,7 @@ static GC x_gc;
int XShmQueryExtension (Display *);
int XShmGetEventBase (Display *);
qboolean doShm;
static qboolean doShm;
static XShmSegmentInfo x_shminfo[2];
static int current_framebuffer;
@ -100,6 +102,7 @@ static byte current_palette[768];
typedef unsigned short PIXEL16;
typedef unsigned long PIXEL24;
static PIXEL16 st2d_8to16table[256];
static PIXEL24 st2d_8to24table[256];
static int shiftmask_fl = 0;
@ -117,37 +120,53 @@ shiftmask_init( void )
r_mask = x_vis->red_mask;
g_mask = x_vis->green_mask;
b_mask = x_vis->blue_mask;
for (r_shift=-8,x=1; x<r_mask; x <<= 1) r_shift++;
for (g_shift=-8,x=1; x<g_mask; x <<= 1) g_shift++;
for (b_shift=-8,x=1; x<b_mask; x <<= 1) b_shift++;
for (r_shift = -8, x = 1; x < r_mask; x <<= 1)
r_shift++;
for (g_shift = -8, x = 1; x < g_mask; x <<= 1)
g_shift++;
for (b_shift = -8, x = 1; x < b_mask; x <<= 1)
b_shift++;
shiftmask_fl = 1;
}
static PIXEL16
xlib_rgb16(int r, int g, int b)
{
PIXEL16 p = 0;
if (shiftmask_fl==0) shiftmask_init();
if (!shiftmask_fl)
shiftmask_init ();
if (r_shift > 0) {
p=(r << (r_shift)) & r_mask;
} else if (r_shift<0) {
} else {
if (r_shift < 0) {
p =(r >> (-r_shift)) & r_mask;
} else p|=(r&r_mask);
} else {
p |= (r & r_mask);
}
}
if (g_shift > 0) {
p |= (g << (g_shift)) & g_mask;
} else if (g_shift<0) {
} else {
if (g_shift < 0) {
p |= (g >> (-g_shift)) & g_mask;
} else p|=(g&g_mask);
} else {
p |= (g & g_mask);
}
}
if (b_shift > 0) {
p |= (b << (b_shift)) & b_mask;
} else if (b_shift<0) {
} else {
if (b_shift < 0) {
p |= (b >> (-b_shift)) & b_mask;
} else p|=(b&b_mask);
} else {
p |= (b & b_mask);
}
}
return p;
}
@ -158,30 +177,42 @@ xlib_rgb24(int r,int g,int b)
{
PIXEL24 p = 0;
if (shiftmask_fl==0) shiftmask_init();
if (!shiftmask_fl)
shiftmask_init ();
if (r_shift > 0) {
p = (r << (r_shift)) & r_mask;
} else if (r_shift<0) {
} else {
if (r_shift < 0) {
p = (r >> (-r_shift)) & r_mask;
} else p|=(r&r_mask);
} else {
p |= (r & r_mask);
}
}
if (g_shift > 0) {
p |= (g << (g_shift)) & g_mask;
} else if (g_shift<0) {
} else {
if (g_shift < 0) {
p |= (g >> (-g_shift)) & g_mask;
} else p|=(g&g_mask);
} else {
p |= (g & g_mask);
}
}
if (b_shift > 0) {
p |= (b << (b_shift)) & b_mask;
} else if (b_shift<0) {
} else {
if (b_shift < 0) {
p |= (b >> (-b_shift)) & b_mask;
} else p|=(b&b_mask);
} else {
p |= (b & b_mask);
}
}
return p;
}
static void
st2_fixup (XImage *framebuf, int x, int y, int width, int height)
{
@ -189,7 +220,8 @@ st2_fixup(XImage *framebuf, int x, int y, int width, int height)
unsigned char *src;
PIXEL16 *dest;
if (x < 0 || y < 0) return;
if (x < 0 || y < 0)
return;
for (yi = y; yi < (y + height); yi++) {
src = &framebuf->data[yi * framebuf->bytes_per_line];
@ -243,7 +275,8 @@ st3_fixup(XImage *framebuf, int x, int y, int width, int height)
D_BeginDirectRect
================
*/
void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
void
D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
{
// direct drawing of the "accessing disk" icon isn't supported
}
@ -254,7 +287,8 @@ void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
D_EndDirectRect
================
*/
void D_EndDirectRect (int x, int y, int width, int height)
void
D_EndDirectRect (int x, int y, int width, int height)
{
// direct drawing of the "accessing disk" icon isn't supported
}
@ -270,7 +304,8 @@ Keybinding command
byte vid_gamma[256];
void VID_Gamma_f (void)
void
VID_Gamma_f (void)
{
float g, f, inf;
@ -282,8 +317,7 @@ void VID_Gamma_f (void)
for (i = 0; i < 255; i++) {
f = pow ((i + 1) / 256.0, g);
inf = f*255 + 0.5;
if (inf < 0) inf = 0;
if (inf > 255) inf = 255;
inf = bound (0, inf, 255);
vid_gamma[i] = inf;
}
@ -341,21 +375,20 @@ ResetFrameBuffer(void)
D_InitCaches (vid_surfcache, tcachesize);
pwidth = x_visinfo->depth / 8;
if (pwidth == 3) pwidth = 4;
if (pwidth == 3)
pwidth = 4;
mem = ((vid.width * pwidth + 7) &~ 7) * vid.height;
x_framebuffer[0] = XCreateImage (x_disp, x_vis, x_visinfo->depth,
ZPixmap, 0,
malloc(mem),
vid.width, vid.height,
32, 0);
ZPixmap, 0, malloc (mem), vid.width,
vid.height, 32, 0);
if (!x_framebuffer[0]) {
Sys_Error ("VID: XCreateImage failed\n");
}
}
static void
ResetSharedFrameBuffers (void)
{
@ -411,18 +444,12 @@ ResetSharedFrameBuffers(void)
}
// create the image
x_framebuffer[frm] = XShmCreateImage (x_disp,
x_vis,
x_visinfo->depth,
ZPixmap,
0,
&x_shminfo[frm],
vid.width,
vid.height );
x_framebuffer[frm] = XShmCreateImage (x_disp, x_vis, x_visinfo->depth,
ZPixmap, 0, &x_shminfo[frm],
vid.width, vid.height );
// grab shared memory
size = x_framebuffer[frm]->bytes_per_line
* x_framebuffer[frm]->height;
size = x_framebuffer[frm]->bytes_per_line * x_framebuffer[frm]->height;
if (size < minsize)
Sys_Error ("VID: Window must use at least %d bytes\n", minsize);
@ -433,8 +460,7 @@ ResetSharedFrameBuffers(void)
Sys_Error ("VID: Could not get any shared memory\n");
// attach to the shared memory segment
x_shminfo[frm].shmaddr =
(void *) shmat(x_shminfo[frm].shmid, 0, 0);
x_shminfo[frm].shmaddr = (void *) shmat (x_shminfo[frm].shmid, 0, 0);
printf ("VID: shared memory id=%d, addr=0x%lx\n", x_shminfo[frm].shmid,
(long) x_shminfo[frm].shmaddr);
@ -451,17 +477,22 @@ ResetSharedFrameBuffers(void)
}
static void event_shm(XEvent *event)
static void
event_shm (XEvent *event)
{
if (doShm)
oktodraw = true;
}
// Called at startup to set up translation tables, takes 256 8 bit RGB values
// the palette data will go away after the call, so it must be copied off if
// the video driver will need it again
/*
VID_Init
void VID_Init (unsigned char *palette)
Set up color translation tables and the window. Takes a 256-color 8-bit
palette. Palette data will go away after the call, so copy it if you'll
need it later.
*/
void
VID_Init (unsigned char *palette)
{
int pnum, i;
XVisualInfo template;
@ -489,52 +520,46 @@ void VID_Init (unsigned char *palette)
// open the display
x11_open_display ();
// check for command-line window size
template_mask = 0;
// specify a visual id
if ((pnum=COM_CheckParm("-visualid")))
{
if ((pnum = COM_CheckParm ("-visualid"))) {
if (pnum >= com_argc-1)
Sys_Error ("VID: -visualid <id#>\n");
template.visualid = atoi (com_argv[pnum+1]);
template_mask = VisualIDMask;
}
// If not specified, use default visual
else
{
} else { // If not specified, use default visual
template.visualid =
XVisualIDFromVisual (XDefaultVisual (x_disp, x_screen));
template_mask = VisualIDMask;
}
// pick a visual- warn if more than one was available
// pick a visual -- warn if more than one was available
x_visinfo = XGetVisualInfo (x_disp, template_mask, &template, &num_visuals);
x_vis = x_visinfo->visual;
if (num_visuals > 1) {
printf ("Found more than one visual id at depth %d:\n", template.depth);
for (i = 0; i < num_visuals; i++)
printf(" -visualid %d\n", (int)(x_visinfo[i].visualid));
} else if (num_visuals == 0) {
if (template_mask == VisualIDMask) {
Sys_Error("VID: Bad visual id %ld\n",
template.visualid);
printf (" -visualid %d\n", (int) x_visinfo[i].visualid);
} else {
Sys_Error("VID: No visuals at depth %d\n",
template.depth);
if (num_visuals == 0) {
if (template_mask == VisualIDMask) {
Sys_Error ("VID: Bad visual ID %ld\n", template.visualid);
} else {
Sys_Error ("VID: No visuals at depth %d\n", template.depth);
}
}
}
if (verbose) {
printf("Using visualid %d:\n", (int)(x_visinfo->visualid));
printf ("Using visualid %d:\n", (int) x_visinfo->visualid);
printf (" class %d\n", x_visinfo->class);
printf (" screen %d\n", x_visinfo->screen);
printf (" depth %d\n", x_visinfo->depth);
printf(" red_mask 0x%x\n", (int)(x_visinfo->red_mask));
printf(" green_mask 0x%x\n", (int)(x_visinfo->green_mask));
printf(" blue_mask 0x%x\n", (int)(x_visinfo->blue_mask));
printf (" red_mask 0x%x\n", (int) x_visinfo->red_mask);
printf (" green_mask 0x%x\n", (int) x_visinfo->green_mask);
printf (" blue_mask 0x%x\n", (int) x_visinfo->blue_mask);
printf (" colormap_size %d\n",x_visinfo->colormap_size);
printf (" bits_per_rgb %d\n", x_visinfo->bits_per_rgb);
}
@ -551,8 +576,7 @@ void VID_Init (unsigned char *palette)
if (x_visinfo->depth == 8) {
/* Create and upload the palette */
if (x_visinfo->class == PseudoColor) {
x_cmap = XCreateColormap(x_disp, x_win,
x_vis, AllocAll);
x_cmap = XCreateColormap (x_disp, x_win, x_vis, AllocAll);
VID_SetPalette (palette);
XSetWindowColormap (x_disp, x_win, x_cmap);
}
@ -562,6 +586,7 @@ void VID_Init (unsigned char *palette)
{
XGCValues xgcvalues;
int valuemask = GCGraphicsExposures;
xgcvalues.graphics_exposures = False;
x_gc = XCreateGC (x_disp, x_win, valuemask, &xgcvalues );
}
@ -571,8 +596,7 @@ void VID_Init (unsigned char *palette)
// wait for first exposure event
{
XEvent event;
do
{
do {
XNextEvent (x_disp, &event);
if (event.type == Expose && !event.xexpose.count)
oktodraw = true;
@ -581,29 +605,27 @@ void VID_Init (unsigned char *palette)
// now safe to draw
// even if MITSHM is available, make sure it's a local connection
if (XShmQueryExtension(x_disp))
//if (0)
{
if (XShmQueryExtension (x_disp)) {
char *displayname;
char *d;
doShm = true;
displayname = (char *) getenv("DISPLAY");
if (displayname)
{
char *d = displayname;
while (*d && (*d != ':')) d++;
if (*d) *d = 0;
if ((displayname = XDisplayName (NULL))) {
if ((d = strchr (displayname, ':')))
*d = '\0';
if (!(!strcasecmp(displayname, "unix") || !*displayname))
doShm = false;
}
}
if (doShm)
{
if (doShm) {
x_shmeventtype = XShmGetEventBase (x_disp) + ShmCompletion;
ResetSharedFrameBuffers ();
}
else
} else {
ResetFrameBuffer ();
}
current_framebuffer = 0;
vid.rowbytes = x_framebuffer[0]->bytes_per_line;
@ -663,7 +685,9 @@ VID_SetPalette(unsigned char *palette)
/*
Called at shutdown
VID_Shutdown
Restore video mode
*/
void
VID_Shutdown (void)
@ -680,7 +704,9 @@ static int config_notify_width;
static int config_notify_height;
/*
Flushes the given rectangles from the view buffer to the screen.
VID_Update
Flush the given rectangles from the view buffer to the screen.
*/
void
VID_Update (vrect_t *rects)
@ -691,10 +717,12 @@ VID_Update(vrect_t *rects)
config_notify = 0;
vid.width = config_notify_width &~ 7;
vid.height = config_notify_height;
if (doShm)
ResetSharedFrameBuffers ();
else
ResetFrameBuffer ();
vid.rowbytes = x_framebuffer[0]->bytes_per_line;
vid.buffer = x_framebuffer[current_framebuffer]->data;
vid.conbuffer = vid.buffer;
@ -707,60 +735,54 @@ VID_Update(vrect_t *rects)
return;
}
if (doShm) {
while (rects) {
if (x_visinfo->depth == 16) {
switch (x_visinfo->depth) {
case 16:
st2_fixup (x_framebuffer[current_framebuffer],
rects->x, rects->y, rects->width,
rects->height);
} else if (x_visinfo->depth == 24) {
break;
case 24:
st3_fixup (x_framebuffer[current_framebuffer],
rects->x, rects->y, rects->width,
rects->height);
break;
}
if (doShm) {
if (!XShmPutImage (x_disp, x_win, x_gc,
x_framebuffer[current_framebuffer],
rects->x, rects->y,
rects->x, rects->y,
rects->x, rects->y, rects->x, rects->y,
rects->width, rects->height, True)) {
Sys_Error ("VID_Update: XShmPutImage failed\n");
}
oktodraw = false;
while (!oktodraw) x11_process_event();
while (!oktodraw)
x11_process_event ();
rects = rects->pnext;
}
current_framebuffer = !current_framebuffer;
vid.buffer = x_framebuffer[current_framebuffer]->data;
vid.conbuffer = vid.buffer;
XSync(x_disp, False);
} else {
while (rects) {
if (x_visinfo->depth == 16) {
st2_fixup(x_framebuffer[current_framebuffer],
rects->x, rects->y, rects->width,
rects->height);
} else if (x_visinfo->depth == 24) {
st3_fixup(x_framebuffer[current_framebuffer],
rects->x, rects->y, rects->width,
rects->height);
}
XPutImage(x_disp, x_win, x_gc, x_framebuffer[0],
if (!XPutImage (x_disp, x_win, x_gc, x_framebuffer[0],
rects->x, rects->y, rects->x, rects->y,
rects->width, rects->height);
rects->width, rects->height)) {
Sys_Error ("VID_Update: XPutImage failed\n");
}
rects = rects->pnext;
}
}
XSync (x_disp, False);
}
}
static int dither;
static qboolean dither;
void
VID_DitherOn (void)
{
if (dither == 0) {
if (!dither) {
vid.recalc_refdef = 1;
dither = 1;
dither = true;
}
}
@ -770,7 +792,7 @@ VID_DitherOff (void)
{
if (dither) {
vid.recalc_refdef = 1;
dither = 0;
dither = false;
}
}