return GL_TRUE;
}
-<<<<<<< HEAD:src/mesa/drivers/dri/intel_winsys/intel_buffers.c
-/**
- * Return pointer to current color drawing region, or NULL.
- */
-#if 0
-struct pipe_region *
-intel_drawbuf_region(struct intel_context *intel)
-{
- struct intel_renderbuffer *irbColor =
- intel_renderbuffer(intel->ctx.DrawBuffer->_ColorDrawBuffers[0][0]);
- if (irbColor)
- return irbColor->Base.surface->region;
- else
- return NULL;
-}
-=======
->>>>>>> remove dead code, remove intel_fbo.h includes:src/mesa/drivers/dri/intel_winsys/intel_buffers.c
-
-<<<<<<< HEAD:src/mesa/drivers/dri/intel_winsys/intel_buffers.c
-/**
- * Return pointer to current color reading region, or NULL.
- */
-struct pipe_region *
-intel_readbuf_region(struct intel_context *intel)
-{
- struct intel_renderbuffer *irb
- = intel_renderbuffer(intel->ctx.ReadBuffer->_ColorReadBuffer);
- if (irb)
- return irb->Base.surface->region;
- else
- return NULL;
-}
-#endif
-=======
->>>>>>> remove dead code, remove intel_fbo.h includes:src/mesa/drivers/dri/intel_winsys/intel_buffers.c
/**
* This will be called whenever the currently bound window is moved/resized.
pf_active = pf_pipes && (pf_pipes & intel->sarea->pf_active) == pf_pipes;
- if (INTEL_DEBUG & DEBUG_LOCK)
- if (pf_active != intel_fb->pf_active)
- _mesa_printf("%s - Page flipping %sactive\n", __progname,
- pf_active ? "" : "in");
+ if (pf_active != intel_fb->pf_active)
+ DBG(LOCK, "%s - Page flipping %sactive\n",
+ __progname, pf_active ? "" : "in");
if (pf_active) {
/* Sync pages between pipes if we're flipping on both at the same time */
int ret;
struct intel_framebuffer *intel_fb = dPriv->driverPrivate;
- if (INTEL_DEBUG & DEBUG_IOCTL)
- fprintf(stderr, "%s\n", __FUNCTION__);
+ DBG(SWAP, "%s\n", __FUNCTION__);
assert(dPriv);
assert(dPriv->driContextPriv);
intel_draw_buffer(&intel->ctx, &intel_fb->Base);
#endif
- if (INTEL_DEBUG & DEBUG_IOCTL)
- fprintf(stderr, "%s: success\n", __FUNCTION__);
+ DBG(SWAP, "%s: success\n", __FUNCTION__);
return GL_TRUE;
}