diff options
| author | Erik Faye-Lund <[email protected]> | 2019-07-10 16:56:10 +0200 |
|---|---|---|
| committer | Erik Faye-Lund <[email protected]> | 2019-10-28 08:51:46 +0000 |
| commit | 8e5fe441bd3f5c524cadff06801ab99fe1e810c2 (patch) | |
| tree | 787456d4e99804eff5cab011e5938a317bb678dc | |
| parent | e14c29b9f242bb0f795c8adc75c538144726e61f (diff) | |
zink: use pipe_stencil_ref instead of uint32_t-array
Acked-by: Jordan Justen <[email protected]>
| -rw-r--r-- | src/gallium/drivers/zink/zink_context.c | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_context.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index ca69b1dcdab..884455c7c35 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -451,8 +451,7 @@ zink_set_stencil_ref(struct pipe_context *pctx, const struct pipe_stencil_ref *ref) { struct zink_context *ctx = zink_context(pctx); - ctx->stencil_ref[0] = ref->ref_value[0]; - ctx->stencil_ref[1] = ref->ref_value[1]; + ctx->stencil_ref = *ref; } static void @@ -1081,8 +1080,8 @@ zink_draw_vbo(struct pipe_context *pctx, vkCmdSetScissor(batch->cmdbuf, 0, 1, &fb_scissor); } - vkCmdSetStencilReference(batch->cmdbuf, VK_STENCIL_FACE_FRONT_BIT, ctx->stencil_ref[0]); - vkCmdSetStencilReference(batch->cmdbuf, VK_STENCIL_FACE_BACK_BIT, ctx->stencil_ref[1]); + vkCmdSetStencilReference(batch->cmdbuf, VK_STENCIL_FACE_FRONT_BIT, ctx->stencil_ref.ref_value[0]); + vkCmdSetStencilReference(batch->cmdbuf, VK_STENCIL_FACE_BACK_BIT, ctx->stencil_ref.ref_value[1]); if (depth_bias) vkCmdSetDepthBias(batch->cmdbuf, rast_state->offset_units, rast_state->offset_clamp, rast_state->offset_scale); diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h index 8c17b1c51d7..57c077da911 100644 --- a/src/gallium/drivers/zink/zink_context.h +++ b/src/gallium/drivers/zink/zink_context.h @@ -101,7 +101,7 @@ struct zink_context { float blend_constants[4]; - uint32_t stencil_ref[2]; + struct pipe_stencil_ref stencil_ref; }; static inline struct zink_context * |