OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: more fixes for stencil ref change.

Browse Source 
compiles. Might need to do something to make it possible to save/restore
stencil ref.
This commit is contained in:
Roland Scheidegger
2010-02-10 21:14:18 +01:00
parent 0786f38b46
commit dfc02e3784
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/state_tracker/st_atom_depth.c
View File

@@ -123,7 +123,6 @@ update_depth_stencil_alpha(struct st_context *st)
dsa->stencil[1].fail_op = gl_stencil_op_to_pipe(ctx->Stencil.FailFunc[back]); dsa->stencil[1].fail_op = gl_stencil_op_to_pipe(ctx->Stencil.FailFunc[back]);
dsa->stencil[1].zfail_op = gl_stencil_op_to_pipe(ctx->Stencil.ZFailFunc[back]); dsa->stencil[1].zfail_op = gl_stencil_op_to_pipe(ctx->Stencil.ZFailFunc[back]);
dsa->stencil[1].zpass_op = gl_stencil_op_to_pipe(ctx->Stencil.ZPassFunc[back]); dsa->stencil[1].zpass_op = gl_stencil_op_to_pipe(ctx->Stencil.ZPassFunc[back]);
dsa->stencil[1].ref_value = ctx->Stencil.Ref[back] & 0xff;
dsa->stencil[1].valuemask = ctx->Stencil.ValueMask[back] & 0xff; dsa->stencil[1].valuemask = ctx->Stencil.ValueMask[back] & 0xff;
dsa->stencil[1].writemask = ctx->Stencil.WriteMask[back] & 0xff; dsa->stencil[1].writemask = ctx->Stencil.WriteMask[back] & 0xff;
sr.ref_value[1] = ctx->Stencil.Ref[back] & 0xff; sr.ref_value[1] = ctx->Stencil.Ref[back] & 0xff;

21
src/mesa/state_tracker/st_cb_clear.c
View File

@@ -192,6 +192,7 @@ clear_with_quad(GLcontext *ctx,
GLboolean color, GLboolean depth, GLboolean stencil) GLboolean color, GLboolean depth, GLboolean stencil)
{ {
struct st_context *st = ctx->st; struct st_context *st = ctx->st;
struct pipe_stencil_ref stencil_ref;
const GLfloat x0 = (GLfloat) ctx->DrawBuffer->_Xmin; const GLfloat x0 = (GLfloat) ctx->DrawBuffer->_Xmin;
const GLfloat x1 = (GLfloat) ctx->DrawBuffer->_Xmax; const GLfloat x1 = (GLfloat) ctx->DrawBuffer->_Xmax;
GLfloat y0, y1; GLfloat y0, y1;
@@ -247,6 +248,7 @@ clear_with_quad(GLcontext *ctx,
{ {
struct pipe_depth_stencil_alpha_state depth_stencil; struct pipe_depth_stencil_alpha_state depth_stencil;
memset(&depth_stencil, 0, sizeof(depth_stencil)); memset(&depth_stencil, 0, sizeof(depth_stencil));
memset(&stencil_ref, 0, sizeof(stencil_ref));
if (depth) { if (depth) {
depth_stencil.depth.enabled = 1; depth_stencil.depth.enabled = 1;
depth_stencil.depth.writemask = 1; depth_stencil.depth.writemask = 1;
@@ -259,9 +261,10 @@ clear_with_quad(GLcontext *ctx,
depth_stencil.stencil[0].fail_op = PIPE_STENCIL_OP_REPLACE; depth_stencil.stencil[0].fail_op = PIPE_STENCIL_OP_REPLACE;
depth_stencil.stencil[0].zpass_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].zfail_op = PIPE_STENCIL_OP_REPLACE;
depth_stencil.stencil[0].ref_value = ctx->Stencil.Clear;
depth_stencil.stencil[0].valuemask = 0xff; depth_stencil.stencil[0].valuemask = 0xff;
depth_stencil.stencil[0].writemask = ctx->Stencil.WriteMask[0] & 0xff; depth_stencil.stencil[0].writemask = ctx->Stencil.WriteMask[0] & 0xff;
stencil_ref.ref_value[0] = ctx->Stencil.Clear;
cso_set_stencil_ref(st->cso_context, &stencil_ref);
} }
cso_set_depth_stencil_alpha(st->cso_context, &depth_stencil); cso_set_depth_stencil_alpha(st->cso_context, &depth_stencil);
@@ -281,6 +284,22 @@ clear_with_quad(GLcontext *ctx,
cso_restore_rasterizer(st->cso_context); cso_restore_rasterizer(st->cso_context);
cso_restore_fragment_shader(st->cso_context); cso_restore_fragment_shader(st->cso_context);
cso_restore_vertex_shader(st->cso_context); cso_restore_vertex_shader(st->cso_context);
/* cannot restore stencil ref. Try to reconstruct? */
if (stencil) {
if (ctx->Stencil.Enabled && ctx->DrawBuffer->Visual.stencilBits > 0) {
stencil_ref.ref_value[0] = ctx->Stencil.Ref[0] & 0xff;
if (ctx->Stencil._TestTwoSide) {
const GLuint back = ctx->Stencil._BackFace;
stencil_ref.ref_value[1] = ctx->Stencil.Ref[back] & 0xff;
}
else {
stencil_ref.ref_value[1] = stencil_ref.ref_value[0];
}
}
cso_set_stencil_ref(st->cso_context, &stencil_ref);
}
} }