summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/dri/dri_context.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom-at-vmware-dot-com>2009-04-28 11:54:25 +0200
committerThomas Hellstrom <thellstrom-at-vmware-dot-com>2009-04-28 11:54:25 +0200
commit0929b2bf3cdb54d94da8dee5797878e2ee582b41 (patch)
tree50fcd08fee5559c19373c5502187217c514ff679 /src/gallium/state_trackers/dri/dri_context.c
parentca1f5f7e6c05e34cfe8ef10f29aa19f5547311e6 (diff)
downloadexternal_mesa3d-0929b2bf3cdb54d94da8dee5797878e2ee582b41.zip
external_mesa3d-0929b2bf3cdb54d94da8dee5797878e2ee582b41.tar.gz
external_mesa3d-0929b2bf3cdb54d94da8dee5797878e2ee582b41.tar.bz2
gallium: indent and cleanfile the dri state-tracker.
Diffstat (limited to 'src/gallium/state_trackers/dri/dri_context.c')
-rw-r--r--src/gallium/state_trackers/dri/dri_context.c42
1 files changed, 17 insertions, 25 deletions
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c
index a45fb54..7f38671 100644
--- a/src/gallium/state_trackers/dri/dri_context.c
+++ b/src/gallium/state_trackers/dri/dri_context.c
@@ -42,12 +42,9 @@
#include "util/u_memory.h"
-
-
GLboolean
-dri_create_context(const __GLcontextModes *visual,
- __DRIcontextPrivate *cPriv,
- void *sharedContextPrivate)
+dri_create_context(const __GLcontextModes * visual,
+ __DRIcontextPrivate * cPriv, void *sharedContextPrivate)
{
__DRIscreenPrivate *sPriv = cPriv->driScreenPriv;
struct dri_screen *screen = dri_screen(sPriv);
@@ -55,7 +52,7 @@ dri_create_context(const __GLcontextModes *visual,
struct st_context *st_share = NULL;
if (sharedContextPrivate) {
- st_share = ((struct dri_context *) sharedContextPrivate)->st;
+ st_share = ((struct dri_context *)sharedContextPrivate)->st;
}
ctx = CALLOC_STRUCT(dri_context);
@@ -70,9 +67,7 @@ dri_create_context(const __GLcontextModes *visual,
ctx->r_stamp = -1;
driParseConfigFiles(&ctx->optionCache,
- &screen->optionCache,
- sPriv->myNum,
- "dri");
+ &screen->optionCache, sPriv->myNum, "dri");
ctx->pipe = drm_api_hooks.create_context(screen->pipe_screen);
@@ -90,7 +85,7 @@ dri_create_context(const __GLcontextModes *visual,
return GL_TRUE;
-fail:
+ fail:
if (ctx && ctx->st)
st_destroy_context(ctx->st);
@@ -101,9 +96,8 @@ fail:
return FALSE;
}
-
void
-dri_destroy_context(__DRIcontextPrivate *cPriv)
+dri_destroy_context(__DRIcontextPrivate * cPriv)
{
struct dri_context *ctx = dri_context(cPriv);
struct dri_screen *screen = dri_screen(cPriv->driScreenPriv);
@@ -125,9 +119,8 @@ dri_destroy_context(__DRIcontextPrivate *cPriv)
FREE(ctx);
}
-
GLboolean
-dri_unbind_context(__DRIcontextPrivate *cPriv)
+dri_unbind_context(__DRIcontextPrivate * cPriv)
{
if (cPriv) {
struct dri_context *ctx = dri_context(cPriv);
@@ -146,15 +139,16 @@ dri_unbind_context(__DRIcontextPrivate *cPriv)
}
GLboolean
-dri_make_current(__DRIcontextPrivate *cPriv,
- __DRIdrawablePrivate *driDrawPriv,
- __DRIdrawablePrivate *driReadPriv)
+dri_make_current(__DRIcontextPrivate * cPriv,
+ __DRIdrawablePrivate * driDrawPriv,
+ __DRIdrawablePrivate * driReadPriv)
{
if (cPriv) {
struct dri_context *ctx = dri_context(cPriv);
struct dri_screen *screen = dri_screen(cPriv->driScreenPriv);
struct dri_drawable *draw = dri_drawable(driDrawPriv);
struct dri_drawable *read = dri_drawable(driReadPriv);
+
GET_CURRENT_CONTEXT(oldGLCtx);
if (oldGLCtx && oldGLCtx->st != ctx->st)
@@ -191,35 +185,34 @@ dri_make_current(__DRIcontextPrivate *cPriv,
static void
st_dri_lock(struct pipe_context *pipe)
{
- dri_lock((struct dri_context *) pipe->priv);
+ dri_lock((struct dri_context *)pipe->priv);
}
static void
st_dri_unlock(struct pipe_context *pipe)
{
- dri_unlock((struct dri_context *) pipe->priv);
+ dri_unlock((struct dri_context *)pipe->priv);
}
static boolean
st_dri_is_locked(struct pipe_context *pipe)
{
- return ((struct dri_context *) pipe->priv)->isLocked;
+ return ((struct dri_context *)pipe->priv)->isLocked;
}
static boolean
st_dri_lost_lock(struct pipe_context *pipe)
{
- return ((struct dri_context *) pipe->priv)->wsLostLock;
+ return ((struct dri_context *)pipe->priv)->wsLostLock;
}
static void
st_dri_clear_lost_lock(struct pipe_context *pipe)
{
- ((struct dri_context *) pipe->priv)->wsLostLock = FALSE;
+ ((struct dri_context *)pipe->priv)->wsLostLock = FALSE;
}
-struct dri1_api_lock_funcs dri1_lf =
-{
+struct dri1_api_lock_funcs dri1_lf = {
.lock = st_dri_lock,
.unlock = st_dri_unlock,
.is_locked = st_dri_is_locked,
@@ -227,5 +220,4 @@ struct dri1_api_lock_funcs dri1_lf =
.clear_lost_lock = st_dri_clear_lost_lock
};
-
/* vim: set sw=3 ts=8 sts=3 expandtab: */