summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/dri
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-07-27 00:54:57 +1000
committerBen Skeggs <skeggsb@gmail.com>2008-07-27 00:54:57 +1000
commit9e445d3e6374c2a9b163f1262ea5a1047e596cae (patch)
tree7a63f048928947fb57342de9b53a3d0924f50d5b /src/gallium/winsys/dri
parentd1dc937c62083c3d8ab9f420df8e54f5c3217468 (diff)
parentff7a7031caa0ac592f210aca696a20c9de6dc0d4 (diff)
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/winsys/dri')
-rw-r--r--src/gallium/winsys/dri/intel/intel_screen.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gallium/winsys/dri/intel/intel_screen.c b/src/gallium/winsys/dri/intel/intel_screen.c
index f2412217f3..b3022fd17a 100644
--- a/src/gallium/winsys/dri/intel/intel_screen.c
+++ b/src/gallium/winsys/dri/intel/intel_screen.c
@@ -253,12 +253,10 @@ intel_flush_frontbuffer( struct pipe_winsys *winsys,
struct pipe_surface *surf,
void *context_private)
{
- //struct intel_context *intel = (struct intel_context *) context_private;
- //__DRIdrawablePrivate *dPriv = intel->driDrawable;
+ struct intel_context *intel = (struct intel_context *) context_private;
+ __DRIdrawablePrivate *dPriv = intel->driDrawable;
- assert((int)"Doesn't work currently" & 0);
-
- //intelDisplaySurface(dPriv, surf, NULL);
+ intelDisplaySurface(dPriv, surf, NULL);
}
static boolean