diff options
| author | Chris Forbes <chrisf@ijw.co.nz> | 2013-05-13 21:49:30 +1200 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2013-05-15 22:04:53 +1200 |
| commit | 978f91b8292cf504d3d50307aacfb94943d7f186 (patch) | |
| tree | f6328c1e7ca7177302b89cbf26d8e2c0254079cd | |
| parent | db8a84de8765fc969a3fff3f1275852916eda042 (diff) | |
| download | external_mesa3d-978f91b8292cf504d3d50307aacfb94943d7f186.zip external_mesa3d-978f91b8292cf504d3d50307aacfb94943d7f186.tar.gz external_mesa3d-978f91b8292cf504d3d50307aacfb94943d7f186.tar.bz2 | |
swrast: Use accessor for stencil reference values
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>
| -rw-r--r-- | src/mesa/swrast/s_stencil.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c index 0c46d93..a63a773 100644 --- a/src/mesa/swrast/s_stencil.c +++ b/src/mesa/swrast/s_stencil.c @@ -29,6 +29,8 @@ #include "main/imports.h" #include "main/format_pack.h" #include "main/format_unpack.h" +#include "main/core.h" +#include "main/stencil.h" #include "s_context.h" #include "s_depth.h" @@ -129,7 +131,7 @@ apply_stencil_op(const struct gl_context *ctx, GLenum oper, GLuint face, GLuint n, GLubyte stencil[], const GLubyte mask[], GLint stride) { - const GLubyte ref = ctx->Stencil.Ref[face]; + const GLubyte ref = _mesa_get_stencil_ref(ctx, face); const GLubyte wrtmask = ctx->Stencil.WriteMask[face]; const GLubyte invmask = (GLubyte) (~wrtmask); GLuint i, j; @@ -216,7 +218,7 @@ do_stencil_test(struct gl_context *ctx, GLuint face, GLuint n, GLboolean allfail = GL_FALSE; GLuint i, j; const GLuint valueMask = ctx->Stencil.ValueMask[face]; - const GLubyte ref = (GLubyte) (ctx->Stencil.Ref[face] & valueMask); + const GLubyte ref = (GLubyte) (_mesa_get_stencil_ref(ctx, face) & valueMask); GLubyte s; /* |