#include "shader/prog_instruction.h"
#include "st_atom.h"
#include "st_context.h"
+#include "st_cb_accum.h"
#include "st_cb_clear.h"
#include "st_cb_fbo.h"
+#include "st_draw.h"
#include "st_program.h"
#include "st_public.h"
+#include "st_mesa_to_tgsi.h"
+
#include "pipe/p_context.h"
+#include "pipe/p_state.h"
#include "pipe/p_defines.h"
-#include "pipe/tgsi/mesa/mesa_to_tgsi.h"
-#include "vf/vf.h"
+#include "pipe/p_winsys.h"
+
+#include "cso_cache/cso_context.h"
+/* XXX for testing draw module vertex passthrough: */
+#define TEST_DRAW_PASSTHROUGH 0
static GLuint
-color_value(GLuint pipeFormat, const GLfloat color[4])
+color_value(enum pipe_format pipeFormat, const GLfloat color[4])
{
GLubyte r, g, b, a;
UNCLAMPED_FLOAT_TO_UBYTE(a, color[3]);
switch (pipeFormat) {
- case PIPE_FORMAT_U_R8_G8_B8_A8:
+ case PIPE_FORMAT_R8G8B8A8_UNORM:
return (r << 24) | (g << 16) | (b << 8) | a;
- case PIPE_FORMAT_U_A8_R8_G8_B8:
+ case PIPE_FORMAT_A8R8G8B8_UNORM:
return (a << 24) | (r << 16) | (g << 8) | b;
- case PIPE_FORMAT_U_R5_G6_B5:
+ case PIPE_FORMAT_B8G8R8A8_UNORM:
+ return (b << 24) | (g << 16) | (r << 8) | a;
+ case PIPE_FORMAT_R5G6B5_UNORM:
return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | (b >> 3);
default:
+ assert(0);
return 0;
}
}
-static GLuint
-depth_value(GLuint pipeFormat, GLfloat value)
+static uint
+depth_value(enum pipe_format pipeFormat, GLfloat value)
{
- GLuint val;
switch (pipeFormat) {
- case PIPE_FORMAT_U_Z16:
- val = (GLuint) (value * 0xffffff);
- break;
- case PIPE_FORMAT_U_Z32:
- val = (GLuint) (value * 0xffffffff);
- break;
- case PIPE_FORMAT_S8_Z24:
- /*case PIPE_FORMAT_Z24_S8:*/
- val = (GLuint) (value * 0xffffff);
- break;
+ case PIPE_FORMAT_Z16_UNORM:
+ return (uint) (value * 0xffff);
+ case PIPE_FORMAT_Z32_UNORM:
+ /* special-case to avoid overflow */
+ if (value == 1.0)
+ return 0xffffffff;
+ else
+ return (uint) (value * 0xffffffff);
+ case PIPE_FORMAT_S8Z24_UNORM:
+ return (uint) (value * 0xffffff);
+ case PIPE_FORMAT_Z24S8_UNORM:
+ return ((uint) (value * 0xffffff)) << 8;
default:
assert(0);
+ return 0;
}
- return val;
}
static GLboolean
-is_depth_stencil_format(GLuint pipeFormat)
+is_depth_stencil_format(enum pipe_format pipeFormat)
{
switch (pipeFormat) {
- case PIPE_FORMAT_S8_Z24:
- /*case PIPE_FORMAT_Z24_S8:*/
+ case PIPE_FORMAT_S8Z24_UNORM:
+ case PIPE_FORMAT_Z24S8_UNORM:
return GL_TRUE;
default:
return GL_FALSE;
* Create a simple fragment shader that just passes through the fragment color.
*/
static struct st_fragment_program *
-make_color_shader(struct st_context *st)
+make_frag_shader(struct st_context *st)
{
GLcontext *ctx = st->ctx;
struct st_fragment_program *stfp;
struct gl_program *p;
- GLboolean b;
+ GLuint interpMode[16];
+ GLuint i;
+
+ /* XXX temporary */
+ for (i = 0; i < 16; i++)
+ interpMode[i] = TGSI_INTERPOLATE_LINEAR;
p = ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
if (!p)
return NULL;
}
_mesa_init_instructions(p->Instructions, 2);
+ /* MOV result.color, fragment.color; */
p->Instructions[0].Opcode = OPCODE_MOV;
p->Instructions[0].DstReg.File = PROGRAM_OUTPUT;
- p->Instructions[0].DstReg.Index = 0;
+ p->Instructions[0].DstReg.Index = FRAG_RESULT_COLR;
p->Instructions[0].SrcReg[0].File = PROGRAM_INPUT;
p->Instructions[0].SrcReg[0].Index = FRAG_ATTRIB_COL0;
+ /* END; */
p->Instructions[1].Opcode = OPCODE_END;
p->InputsRead = FRAG_BIT_COL0;
p->OutputsWritten = (1 << FRAG_RESULT_COLR);
stfp = (struct st_fragment_program *) p;
- /* compile into tgsi format */
- b = tgsi_mesa_compile_fp_program(&stfp->Base,
- stfp->tokens, ST_FP_MAX_TOKENS);
- assert(b);
+ st_translate_fragment_program(st, stfp, NULL);
return stfp;
}
+/**
+ * Create a simple vertex shader that just passes through the
+ * vertex position and color.
+ */
+static struct st_vertex_program *
+make_vertex_shader(struct st_context *st)
+{
+ GLcontext *ctx = st->ctx;
+ struct st_vertex_program *stvp;
+ struct gl_program *p;
+
+ p = ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0);
+ if (!p)
+ return NULL;
+
+ p->NumInstructions = 3;
+ p->Instructions = _mesa_alloc_instructions(3);
+ if (!p->Instructions) {
+ ctx->Driver.DeleteProgram(ctx, p);
+ return NULL;
+ }
+ _mesa_init_instructions(p->Instructions, 3);
+ /* MOV result.pos, vertex.pos; */
+ p->Instructions[0].Opcode = OPCODE_MOV;
+ p->Instructions[0].DstReg.File = PROGRAM_OUTPUT;
+ p->Instructions[0].DstReg.Index = VERT_RESULT_HPOS;
+ p->Instructions[0].SrcReg[0].File = PROGRAM_INPUT;
+ p->Instructions[0].SrcReg[0].Index = VERT_ATTRIB_POS;
+ /* MOV result.color, vertex.color; */
+ p->Instructions[1].Opcode = OPCODE_MOV;
+ p->Instructions[1].DstReg.File = PROGRAM_OUTPUT;
+ p->Instructions[1].DstReg.Index = VERT_RESULT_COL0;
+ p->Instructions[1].SrcReg[0].File = PROGRAM_INPUT;
+ p->Instructions[1].SrcReg[0].Index = VERT_ATTRIB_COLOR0;
+ /* END; */
+ p->Instructions[2].Opcode = OPCODE_END;
+
+ p->InputsRead = VERT_BIT_POS | VERT_BIT_COLOR0;
+ p->OutputsWritten = ((1 << VERT_RESULT_COL0) |
+ (1 << VERT_RESULT_HPOS));
+
+ stvp = (struct st_vertex_program *) p;
+ st_translate_vertex_program(st, stvp, NULL);
+#if 0
+ assert(stvp->cso);
+#endif
+
+ return stvp;
+}
+
+
+
/**
* Draw a screen-aligned quadrilateral.
- * Coords are window coords.
+ * Coords are window coords with y=0=bottom. These coords will be transformed
+ * by the vertex shader and viewport transform (which will flip Y if needed).
*/
static void
draw_quad(GLcontext *ctx,
float x0, float y0, float x1, float y1, GLfloat z,
const GLfloat color[4])
{
- static const GLuint attribs[2] = {
- VF_ATTRIB_POS,
- VF_ATTRIB_COLOR0
- };
GLfloat verts[4][2][4]; /* four verts, two attribs, XYZW */
GLuint i;
+#if TEST_DRAW_PASSTHROUGH
+ /* invert Y coords (may be off by one pixel) */
+ y0 = ctx->DrawBuffer->Height - y0;
+ y1 = ctx->DrawBuffer->Height - y1;
+#endif
+
/* positions */
verts[0][0][0] = x0;
verts[0][0][1] = y0;
verts[i][1][3] = color[3];
}
- ctx->st->pipe->draw_vertices(ctx->st->pipe, GL_QUADS,
- 4, (GLfloat *) verts, 2, attribs);
+ st_draw_vertices(ctx, PIPE_PRIM_QUADS, 4, (float *) verts, 2, GL_FALSE);
}
/**
* Do glClear by drawing a quadrilateral.
+ * The vertices of the quad will be computed from the
+ * ctx->DrawBuffer->_X/Ymin/max fields.
*/
static void
-clear_with_quad(GLcontext *ctx, GLuint x0, GLuint y0,
- GLuint x1, GLuint y1,
+clear_with_quad(GLcontext *ctx,
GLboolean color, GLboolean depth, GLboolean stencil)
{
- static struct st_fragment_program *stfp = NULL;
struct st_context *st = ctx->st;
- struct pipe_alpha_test_state alpha_test;
- struct pipe_blend_state blend;
- struct pipe_depth_state depth_test;
- struct pipe_stencil_state stencil_test;
- struct pipe_setup_state setup;
- struct pipe_fs_state fs;
+ struct pipe_context *pipe = st->pipe;
+ const GLfloat x0 = ctx->DrawBuffer->_Xmin;
+ const GLfloat y0 = ctx->DrawBuffer->_Ymin;
+ const GLfloat x1 = ctx->DrawBuffer->_Xmax;
+ const GLfloat y1 = ctx->DrawBuffer->_Ymax;
- /* alpha state: disabled */
- memset(&alpha_test, 0, sizeof(alpha_test));
- st->pipe->set_alpha_test_state(st->pipe, &alpha_test);
+ /*
+ printf("%s %s%s%s %f,%f %f,%f\n", __FUNCTION__,
+ color ? "color, " : "",
+ depth ? "depth, " : "",
+ stencil ? "stencil" : "",
+ x0, y0,
+ x1, y1);
+ */
/* blend state: RGBA masking */
- memset(&blend, 0, sizeof(blend));
- if (color) {
- if (ctx->Color.ColorMask[0])
- blend.colormask |= PIPE_MASK_R;
- if (ctx->Color.ColorMask[1])
- blend.colormask |= PIPE_MASK_G;
- if (ctx->Color.ColorMask[2])
- blend.colormask |= PIPE_MASK_B;
- if (ctx->Color.ColorMask[3])
- blend.colormask |= PIPE_MASK_A;
- if (st->ctx->Color.DitherFlag)
- blend.dither = 1;
+ {
+ struct pipe_blend_state blend;
+ memset(&blend, 0, sizeof(blend));
+ if (color) {
+ if (ctx->Color.ColorMask[0])
+ blend.colormask |= PIPE_MASK_R;
+ if (ctx->Color.ColorMask[1])
+ blend.colormask |= PIPE_MASK_G;
+ if (ctx->Color.ColorMask[2])
+ blend.colormask |= PIPE_MASK_B;
+ if (ctx->Color.ColorMask[3])
+ blend.colormask |= PIPE_MASK_A;
+ if (st->ctx->Color.DitherFlag)
+ blend.dither = 1;
+ }
+ cso_set_blend(st->cso_context, &blend);
}
- st->pipe->set_blend_state(st->pipe, &blend);
-
- /* depth state: always pass */
- memset(&depth_test, 0, sizeof(depth_test));
- if (depth) {
- depth_test.enabled = 1;
- depth_test.writemask = 1;
- depth_test.func = PIPE_FUNC_ALWAYS;
+
+ /* depth_stencil state: always pass/set to ref value */
+ {
+ struct pipe_depth_stencil_alpha_state depth_stencil;
+ memset(&depth_stencil, 0, sizeof(depth_stencil));
+ if (depth) {
+ depth_stencil.depth.enabled = 1;
+ depth_stencil.depth.writemask = 1;
+ depth_stencil.depth.func = PIPE_FUNC_ALWAYS;
+ }
+
+ if (stencil) {
+ depth_stencil.stencil[0].enabled = 1;
+ depth_stencil.stencil[0].func = PIPE_FUNC_ALWAYS;
+ depth_stencil.stencil[0].fail_op = PIPE_STENCIL_OP_REPLACE;
+ depth_stencil.stencil[0].zpass_op = PIPE_STENCIL_OP_REPLACE;
+ depth_stencil.stencil[0].zfail_op = PIPE_STENCIL_OP_REPLACE;
+ depth_stencil.stencil[0].ref_value = ctx->Stencil.Clear;
+ depth_stencil.stencil[0].value_mask = 0xff;
+ depth_stencil.stencil[0].write_mask = ctx->Stencil.WriteMask[0] & 0xff;
+ }
+
+ cso_set_depth_stencil_alpha(st->cso_context, &depth_stencil);
}
- st->pipe->set_depth_state(st->pipe, &depth_test);
- /* setup state: nothing */
- memset(&setup, 0, sizeof(setup));
- if (ctx->Scissor.Enabled)
- setup.scissor = 1;
- st->pipe->set_setup_state(st->pipe, &setup);
-
- /* stencil state: always set to ref value */
- memset(&stencil_test, 0, sizeof(stencil_test));
- if (stencil) {
- stencil_test.front_enabled = 1;
- stencil_test.front_func = PIPE_FUNC_ALWAYS;
- stencil_test.front_fail_op = PIPE_STENCIL_OP_REPLACE;
- stencil_test.front_zpass_op = PIPE_STENCIL_OP_REPLACE;
- stencil_test.front_zfail_op = PIPE_STENCIL_OP_REPLACE;
- stencil_test.ref_value[0] = ctx->Stencil.Clear;
- stencil_test.value_mask[0] = 0xff;
- stencil_test.write_mask[0] = ctx->Stencil.WriteMask[0] & 0xff;
+ /* rasterizer state: nothing */
+ {
+ struct pipe_rasterizer_state raster;
+ memset(&raster, 0, sizeof(raster));
+#if 0
+ /* don't do per-pixel scissor; we'll just draw a PIPE_PRIM_QUAD
+ * that matches the scissor bounds.
+ */
+ if (ctx->Scissor.Enabled)
+ raster.scissor = 1;
+#endif
+#if TEST_DRAW_PASSTHROUGH
+ raster.bypass_clipping = 1;
+ raster.bypass_vs = 1;
+#endif
+ cso_set_rasterizer(st->cso_context, &raster);
}
- st->pipe->set_stencil_state(st->pipe, &stencil_test);
/* fragment shader state: color pass-through program */
- if (!stfp) {
- stfp = make_color_shader(st);
+ {
+ static struct st_fragment_program *stfp = NULL;
+ if (!stfp) {
+ stfp = make_frag_shader(st);
+ }
+ pipe->bind_fs_state(pipe, stfp->driver_shader);
}
- memset(&fs, 0, sizeof(fs));
- fs.inputs_read = stfp->Base.Base.InputsRead;
- fs.tokens = &stfp->tokens[0];
- fs.constants = NULL;
- st->pipe->set_fs_state(st->pipe, &fs);
+
+#if !TEST_DRAW_PASSTHROUGH
+ /* vertex shader state: color/position pass-through */
+ {
+ static struct st_vertex_program *stvp = NULL;
+ if (!stvp) {
+ stvp = make_vertex_shader(st);
+ }
+ pipe->bind_vs_state(pipe, stvp->driver_shader);
+ }
+#endif
+
+#if !TEST_DRAW_PASSTHROUGH
+ /* viewport state: viewport matching window dims */
+ {
+ const float width = ctx->DrawBuffer->Width;
+ const float height = ctx->DrawBuffer->Height;
+ struct pipe_viewport_state vp;
+ vp.scale[0] = 0.5 * width;
+ vp.scale[1] = -0.5 * height;
+ vp.scale[2] = 1.0;
+ vp.scale[3] = 1.0;
+ vp.translate[0] = 0.5 * width;
+ vp.translate[1] = 0.5 * height;
+ vp.translate[2] = 0.0;
+ vp.translate[3] = 0.0;
+ pipe->set_viewport_state(pipe, &vp);
+ }
+#endif
/* draw quad matching scissor rect (XXX verify coord round-off) */
draw_quad(ctx, x0, y0, x1, y1, ctx->Depth.Clear, ctx->Color.ClearColor);
- /* Restore pipe state */
- st->pipe->set_alpha_test_state(st->pipe, &st->state.alpha_test);
- st->pipe->set_blend_state(st->pipe, &st->state.blend);
- st->pipe->set_depth_state(st->pipe, &st->state.depth);
- st->pipe->set_fs_state(st->pipe, &st->state.fs);
- st->pipe->set_setup_state(st->pipe, &st->state.setup);
- st->pipe->set_stencil_state(st->pipe, &st->state.stencil);
- /* OR:
+#if 0
+ /* Can't depend on old state objects still existing -- may have
+ * been deleted to make room in the hash, etc. (Should get
+ * fixed...)
+ */
st_invalidate_state(ctx, _NEW_COLOR | _NEW_DEPTH | _NEW_STENCIL);
- */
+#else
+ /* Restore pipe state */
+ cso_set_rasterizer(st->cso_context, &st->state.rasterizer);
+ pipe->bind_fs_state(pipe, st->fp->driver_shader);
+ pipe->bind_vs_state(pipe, st->vp->driver_shader);
+#endif
+ pipe->set_viewport_state(pipe, &st->state.viewport);
}
-static void
-clear_color_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
+/**
+ * Determine if we need to clear the depth buffer by drawing a quad.
+ */
+static INLINE GLboolean
+check_clear_color_with_quad(GLcontext *ctx, struct gl_renderbuffer *rb)
{
- struct st_renderbuffer *strb = st_renderbuffer(rb);
+ const struct st_renderbuffer *strb = st_renderbuffer(rb);
- if (ctx->Color.ColorMask[0] &&
- ctx->Color.ColorMask[1] &&
- ctx->Color.ColorMask[2] &&
- ctx->Color.ColorMask[3] &&
- !ctx->Scissor.Enabled)
- {
- /* clear whole buffer w/out masking */
- GLuint clearValue
- = color_value(strb->surface->format, ctx->Color.ClearColor);
- ctx->st->pipe->clear(ctx->st->pipe, strb->surface, clearValue);
- }
- else {
- /* masking or scissoring */
- clear_with_quad(ctx,
- ctx->DrawBuffer->_Xmin,
- ctx->DrawBuffer->_Xmin,
- ctx->DrawBuffer->_Xmax,
- ctx->DrawBuffer->_Ymax,
- GL_TRUE, GL_FALSE, GL_FALSE);
- }
+ if (strb->surface->status == PIPE_SURFACE_STATUS_UNDEFINED)
+ return FALSE;
+
+ if (ctx->Scissor.Enabled)
+ return TRUE;
+
+ if (!ctx->Color.ColorMask[0] ||
+ !ctx->Color.ColorMask[1] ||
+ !ctx->Color.ColorMask[2] ||
+ !ctx->Color.ColorMask[3])
+ return TRUE;
+
+ return FALSE;
+}
+
+
+static INLINE GLboolean
+check_clear_depth_stencil_with_quad(GLcontext *ctx, struct gl_renderbuffer *rb)
+{
+ const struct st_renderbuffer *strb = st_renderbuffer(rb);
+ const GLuint stencilMax = (1 << rb->StencilBits) - 1;
+ GLboolean maskStencil
+ = (ctx->Stencil.WriteMask[0] & stencilMax) != stencilMax;
+
+ if (strb->surface->status == PIPE_SURFACE_STATUS_UNDEFINED)
+ return FALSE;
+
+ if (ctx->Scissor.Enabled)
+ return TRUE;
+
+ if (maskStencil)
+ return TRUE;
+
+ return FALSE;
+}
+
+
+/**
+ * Determine if we need to clear the depth buffer by drawing a quad.
+ */
+static INLINE GLboolean
+check_clear_depth_with_quad(GLcontext *ctx, struct gl_renderbuffer *rb)
+{
+ const struct st_renderbuffer *strb = st_renderbuffer(rb);
+ const GLboolean isDS = is_depth_stencil_format(strb->surface->format);
+
+ if (strb->surface->status == PIPE_SURFACE_STATUS_UNDEFINED)
+ return FALSE;
+
+ if (ctx->Scissor.Enabled)
+ return TRUE;
+
+ if (isDS &&
+ strb->surface->status == PIPE_SURFACE_STATUS_DEFINED &&
+ ctx->DrawBuffer->Visual.stencilBits > 0)
+ return TRUE;
+
+ return FALSE;
+}
+
+
+/**
+ * Determine if we need to clear the stencil buffer by drawing a quad.
+ */
+static INLINE GLboolean
+check_clear_stencil_with_quad(GLcontext *ctx, struct gl_renderbuffer *rb)
+{
+ const struct st_renderbuffer *strb = st_renderbuffer(rb);
+ const GLboolean isDS = is_depth_stencil_format(strb->surface->format);
+ const GLuint stencilMax = (1 << rb->StencilBits) - 1;
+ const GLboolean maskStencil
+ = (ctx->Stencil.WriteMask[0] & stencilMax) != stencilMax;
+
+ if (strb->surface->status == PIPE_SURFACE_STATUS_UNDEFINED)
+ return FALSE;
+
+ if (maskStencil)
+ return TRUE;
+
+ if (ctx->Scissor.Enabled)
+ return TRUE;
+
+ /* This is correct, but it is necessary to look at the depth clear
+ * value held in the surface when it comes time to issue the clear,
+ * rather than taking depth and stencil clear values from the
+ * current state.
+ */
+ if (isDS &&
+ strb->surface->status == PIPE_SURFACE_STATUS_DEFINED &&
+ ctx->DrawBuffer->Visual.depthBits > 0)
+ return TRUE;
+
+ return FALSE;
}
+
+
static void
-clear_accum_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
+clear_color_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
{
- struct st_renderbuffer *strb = st_renderbuffer(rb);
+ if (check_clear_color_with_quad( ctx, rb )) {
+ /* masking or scissoring */
+ clear_with_quad(ctx, GL_TRUE, GL_FALSE, GL_FALSE);
+ }
+ else {
+ struct st_renderbuffer *strb = st_renderbuffer(rb);
- if (!ctx->Scissor.Enabled) {
/* clear whole buffer w/out masking */
- GLuint clearValue
- = color_value(strb->surface->format, ctx->Accum.ClearColor);
- /* Note that clearValue is 32 bits but the accum buffer will
- * typically be 64bpp...
- */
+ uint clearValue = color_value(strb->surface->format, ctx->Color.ClearColor);
ctx->st->pipe->clear(ctx->st->pipe, strb->surface, clearValue);
}
- else {
- /* scissoring */
- /* XXX point framebuffer.cbufs[0] at the accum buffer */
- clear_with_quad(ctx,
- ctx->DrawBuffer->_Xmin,
- ctx->DrawBuffer->_Xmin,
- ctx->DrawBuffer->_Xmax,
- ctx->DrawBuffer->_Ymax,
- GL_TRUE, GL_FALSE, GL_FALSE);
- }
}
static void
clear_depth_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
{
- struct st_renderbuffer *strb = st_renderbuffer(rb);
-
- if (!ctx->Scissor.Enabled &&
- !is_depth_stencil_format(strb->surface->format)) {
- /* clear whole depth buffer w/out masking */
- GLuint clearValue = depth_value(strb->surface->format, ctx->Depth.Clear);
- ctx->st->pipe->clear(ctx->st->pipe, strb->surface, clearValue);
+ if (check_clear_depth_with_quad(ctx, rb)) {
+ /* scissoring or we have a combined depth/stencil buffer */
+ clear_with_quad(ctx, GL_FALSE, GL_TRUE, GL_FALSE);
}
else {
- /* masking or scissoring or combined z/stencil buffer */
- clear_with_quad(ctx,
- ctx->DrawBuffer->_Xmin,
- ctx->DrawBuffer->_Xmin,
- ctx->DrawBuffer->_Xmax,
- ctx->DrawBuffer->_Ymax,
- GL_FALSE, GL_TRUE, GL_FALSE);
+ struct st_renderbuffer *strb = st_renderbuffer(rb);
+
+ /* simple clear of whole buffer */
+ uint clearValue = depth_value(strb->surface->format, ctx->Depth.Clear);
+ ctx->st->pipe->clear(ctx->st->pipe, strb->surface, clearValue);
}
}
static void
clear_stencil_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
{
- struct st_renderbuffer *strb = st_renderbuffer(rb);
- const GLuint stencilMax = (1 << rb->StencilBits) - 1;
- GLboolean maskStencil = ctx->Stencil.WriteMask[0] != stencilMax;
+ if (check_clear_stencil_with_quad(ctx, rb)) {
+ /* masking or scissoring or combined depth/stencil buffer */
+ clear_with_quad(ctx, GL_FALSE, GL_FALSE, GL_TRUE);
+ }
+ else {
+ struct st_renderbuffer *strb = st_renderbuffer(rb);
- if (!maskStencil && !ctx->Scissor.Enabled &&
- !is_depth_stencil_format(strb->surface->format)) {
- /* clear whole stencil buffer w/out masking */
+ /* simple clear of whole buffer */
GLuint clearValue = ctx->Stencil.Clear;
+
+ switch (strb->surface->format) {
+ case PIPE_FORMAT_S8Z24_UNORM:
+ clearValue <<= 24;
+ break;
+ default:
+ ; /* no-op, stencil value is in least significant bits */
+ }
+
ctx->st->pipe->clear(ctx->st->pipe, strb->surface, clearValue);
}
- else {
- /* masking or scissoring */
- clear_with_quad(ctx,
- ctx->DrawBuffer->_Xmin,
- ctx->DrawBuffer->_Xmin,
- ctx->DrawBuffer->_Xmax,
- ctx->DrawBuffer->_Ymax,
- GL_FALSE, GL_FALSE, GL_TRUE);
- }
}
static void
clear_depth_stencil_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
{
- struct st_renderbuffer *strb = st_renderbuffer(rb);
- const GLuint stencilMax = 1 << rb->StencilBits;
- GLboolean maskStencil = ctx->Stencil.WriteMask[0] != stencilMax;
- assert(is_depth_stencil_format(strb->surface->format));
+ if (check_clear_depth_stencil_with_quad(ctx, rb)) {
+ /* masking or scissoring */
+ clear_with_quad(ctx, GL_FALSE, GL_TRUE, GL_TRUE);
+ }
+ else {
+ struct st_renderbuffer *strb = st_renderbuffer(rb);
- if (!maskStencil && !ctx->Scissor.Enabled) {
/* clear whole buffer w/out masking */
GLuint clearValue = depth_value(strb->surface->format, ctx->Depth.Clear);
switch (strb->surface->format) {
- case PIPE_FORMAT_S8_Z24:
+ case PIPE_FORMAT_S8Z24_UNORM:
clearValue |= ctx->Stencil.Clear << 24;
break;
-#if 0
- case PIPE_FORMAT_Z24_S8:
- clearValue = (clearValue << 8) | clearVal;
+ case PIPE_FORMAT_Z24S8_UNORM:
+ clearValue |= ctx->Stencil.Clear;
break;
-#endif
default:
assert(0);
}
ctx->st->pipe->clear(ctx->st->pipe, strb->surface, clearValue);
}
- else {
- /* masking or scissoring */
- clear_with_quad(ctx,
- ctx->DrawBuffer->_Xmin,
- ctx->DrawBuffer->_Xmin,
- ctx->DrawBuffer->_Xmax,
- ctx->DrawBuffer->_Ymax,
- GL_FALSE, GL_TRUE, GL_TRUE);
- }
}
= ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;
struct gl_renderbuffer *stencilRb
= ctx->DrawBuffer->Attachment[BUFFER_STENCIL].Renderbuffer;
+ GLbitfield cmask = mask & BUFFER_BITS_COLOR;
/* This makes sure the softpipe has the latest scissor, etc values */
st_validate_state( st );
* color/depth/stencil individually...
*/
- if (mask & BUFFER_BITS_COLOR) {
+ if (cmask) {
GLuint b;
- for (b = 0; b < BUFFER_COUNT; b++) {
- if (BUFFER_BITS_COLOR & mask & (1 << b)) {
- clear_color_buffer(ctx,
- ctx->DrawBuffer->Attachment[b].Renderbuffer);
+ for (b = 0; cmask; b++) {
+ if (cmask & (1 << b)) {
+ struct gl_renderbuffer *rb
+ = ctx->DrawBuffer->Attachment[b].Renderbuffer;
+ assert(rb);
+ clear_color_buffer(ctx, rb);
+ cmask &= ~(1 << b); /* turn off bit */
}
+ assert(b < BUFFER_COUNT);
}
}
if (mask & BUFFER_BIT_ACCUM) {
- clear_accum_buffer(ctx,
- ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer);
+ st_clear_accum_buffer(ctx,
+ ctx->DrawBuffer->Attachment[BUFFER_ACCUM].Renderbuffer);
}
if ((mask & BUFFER_BITS_DS) == BUFFER_BITS_DS && depthRb == stencilRb) {
projects / mesa.git / blobdiff