State management improvements in Renderer

[libs/gl.git] / source / renderer.h

diff --git a/source/renderer.h b/source/renderer.h
index a3ddaa3bd28f3832ce2a21884384727c897ede5f..dd9464127d025ee0ae4ba9612084f91617f8ad67 100644 (file)
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -91,7 +91,9 @@ private:
 
        enum ChangeMask
        {
-               MATRIX = 1,
+               LEGACY_MATRIX = 1,
+               MODERN_MATRIX = 2,
+               MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
                LIGHTING = 4,
                SHADER_DATA = 8
        };
@@ -99,6 +101,7 @@ private:
        MtxStack mtx_stack;
        unsigned char changed;
        bool matrices_loaded;
+       unsigned shdata_applied;
        const Camera *camera;
        std::vector<State> state_stack;
        State *state;