fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 11:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

simplify intelClearWithTris() for renderbuffers

Browse source
This commit is contained in:
Brian Paul 2006-03-19 17:08:00 +00:00
parent 9194782fdc
commit e43c3c38fb
1 changed files with 26 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/mesa/drivers/dri/i915/intel_buffers.c
View file

@ -278,6 +278,7 @@ static void intelClearWithTris(struct intel_context *intel,
/* XXX FBO: was: intel->driDrawable->numClipRects */
if (intel->numClipRects) {
GLuint buf;
intel->vtbl.install_meta_state(intel);
@ -289,7 +290,6 @@ static void intelClearWithTris(struct intel_context *intel,
/* Back and stencil cliprects are the same. Try and do both
* buffers at once:
* XXX FBO: This is broken for FBO depth/stencil buffers!
*/
if (mask & (BUFFER_BIT_BACK_LEFT|BUFFER_BIT_STENCIL|BUFFER_BIT_DEPTH)) {
intel->vtbl.meta_draw_region(intel,
@ -321,67 +321,36 @@ static void intelClearWithTris(struct intel_context *intel,
clear.y1, clear.y2,
intel->ctx.Depth.Clear,
intel->ClearColor,
0, 0, 0, 0);
0, 0, 0, 0); /* texcoords */
mask &= ~(BUFFER_BIT_BACK_LEFT|BUFFER_BIT_STENCIL|BUFFER_BIT_DEPTH);
}
/* Front may have different cliprects:
*/
if (mask & BUFFER_BIT_FRONT_LEFT) {
intel->vtbl.meta_no_depth_write(intel);
intel->vtbl.meta_no_stencil_write(intel);
intel->vtbl.meta_color_mask(intel, GL_TRUE );
intel->vtbl.meta_draw_region(intel,
intel->front_region,
intel->depth_region);
/* clear the remaining (color) renderbuffers */
for (buf = 0; buf < BUFFER_COUNT && mask; buf++) {
const GLuint bufBit = 1 << buf;
if (mask & bufBit) {
struct intel_renderbuffer *irbColor =
intel_renderbuffer(ctx->DrawBuffer->
Attachment[buf].Renderbuffer);
ASSERT(irbColor);
/* XXX: Using INTEL_BATCH_NO_CLIPRECTS here is dangerous as the
* drawing origin may not be correctly emitted.
*/
intel_meta_draw_quad(intel,
clear.x1, clear.x2,
clear.y1, clear.y2,
0,
intel->ClearColor,
0, 0, 0, 0);
}
intel->vtbl.meta_no_depth_write(intel);
intel->vtbl.meta_no_stencil_write(intel);
intel->vtbl.meta_color_mask(intel, GL_TRUE );
intel->vtbl.meta_draw_region(intel, irbColor->region, NULL);
/*
* User-created RGBA renderbuffers
*/
if (mask & (BUFFER_BIT_COLOR0 |
BUFFER_BIT_COLOR1 |
BUFFER_BIT_COLOR2 |
BUFFER_BIT_COLOR3)) {
struct intel_region *depth_region = NULL;
GLuint buf;
/* XXX: Using INTEL_BATCH_NO_CLIPRECTS here is dangerous as the
* drawing origin may not be correctly emitted.
*/
intel_meta_draw_quad(intel,
clear.x1, clear.x2,
clear.y1, clear.y2,
0, /* depth clear val */
intel->ClearColor,
0, 0, 0, 0); /* texcoords */
ASSERT(ctx->Const.MaxColorAttachments == 4); /* XXX FBO fix */
for (buf = BUFFER_COLOR0; buf <= BUFFER_COLOR3; buf++) {
const GLbitfield bufBit = 1 << buf;
if (mask & bufBit) {
struct intel_renderbuffer *irb =
intel_renderbuffer(ctx->DrawBuffer->
Attachment[buf].Renderbuffer);
ASSERT(irb);
ASSERT(irb->region);
/* XXX move these three calls outside loop? */
intel->vtbl.meta_no_depth_write(intel);
intel->vtbl.meta_no_stencil_write(intel);
intel->vtbl.meta_color_mask(intel, GL_TRUE );
intel->vtbl.meta_draw_region(intel, irb->region, depth_region);
/* XXX: Using INTEL_BATCH_NO_CLIPRECTS here is dangerous as the
* drawing origin may not be correctly emitted.
*/
intel_meta_draw_quad(intel,
clear.x1, clear.x2,
clear.y1, clear.y2,
0,
intel->ClearColor,
0, 0, 0, 0);
}
mask &= ~bufBit;
}
}
@ -393,7 +362,6 @@ static void intelClearWithTris(struct intel_context *intel,
/**
* Called by ctx->Driver.Clear.
*/
@ -461,10 +429,6 @@ static void intelClear(GLcontext *ctx,
/* Flip the front & back buffers
*/
static void intelPageFlip( const __DRIdrawablePrivate *dPriv )