KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

broadcom/vc5: Fix translation of stencil ops. 

They aren't quite in the same order as the gallium defines.  Fixes piglit
gl-2.0-two-sided-stencil.
This commit is contained in:
Eric Anholt 2017-11-01 15:28:04 -07:00
parent 3be820477f
commit 47bd9dac19
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/vc5/vc5_context.h
View File

@ -395,8 +395,8 @@ struct vc5_depth_stencil_alpha_state {
*/
uint32_t stencil_uniforms[3];
uint8_t stencil_front[8];
uint8_t stencil_back[8];
uint8_t stencil_front[6];
uint8_t stencil_back[6];
};
#define perf_debug(...) do { \

34
src/gallium/drivers/vc5/vc5_state.c
View File

@ -127,6 +127,22 @@ vc5_create_blend_state(struct pipe_context *pctx,
return vc5_generic_cso_state_create(cso, sizeof(*cso));
}
static uint32_t
translate_stencil_op(enum pipe_stencil_op op)
{
switch (op) {
case PIPE_STENCIL_OP_KEEP: return V3D_STENCIL_OP_KEEP;
case PIPE_STENCIL_OP_ZERO: return V3D_STENCIL_OP_ZERO;
case PIPE_STENCIL_OP_REPLACE: return V3D_STENCIL_OP_REPLACE;
case PIPE_STENCIL_OP_INCR: return V3D_STENCIL_OP_INCR;
case PIPE_STENCIL_OP_DECR: return V3D_STENCIL_OP_DECR;
case PIPE_STENCIL_OP_INCR_WRAP: return V3D_STENCIL_OP_INCWRAP;
case PIPE_STENCIL_OP_DECR_WRAP: return V3D_STENCIL_OP_DECWRAP;
case PIPE_STENCIL_OP_INVERT: return V3D_STENCIL_OP_INVERT;
}
unreachable("bad stencil op");
}
static void *
vc5_create_depth_stencil_alpha_state(struct pipe_context *pctx,
const struct pipe_depth_stencil_alpha_state *cso)
@ -168,9 +184,12 @@ vc5_create_depth_stencil_alpha_state(struct pipe_context *pctx,
config.stencil_test_mask = front->valuemask;
config.stencil_test_function = front->func;
config.stencil_pass_op = front->zpass_op;
config.depth_test_fail_op = front->zfail_op;
config.stencil_test_fail_op = front->fail_op;
config.stencil_pass_op =
translate_stencil_op(front->zpass_op);
config.depth_test_fail_op =
translate_stencil_op(front->zfail_op);
config.stencil_test_fail_op =
translate_stencil_op(front->fail_op);
}
}
if (back->enabled) {
@ -182,9 +201,12 @@ vc5_create_depth_stencil_alpha_state(struct pipe_context *pctx,
config.stencil_test_mask = back->valuemask;
config.stencil_test_function = back->func;
config.stencil_pass_op = back->zpass_op;
config.depth_test_fail_op = back->zfail_op;
config.stencil_test_fail_op = back->fail_op;
config.stencil_pass_op =
translate_stencil_op(back->zpass_op);
config.depth_test_fail_op =
translate_stencil_op(back->zfail_op);
config.stencil_test_fail_op =
translate_stencil_op(back->fail_op);
}
}