fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 15:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nouveau: Use accessor for stencil reference values

Browse source 
NOTE: This is a candidate for stable branches.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 7bbe9b78ae)
This commit is contained in:
Chris Forbes 2013-05-13 21:47:37 +12:00 • committed by Kenneth Graunke
parent 0fdf9716a4
commit c7d9a46737
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/drivers/dri/nouveau/nv04_state_raster.c
View file

@ -30,6 +30,7 @@
#include "nv_object.xml.h"
#include "nv04_3d.xml.h"
#include "nv04_driver.h"
#include "main/stencil.h"
static unsigned
get_comparison_op(unsigned op)
@ -177,7 +178,7 @@ nv04_emit_control(struct gl_context *ctx, int emit)
nv04->ctrl[1] |= NV04_MULTITEX_TRIANGLE_CONTROL1_STENCIL_ENABLE;
nv04->ctrl[1] |= get_comparison_op(ctx->Stencil.Function[0]) << 4 |
ctx->Stencil.Ref[0] << 8 |
_mesa_get_stencil_ref(ctx, 0) << 8 |
ctx->Stencil.ValueMask[0] << 16 |
ctx->Stencil.WriteMask[0] << 24;

4
src/mesa/drivers/dri/nouveau/nv10_state_raster.c
View file

@ -31,6 +31,8 @@
#include "nv10_3d.xml.h"
#include "nv10_driver.h"
#include "main/stencil.h"
void
nv10_emit_alpha_func(struct gl_context *ctx, int emit)
{
@ -145,7 +147,7 @@ nv10_emit_stencil_func(struct gl_context *ctx, int emit)
BEGIN_NV04(push, NV10_3D(STENCIL_FUNC_FUNC), 3);
PUSH_DATA (push, nvgl_comparison_op(ctx->Stencil.Function[0]));
PUSH_DATA (push, ctx->Stencil.Ref[0]);
PUSH_DATA (push, _mesa_get_stencil_ref(ctx, 0));
PUSH_DATA (push, ctx->Stencil.ValueMask[0]);
}