summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-10-21 19:17:31 -0600
committerBrian Paul <brianp@vmware.com>2010-10-21 19:17:44 -0600
commite3298eaf52a9ab4eb7ec854a82a285dee4f87118 (patch)
tree0b673217709b77c5ab73ac415ade622e8115e72b
parent69a07be3e527dbc2148a4e20c50e60266225f5f2 (diff)
winsys/xlib: formatting fixes
-rw-r--r--src/gallium/winsys/sw/xlib/xlib_sw_winsys.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
index b78f537c12..4ed3251089 100644
--- a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
+++ b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
@@ -85,9 +85,6 @@ struct xm_displaytarget
struct xlib_sw_winsys
{
struct sw_winsys base;
-
-
-
Display *display;
};
@@ -120,7 +117,8 @@ mesaHandleXError(Display *dpy, XErrorEvent *event)
}
-static char *alloc_shm(struct xm_displaytarget *buf, unsigned size)
+static char *
+alloc_shm(struct xm_displaytarget *buf, unsigned size)
{
XShmSegmentInfo *const shminfo = & buf->shminfo;
@@ -231,6 +229,7 @@ xm_displaytarget_map(struct sw_winsys *ws,
return xm_dt->mapped;
}
+
static void
xm_displaytarget_unmap(struct sw_winsys *ws,
struct sw_displaytarget *dt)
@@ -239,6 +238,7 @@ xm_displaytarget_unmap(struct sw_winsys *ws,
xm_dt->mapped = NULL;
}
+
static void
xm_displaytarget_destroy(struct sw_winsys *ws,
struct sw_displaytarget *dt)
@@ -325,8 +325,7 @@ xlib_sw_display(struct xlib_drawable *xlib_drawable,
XSetFunction( display, xm_dt->gc, GXcopy );
}
- if (xm_dt->shm)
- {
+ if (xm_dt->shm) {
ximage = xm_dt->tempImage;
ximage->data = xm_dt->data;
@@ -356,6 +355,7 @@ xlib_sw_display(struct xlib_drawable *xlib_drawable,
XFlush(xm_dt->display);
}
+
/**
* Display/copy the image in the surface into the X window specified
* by the XMesaBuffer.
@@ -382,7 +382,7 @@ xm_displaytarget_create(struct sw_winsys *winsys,
unsigned nblocksy, size;
xm_dt = CALLOC_STRUCT(xm_displaytarget);
- if(!xm_dt)
+ if (!xm_dt)
goto no_xm_dt;
xm_dt->display = ((struct xlib_sw_winsys *)winsys)->display;
@@ -401,9 +401,9 @@ xm_displaytarget_create(struct sw_winsys *winsys,
}
}
- if(!xm_dt->data) {
+ if (!xm_dt->data) {
xm_dt->data = align_malloc(size, alignment);
- if(!xm_dt->data)
+ if (!xm_dt->data)
goto no_data;
}
@@ -470,4 +470,3 @@ xlib_create_sw_winsys( Display *display )
return &ws->base;
}
-