diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2014-08-16 12:48:09 -0400 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-09-17 01:15:28 +0100 |
| commit | 6eaa23d1ff693aaed127c5dc4c1ec503fc09afd8 (patch) | |
| tree | aac243ff603d15a2d6e050842905025b4755217c | |
| parent | e221e797b5fc6cfa072452fc3f6b13ee71afbf79 (diff) | |
nouveau: only enable stencil func if the visual has stencil bits
The _Enabled property already has the relevant information.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "10.2 10.3" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 3c81de58512f0615df1d90aa79a22c9a44c7189e)
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv04_state_raster.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv10_state_raster.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c index 26cf32f2a25..fbcc840f891 100644 --- a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c +++ b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c @@ -175,7 +175,7 @@ nv04_emit_control(struct gl_context *ctx, int emit) if (ctx->Stencil.WriteMask[0]) nv04->ctrl[0] |= NV04_MULTITEX_TRIANGLE_CONTROL0_STENCIL_WRITE; - if (ctx->Stencil.Enabled) + if (ctx->Stencil._Enabled) nv04->ctrl[1] |= NV04_MULTITEX_TRIANGLE_CONTROL1_STENCIL_ENABLE; nv04->ctrl[1] |= get_comparison_op(ctx->Stencil.Function[0]) << 4 | diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_raster.c b/src/mesa/drivers/dri/nouveau/nv10_state_raster.c index d34cf91dafd..ffde87ab27b 100644 --- a/src/mesa/drivers/dri/nouveau/nv10_state_raster.c +++ b/src/mesa/drivers/dri/nouveau/nv10_state_raster.c @@ -145,7 +145,7 @@ nv10_emit_stencil_func(struct gl_context *ctx, int emit) struct nouveau_pushbuf *push = context_push(ctx); BEGIN_NV04(push, NV10_3D(STENCIL_ENABLE), 1); - PUSH_DATAb(push, ctx->Stencil.Enabled); + PUSH_DATAb(push, ctx->Stencil._Enabled); BEGIN_NV04(push, NV10_3D(STENCIL_FUNC_FUNC), 3); PUSH_DATA (push, nvgl_comparison_op(ctx->Stencil.Function[0])); |