summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i915pipe/intel_buffers.c120
-rw-r--r--src/mesa/drivers/dri/i915pipe/intel_context.c7
-rw-r--r--src/mesa/main/buffers.c8
-rw-r--r--src/mesa/pipe/softpipe/sp_clear.c70
-rw-r--r--src/mesa/sources1
-rw-r--r--src/mesa/state_tracker/st_cb_clear.c89
-rw-r--r--src/mesa/state_tracker/st_context.c1
-rw-r--r--src/mesa/state_tracker/st_draw.c11
8 files changed, 125 insertions, 182 deletions
diff --git a/src/mesa/drivers/dri/i915pipe/intel_buffers.c b/src/mesa/drivers/dri/i915pipe/intel_buffers.c
index e39220fe47..5e68a869bf 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_buffers.c
@@ -295,110 +295,14 @@ intelWindowMoved(struct intel_context *intel)
-/**
- * Called by ctx->Driver.Clear.
- * XXX NO LONGER USED - REMOVE IN NEAR FUTURE
- */
-#if 0
-static void
-intelClear(GLcontext *ctx, GLbitfield mask)
-#else
-static void
-OLD_intelClear(struct pipe_context *pipe,
- GLboolean color, GLboolean depth,
- GLboolean stencil, GLboolean accum)
-#endif
-{
- GLcontext *ctx = (GLcontext *) pipe->glctx;
- const GLuint colorMask = *((GLuint *) & ctx->Color.ColorMask);
- GLbitfield tri_mask = 0;
- GLbitfield blit_mask = 0;
- GLbitfield swrast_mask = 0;
- struct gl_framebuffer *fb = ctx->DrawBuffer;
- GLuint i;
-
- GLbitfield mask;
-
- if (color)
- mask = ctx->DrawBuffer->_ColorDrawBufferMask[0]; /*XXX temporary*/
- else
- mask = 0x0;
-
- if (0)
- fprintf(stderr, "%s\n", __FUNCTION__);
-
- /* HW color buffers (front, back, aux, generic FBO, etc) */
- if (colorMask == ~0) {
- /* clear all R,G,B,A */
- /* XXX FBO: need to check if colorbuffers are software RBOs! */
- blit_mask |= (mask & BUFFER_BITS_COLOR);
- }
- else {
- /* glColorMask in effect */
- tri_mask |= (mask & BUFFER_BITS_COLOR);
- }
-
- /* HW stencil */
- if (stencil) {
- const struct pipe_region *stencilRegion
- = intel_get_rb_region(fb, BUFFER_STENCIL);
- if (stencilRegion) {
- /* have hw stencil */
- if ((ctx->Stencil.WriteMask[0] & 0xff) != 0xff) {
- /* not clearing all stencil bits, so use triangle clearing */
- tri_mask |= BUFFER_BIT_STENCIL;
- }
- else {
- /* clearing all stencil bits, use blitting */
- blit_mask |= BUFFER_BIT_STENCIL;
- }
- }
- }
-
- /* HW depth */
- if (depth) {
- /* clear depth with whatever method is used for stencil (see above) */
- if (tri_mask & BUFFER_BIT_STENCIL)
- tri_mask |= BUFFER_BIT_DEPTH;
- else
- blit_mask |= BUFFER_BIT_DEPTH;
- }
-
- /* SW fallback clearing */
- swrast_mask = mask & ~tri_mask & ~blit_mask;
-
- for (i = 0; i < BUFFER_COUNT; i++) {
- GLuint bufBit = 1 << i;
- if ((blit_mask | tri_mask) & bufBit) {
- if (!fb->Attachment[i].Renderbuffer->ClassID) {
- blit_mask &= ~bufBit;
- tri_mask &= ~bufBit;
- swrast_mask |= bufBit;
- }
- }
- }
-
-
- intelFlush(ctx); /* XXX intelClearWithBlit also does this */
-
- if (blit_mask)
- intelClearWithBlit(ctx, blit_mask);
-
-#if 0
- if (swrast_mask | tri_mask)
- _swrast_Clear(ctx, swrast_mask | tri_mask);
-#else
- softpipe_clear(pipe, GL_FALSE,
- (swrast_mask | tri_mask) & BUFFER_BIT_DEPTH,
- (swrast_mask | tri_mask) & BUFFER_BIT_STENCIL,
- (swrast_mask | tri_mask) & BUFFER_BIT_ACCUM);
-#endif
-}
-
-/**
- * Clear buffers. Called via pipe->clear().
- */
+/* XXX - kludge required because softpipe_clear uses
+ * region->fill(), which still calls intelBlit(!), but doesn't
+ * flush the batchbuffer.
+ *
+ * One way or another, that behaviour should stop, and then this
+ * function can go aawy.
+ */
void
intelClear(struct pipe_context *pipe,
GLboolean color, GLboolean depth,
@@ -407,19 +311,9 @@ intelClear(struct pipe_context *pipe,
GLcontext *ctx = (GLcontext *) pipe->glctx;
struct intel_context *intel = intel_context(ctx);
- /* XXX
- * Examine stencil and color writemasks to determine if we can clear
- * with blits.
- */
-
- intelFlush(&intel->ctx);
- LOCK_HARDWARE(intel);
-
softpipe_clear(pipe, color, depth, stencil, accum);
intel_batchbuffer_flush(intel->batch);
-
- UNLOCK_HARDWARE(intel);
}
diff --git a/src/mesa/drivers/dri/i915pipe/intel_context.c b/src/mesa/drivers/dri/i915pipe/intel_context.c
index be8235d7d1..0fc24c3b5a 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_context.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_context.c
@@ -417,7 +417,12 @@ intelCreateContext(const __GLcontextModes * mesaVis,
*/
st_create_context( &intel->ctx,
softpipe_create() );
-
+
+ /* KW: Not sure I like this - we should only be talking to the
+ * state_tracker. The pipe code will need some way of talking to
+ * us, eg for batchbuffer ioctls, and there will need to be a
+ * buffer manager interface. So, this is a temporary hack, right?
+ */
intel->pipe = intel->ctx.st->pipe;
intel->pipe->screen = intelScreen;
intel->pipe->glctx = ctx;
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index bb019b5998..eea443c03c 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -178,15 +178,7 @@ _mesa_Clear( GLbitfield mask )
}
ASSERT(ctx->Driver.Clear);
-#if 0
ctx->Driver.Clear(ctx, bufferMask);
-#else
- st_clear(ctx->st,
- (mask & GL_COLOR_BUFFER_BIT) ? GL_TRUE : GL_FALSE,
- (bufferMask & BUFFER_BIT_DEPTH) ? GL_TRUE : GL_FALSE,
- (bufferMask & BUFFER_BIT_STENCIL) ? GL_TRUE : GL_FALSE,
- (bufferMask & BUFFER_BIT_ACCUM) ? GL_TRUE : GL_FALSE);
-#endif
}
}
diff --git a/src/mesa/pipe/softpipe/sp_clear.c b/src/mesa/pipe/softpipe/sp_clear.c
index a133b48891..09cc643003 100644
--- a/src/mesa/pipe/softpipe/sp_clear.c
+++ b/src/mesa/pipe/softpipe/sp_clear.c
@@ -60,53 +60,20 @@ color_value(GLuint format, const GLfloat color[4])
}
}
-static GLuint
-color_mask(GLuint format, GLuint pipeMask)
-{
- GLuint mask = 0x0;
- switch (format) {
- case PIPE_FORMAT_U_R8_G8_B8_A8:
- if (pipeMask & PIPE_MASK_R) mask |= 0xff000000;
- if (pipeMask & PIPE_MASK_G) mask |= 0x00ff0000;
- if (pipeMask & PIPE_MASK_B) mask |= 0x0000ff00;
- if (pipeMask & PIPE_MASK_A) mask |= 0x000000ff;
- break;
- case PIPE_FORMAT_U_A8_R8_G8_B8:
- if (pipeMask & PIPE_MASK_R) mask |= 0x00ff0000;
- if (pipeMask & PIPE_MASK_G) mask |= 0x0000ff00;
- if (pipeMask & PIPE_MASK_B) mask |= 0x000000ff;
- if (pipeMask & PIPE_MASK_A) mask |= 0xff000000;
- break;
- case PIPE_FORMAT_U_R5_G6_B5:
- if (pipeMask & PIPE_MASK_R) mask |= 0xf800;
- if (pipeMask & PIPE_MASK_G) mask |= 0x07e0;
- if (pipeMask & PIPE_MASK_B) mask |= 0x001f;
- if (pipeMask & PIPE_MASK_A) mask |= 0;
- break;
- default:
- return 0;
- }
- return mask;
-}
-
-/**
- * XXX This should probaby be renamed to something like pipe_clear_with_blits()
- * and moved into a device-independent pipe file.
- */
void
softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
GLboolean stencil, GLboolean accum)
{
- const struct softpipe_context *softpipe = softpipe_context(pipe);
+ struct softpipe_context *softpipe = softpipe_context(pipe);
GLint x, y, w, h;
- softpipe_update_derived(softpipe);
+ softpipe_update_derived(softpipe); /* not needed?? */
- x = softpipe->cliprect.minx;
- y = softpipe->cliprect.miny;
- w = softpipe->cliprect.maxx - x;
- h = softpipe->cliprect.maxy - y;
+ x = 0;
+ y = 0;
+ w = softpipe->framebuffer.cbufs[0]->width;
+ h = softpipe->framebuffer.cbufs[0]->height;
if (color) {
GLuint i;
@@ -114,8 +81,7 @@ softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
struct pipe_surface *ps = softpipe->framebuffer.cbufs[i];
GLuint clearVal = color_value(ps->format,
softpipe->clear_color.color);
- GLuint mask = color_mask(ps->format, softpipe->blend.colormask);
- pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, mask);
+ pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, ~0);
}
}
@@ -124,10 +90,13 @@ softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
/* clear Z and stencil together */
struct pipe_surface *ps = softpipe->framebuffer.zbuf;
if (ps->format == PIPE_FORMAT_S8_Z24) {
- GLuint mask = (softpipe->stencil.write_mask[0] << 8) | 0xffffff;
+ GLuint mask = (softpipe->stencil.write_mask[0] << 8) | 0xffffff;
GLuint clearVal = (GLuint) (softpipe->depth_test.clear * 0xffffff);
+
+ assert (mask == ~0);
+
clearVal |= (softpipe->stencil.clear_value << 24);
- pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, mask);
+ pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, ~0);
}
else {
/* XXX Z24_S8 format? */
@@ -138,33 +107,36 @@ softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
/* separate Z and stencil */
if (depth) {
struct pipe_surface *ps = softpipe->framebuffer.zbuf;
- GLuint mask, clearVal;
+ GLuint clearVal;
switch (ps->format) {
case PIPE_FORMAT_U_Z16:
clearVal = (GLuint) (softpipe->depth_test.clear * 65535.0);
- mask = 0xffff;
break;
case PIPE_FORMAT_U_Z32:
clearVal = (GLuint) (softpipe->depth_test.clear * 0xffffffff);
- mask = 0xffffffff;
break;
case PIPE_FORMAT_S8_Z24:
clearVal = (GLuint) (softpipe->depth_test.clear * 0xffffff);
- mask = 0xffffff;
break;
default:
assert(0);
}
- pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, mask);
+ pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, ~0);
}
if (stencil) {
struct pipe_surface *ps = softpipe->framebuffer.sbuf;
GLuint clearVal = softpipe->stencil.clear_value;
+
+ /* If this is not ~0, we shouldn't get here - clear should be
+ * done with geometry instead.
+ */
GLuint mask = softpipe->stencil.write_mask[0];
+ assert((mask & 0xff) == 0xff);
+
switch (ps->format) {
case PIPE_FORMAT_S8_Z24:
clearVal = clearVal << 24;
@@ -187,7 +159,7 @@ softpipe_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
*/
struct pipe_surface *ps = softpipe->framebuffer.abuf;
GLuint clearVal = 0x0; /* XXX FIX */
- GLuint mask = !0;
+ GLuint mask = ~0;
assert(ps);
pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearVal, mask);
}
diff --git a/src/mesa/sources b/src/mesa/sources
index d9ee7266e5..d0fe3a979f 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -191,6 +191,7 @@ STATETRACKER_SOURCES = \
state_tracker/st_atom_stencil.c \
state_tracker/st_atom_stipple.c \
state_tracker/st_atom_viewport.c \
+ state_tracker/st_cb_clear.c \
state_tracker/st_cb_program.c \
state_tracker/st_draw.c \
state_tracker/st_context.c \
diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
new file mode 100644
index 0000000000..d9cb83b8ad
--- /dev/null
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -0,0 +1,89 @@
+/**************************************************************************
+ *
+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+ /*
+ * Authors:
+ * Keith Whitwell <keith@tungstengraphics.com>
+ * Brian Paul
+ */
+
+#include "st_context.h"
+#include "glheader.h"
+#include "macros.h"
+#include "enums.h"
+#include "st_context.h"
+#include "st_atom.h"
+#include "pipe/p_context.h"
+
+
+
+/* XXX: doesn't pick up the differences between front/back/left/right
+ * clears. Need to sort that out...
+ */
+static void st_clear(GLcontext *ctx, GLbitfield mask)
+{
+ struct st_context *st = ctx->st;
+ GLboolean color = (mask & BUFFER_BITS_COLOR) ? GL_TRUE : GL_FALSE;
+ GLboolean depth = (mask & BUFFER_BIT_DEPTH) ? GL_TRUE : GL_FALSE;
+ GLboolean stencil = (mask & BUFFER_BIT_STENCIL) ? GL_TRUE : GL_FALSE;
+ GLboolean accum = (mask & BUFFER_BIT_ACCUM) ? GL_TRUE : GL_FALSE;
+ GLboolean fullscreen = 1; /* :-) */
+
+ /* This makes sure the softpipe has the latest scissor, etc values */
+ st_validate_state( st );
+
+ if (fullscreen) {
+ /* pipe->clear() should clear a particular surface, so that we
+ * can iterate over render buffers at this level and clear the
+ * ones GL is asking for.
+ *
+ * Will probably need something like pipe->clear_z_stencil() to
+ * cope with the special case of paired and unpaired z/stencil
+ * buffers, though could perhaps deal with them explicitly at
+ * this level.
+ */
+ st->pipe->clear(st->pipe, color, depth, stencil, accum);
+ }
+ else {
+ /* Convert to geometry, etc:
+ */
+ }
+}
+
+
+void st_init_cb_clear( struct st_context *st )
+{
+ struct dd_function_table *functions = &st->ctx->Driver;
+
+ functions->Clear = st_clear;
+}
+
+
+void st_destroy_cb_clear( struct st_context *st )
+{
+}
+
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 6308e81a61..4d3f0ec4d3 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -58,6 +58,7 @@ struct st_context *st_create_context( GLcontext *ctx,
st_init_atoms( st );
st_init_draw( st );
st_init_cb_program( st );
+ st_init_cb_clear( st );
return st;
}
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index a424d1dd05..95fa43df4d 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -107,14 +107,3 @@ void st_destroy_draw( struct st_context *st )
}
-/** XXX temporary here */
-void
-st_clear(struct st_context *st, GLboolean color, GLboolean depth,
- GLboolean stencil, GLboolean accum)
-{
- /* This makes sure the softpipe has the latest scissor, etc values */
- st_validate_state( st );
-
- st->pipe->clear(st->pipe, color, depth, stencil, accum);
-}
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-04 06:02:07 +0000