Rename some stencil test constants

This makes it more apparent what the difference between these and the
_WRAP variants is.

diff --git a/source/backends/opengl/stenciltest_backend.cpp b/source/backends/opengl/stenciltest_backend.cpp
index 258bf9b89f28263c60b87801db3d71ce7ed2e3ad..1c049ea38deca7abf9460310ae0cac4144d670ae 100644 (file)
--- a/source/backends/opengl/stenciltest_backend.cpp
+++ b/source/backends/opengl/stenciltest_backend.cpp
@@ -14,8 +14,8 @@ unsigned get_gl_stencil_op(StencilOp op)
        case KEEP: return GL_KEEP;
        case SET_ZERO: return GL_ZERO;
        case REPLACE: return GL_REPLACE;
-       case INCR: return GL_INCR;
-       case DECR: return GL_DECR;
+       case INCR_CLAMP: return GL_INCR;
+       case DECR_CLAMP: return GL_DECR;
        case INVERT: return GL_INVERT;
        case INCR_WRAP: return GL_INCR_WRAP;
        case DECR_WRAP: return GL_DECR_WRAP;

diff --git a/source/core/stenciltest.cpp b/source/core/stenciltest.cpp
index db1a5c0e2a0d161b23abaf10497d1321f1541350..4c63497759717e2dd3d1c241421a138c9e3bfd45 100644 (file)
--- a/source/core/stenciltest.cpp
+++ b/source/core/stenciltest.cpp
@@ -38,10 +38,10 @@ void operator>>(const LexicalConverter &conv, StencilOp &op)
                op = SET_ZERO;
        else if(str=="REPLACE")
                op = REPLACE;
-       else if(str=="INCR")
-               op = INCR;
-       else if(str=="DECR")
-               op = DECR;
+       else if(str=="INCR_CLAMP")
+               op = INCR_CLAMP;
+       else if(str=="DECR_CLAMP")
+               op = DECR_CLAMP;
        else if(str=="INVERT")
                op = INVERT;
        else if(str=="INCR_WRAP")
@@ -59,8 +59,8 @@ void operator<<(LexicalConverter &conv, StencilOp op)
        case KEEP: conv.result("KEEP"); break;
        case SET_ZERO: conv.result("SET_ZERO"); break;
        case REPLACE: conv.result("REPLACE"); break;
-       case INCR: conv.result("INCR"); break;
-       case DECR: conv.result("DECR"); break;
+       case INCR_CLAMP: conv.result("INCR_CLAMP"); break;
+       case DECR_CLAMP: conv.result("DECR_CLAMP"); break;
        case INVERT: conv.result("INVERT"); break;
        case INCR_WRAP: conv.result("INCR_WRAP"); break;
        case DECR_WRAP: conv.result("DECR_WRAP"); break;

diff --git a/source/core/stenciltest.h b/source/core/stenciltest.h
index 47e7a62787ff5bc0603b89732dfccbe71991def2..c6a385d37f7e7efabbcc158cffc19c5c51eee2d4 100644 (file)
--- a/source/core/stenciltest.h
+++ b/source/core/stenciltest.h
@@ -13,8 +13,8 @@ enum StencilOp
        KEEP,
        SET_ZERO,
        REPLACE,
-       INCR,
-       DECR,
+       INCR_CLAMP,
+       DECR_CLAMP,
        INVERT,
        INCR_WRAP,
        DECR_WRAP