making the state work

libraries/gpu/src/gpu/GLBackend.h

@@ -75,6 +75,27 @@ public:
     static GLShader* syncGPUObject(const Shader& shader);
     static GLuint getShaderID(const ShaderPointer& shader);
 
+    class GLState : public GPUObject {
+    public:
+        class Command {
+        public:
+            typedef void *GlFunction(GLenum);
+
+            GlFunction _glFunction;
+            GLenum _enum;
+            
+            void run() { _glFunction(_enum); }
+        };
+
+        typedef std::vector< Command > Commands;
+
+        Commands _commands;
+        
+
+        GLState();
+        ~GLState();
+    };
+    static GLState* syncGPUObject(const State& state);
 
     class GLPipeline : public GPUObject {
     public:

libraries/gpu/src/gpu/State.cpp

@@ -18,3 +18,31 @@ using namespace gpu;
 State::~State()
 {
 }
+
+void State::set(Field field, bool value) {
+    auto found = _fields.at(field);
+    found._integer = value;
+}
+
+void State::set(Field field, uint32 value) {
+    auto found = _fields.at(field);
+    found._unsigned_integer = value;
+}
+
+void State::set(Field field, int32 value) {
+    auto found = _fields.at(field);
+    found._integer = value;
+}
+
+void State::set(Field field, float value) {
+    auto found = _fields.at(field);
+    found._float = value;
+}
+
+State::Value State::get(Field field) const {
+    auto found = _fields.find(field);
+    if (found != _fields.end()) {
+        return (*found).second;
+    }
+    return Value();
+}

libraries/gpu/src/gpu/State.h

@@ -12,8 +12,9 @@
 #define hifi_gpu_State_h
 
 #include "Format.h"
-#include <vector>
+
-#include <QSharedPointer>
+#include <memory>
+#include <unordered_map>
  
 
 namespace gpu {
@@ -25,32 +26,49 @@ public:
     State() {}
     virtual ~State();
 
-    // Work in progress, not used
+    // All the possible fields
-    /*
     enum Field {
         FILL_MODE,
         CULL_MODE,
         DEPTH_BIAS,
         DEPTH_BIAS_CLAMP,
-        DEPTH_BIASSLOPE_SCALE,
+        DEPTH_BIAS_SLOPE_SCALE,
 
         FRONT_CLOCKWISE,
         DEPTH_CLIP_ENABLE,
-        SCISSR_ENABLE,
+        SCISSOR_ENABLE,
         MULTISAMPLE_ENABLE,
         ANTIALISED_LINE_ENABLE,
 
         DEPTH_ENABLE,
         DEPTH_WRITE_MASK,
-        DEPTH_FUNCTION,
+        DEPTH_FUNC,
 
         STENCIL_ENABLE,
         STENCIL_READ_MASK,
         STENCIL_WRITE_MASK,
-        STENCIL_FUNCTION_FRONT,
+
-        STENCIL_FUNCTION_BACK,
+        STENCIL_FUNC_FRONT,
+        STENCIL_FRONT_FUNC,
+        STENCIL_FRONT_FAIL_OP,
+        STENCIL_FRONT_DEPTH_FAIL_OP,
+        STENCIL_FRONT_PASS_OP,
+        
+        STENCIL_BACK_FUNC,
+        STENCIL_BACK_FAIL_OP,
+        STENCIL_BACK_DEPTH_FAIL_OP,
+        STENCIL_BACK_PASS_OP,
+        STENCIL_FUNC_BACK,
+
         STENCIL_REFERENCE,
 
+        SAMPLE_MASK,
+        ALPHA_TO_COVERAGE_ENABLE,
+        BLEND_FACTOR_X,
+        BLEND_FACTOR_Y,
+        BLEND_FACTOR_Z,
+        BLEND_FACTOR_W,
+ 
         BLEND_INDEPENDANT_ENABLE,
         BLEND_ENABLE,
         BLEND_SOURCE,
@@ -60,18 +78,208 @@ public:
         BLEND_DESTINATION_ALPHA,
         BLEND_OPERATION_ALPHA,
         BLEND_WRITE_MASK,
-        BLEND_FACTOR,
+ 
-
+        NUM_FIELDS, // not a valid field, just the count
-        SAMPLE_MASK,
-
-        ALPHA_TO_COVERAGE_ENABLE,
     };
-    */
+
+    enum ComparisonFunction {
+        NEVER = 0,
+        LESS,
+        EQUAL,
+        LESS_EQUAL,
+        GREATER,
+        NOT_EQUAL,
+        GREATER_EQUAL,
+        ALWAYS,
+
+        NUM_COMPARISON_FUNCS,
+    };
+
+    enum FillMode {
+        FILL_POINT = 0,
+        FILL_LINE,
+        FILL_FACE,
+
+        NUM_FILL_MODES,
+    };
+ 
+    enum CullMode {
+        CULL_NONE = 0,
+        CULL_FRONT,
+        CULL_BACK,
+
+        NUM_CULL_MODES,
+    };
+
+    enum StencilOp {
+        STENCIL_OP_KEEP = 0,
+        STENCIL_OP_ZERO,
+        STENCIL_OP_REPLACE,
+        STENCIL_OP_INCR_SAT,
+        STENCIL_OP_DECR_SAT,
+        STENCIL_OP_INVERT,
+        STENCIL_OP_INCR,
+        STENCIL_OP_DECR,
+
+        NUM_STENCIL_OPS,
+    };
+
+    enum BlendArg {
+        ZERO = 0,
+        ONE,
+        SRC_COLOR,
+        INV_SRC_COLOR,
+        SRC_ALPHA,
+        INV_SRC_ALPHA,
+        DEST_ALPHA,
+        INV_DEST_ALPHA,
+        DEST_COLOR,
+        INV_DEST_COLOR,
+        SRC_ALPHA_SAT,
+        BLEND_FACTOR,
+        INV_BLEND_FACTOR,
+        SRC1_COLOR,
+        INV_SRC1_COLOR,
+        SRC1_ALPHA,
+        INV_SRC1_ALPHA,
+    
+        NUM_BLEND_ARGS,
+    };
+
+    enum BlendOp {
+        BLEND_OP_ADD = 0,
+        BLEND_OP_SUBTRACT,
+        BLEND_OP_REV_SUBTRACT,
+        BLEND_OP_MIN,
+        BLEND_OP_MAX,
+
+        NUM_BLEND_OPS,
+    };
+
+    enum ColorMask
+    {
+        WRITE_NONE = 0,
+        WRITE_RED = 1,
+        WRITE_GREEN = 2,
+        WRITE_BLUE = 4,
+        WRITE_ALPHA = 8,
+        WRITE_ALL = (WRITE_RED | WRITE_GREEN | WRITE_BLUE | WRITE_ALPHA ),
+    };
+
+
+    class Value {
+    public:
+        union {
+            uint32 _unsigned_integer;
+            int32 _integer;
+            float _float;
+        };
+    };
+    typedef std::unordered_map<Field, Value> FieldMap; 
+
+    void set(Field field, bool value);
+    void set(Field field, uint32 value);
+    void set(Field field, int32 value);
+    void set(Field field, float value);
+
+    Value get(Field field) const;
+
+    void setFillMode(FillMode fill) { set(FILL_MODE, uint32(fill)); }
+    void setCullMode(CullMode cull)  { set(FILL_MODE, uint32(cull)); }
+    FillMode getFillMode() const { return FillMode(get(FILL_MODE)._integer); }
+    CullMode getCullMode() const { return CullMode(get(CULL_MODE)._integer); }
+
+    void setDepthBias(int32 bias) { set(DEPTH_BIAS, bias); }
+    void setDepthBiasClamp(float clamp) { set(DEPTH_BIAS_CLAMP, clamp); }
+    void setDepthBiasSlopeScale(float scale) { set(DEPTH_BIAS_SLOPE_SCALE, scale); }
+    int32 getDepthBias() const { return get(DEPTH_BIAS)._integer; }
+    float getDepthBiasClamp() const { return get(DEPTH_BIAS_CLAMP)._float; }
+    float getDepthBiasSlopeScale() const { return get(DEPTH_BIAS_SLOPE_SCALE)._float; }
+ 
+    void setFrontClockwise(bool enable) { set(FRONT_CLOCKWISE, enable); }
+    void setDepthClipEnable(bool enable) { set(DEPTH_CLIP_ENABLE, enable); }
+    void setScissorEnable(bool enable) { set(SCISSOR_ENABLE, enable); }
+    void setMultisampleEnable(bool enable) { set(MULTISAMPLE_ENABLE, enable); }
+    void setAntialiasedLineEnable(bool enable) { set(ANTIALISED_LINE_ENABLE, enable); }
+    bool getFrontClockwise() const { return get(FRONT_CLOCKWISE)._integer; }
+    bool getDepthClipEnable() const { return get(DEPTH_CLIP_ENABLE)._integer; }
+    bool getScissorEnable() const { return get(SCISSOR_ENABLE)._integer; }
+    bool getMultisampleEnable() const { return get(MULTISAMPLE_ENABLE)._integer; }
+    bool getAntialiasedLineEnable() const { return get(ANTIALISED_LINE_ENABLE)._integer; }
+
+    void setDepthEnable(bool enable) { set(DEPTH_ENABLE, enable); }
+    void setDepthWriteMask(bool enable)  { set(DEPTH_WRITE_MASK, enable); }
+    void setDepthFunc(ComparisonFunction func)  { set(DEPTH_FUNC, func); }
+    bool getDepthEnable() const { return get(DEPTH_ENABLE)._integer; }
+    bool getDepthWriteMask() const { return get(DEPTH_WRITE_MASK)._integer; }
+    ComparisonFunction getDepthFunc() const { return ComparisonFunction(get(DEPTH_FUNC)._integer); }
+
+    void setStencilEnable(bool enable) { set(STENCIL_ENABLE, enable); }
+    void setStencilReadMask(uint8 mask)  { set(STENCIL_READ_MASK, mask); }
+    void setStencilWriteMask(uint8 mask)  { set(STENCIL_WRITE_MASK, mask); }
+    bool getStencilEnable() const { return get(STENCIL_ENABLE)._integer; }
+    uint8 getStencilReadMask() const { return get(STENCIL_READ_MASK)._unsigned_integer; }
+    uint8 getStencilWriteMask() const { return get(STENCIL_WRITE_MASK)._unsigned_integer; }
+
+    void setStencilFrontFailOp(StencilOp op)  { set(STENCIL_FRONT_FAIL_OP, op); }
+    void setStencilFrontDepthFailOp(StencilOp op)  { set(STENCIL_FRONT_DEPTH_FAIL_OP, op); }
+    void setStencilFrontPassOp(StencilOp op)  { set(STENCIL_FRONT_PASS_OP, op); }
+    void setStencilFrontFunc(ComparisonFunction func)  { set(STENCIL_FRONT_FUNC, func); }
+    StencilOp getStencilFrontFailOp() const { return StencilOp(get(STENCIL_FRONT_FAIL_OP)._integer); }
+    StencilOp getStencilFrontDepthFailOp() const { return StencilOp(get(STENCIL_FRONT_DEPTH_FAIL_OP)._integer); }
+    StencilOp getStencilFrontPassOp() const { return StencilOp(get(STENCIL_FRONT_PASS_OP)._integer); }
+    ComparisonFunction getStencilFrontFunc() const { return ComparisonFunction(get(STENCIL_FRONT_FUNC)._integer); }
+
+    void setStencilBackFailOp(StencilOp op)  { set(STENCIL_BACK_FAIL_OP, op); }
+    void setStencilBackDepthFailOp(StencilOp op)  { set(STENCIL_BACK_DEPTH_FAIL_OP, op); }
+    void setStencilBackPassOp(StencilOp op)  { set(STENCIL_BACK_PASS_OP, op); }
+    void setStencilBackFunc(ComparisonFunction func)  { set(STENCIL_BACK_FUNC, func); }
+    StencilOp getStencilBackFailOp() const { return StencilOp(get(STENCIL_BACK_FAIL_OP)._integer); }
+    StencilOp getStencilBackDepthFailOp() const { return StencilOp(get(STENCIL_BACK_DEPTH_FAIL_OP)._integer); }
+    StencilOp getStencilBackPassOp() const { return StencilOp(get(STENCIL_BACK_PASS_OP)._integer); }
+    ComparisonFunction getStencilBackFunc() const { return ComparisonFunction(get(STENCIL_BACK_FUNC)._integer); }
+
+    void setStencilReference(uint32 ref) { set(STENCIL_REFERENCE, ref); }
+    uint32 getStencilReference() const { return get(STENCIL_REFERENCE)._unsigned_integer; }
+
+    void setAlphaToCoverageEnable(bool enable) { set(ALPHA_TO_COVERAGE_ENABLE, enable); }
+    bool getAlphaToCoverageEnable() const { return get(ALPHA_TO_COVERAGE_ENABLE)._integer; }
+
+    void setSampleMask(uint32 mask) { set(SAMPLE_MASK, mask); }
+    uint32 getSampleMask() const { return get(SAMPLE_MASK)._unsigned_integer; }
+
+  //  void setBlendIndependantEnable(bool enable) { set(BLEND_INDEPENDANT_ENABLE, enable); }
+  //  bool getBlendIndependantEnable() const { return get(BLEND_INDEPENDANT_ENABLE)._integer; }
+ 
+    void setBlendEnable(bool enable) { set(BLEND_ENABLE, enable); }
+    bool getBlendEnable() const { return get(BLEND_ENABLE)._integer; }
+
+    void setBlendSource(BlendArg source) { set(BLEND_SOURCE, source); }
+    void setBlendDestination(BlendArg destination) { set(BLEND_DESTINATION, destination); }
+    void setBlendOperation(BlendOp operation) { set(BLEND_OPERATION, operation); }
+    BlendArg getBlendSource() const { return BlendArg(get(BLEND_SOURCE)._integer); }
+    BlendArg getBlendDestination() const { return BlendArg(get(BLEND_DESTINATION)._integer); }
+    BlendOp getBlendOperation() const { return BlendOp(get(BLEND_OPERATION)._integer); }
+
+    void setBlendSourceAlpha(BlendArg source) { set(BLEND_SOURCE_ALPHA, source); }
+    void setBlendDestinationAlpha(BlendArg destination) { set(BLEND_DESTINATION_ALPHA, destination); }
+    void setBlendOperationAlpha(BlendOp operation) { set(BLEND_OPERATION_ALPHA, operation); }
+    BlendArg getBlendSourceAlpha() const { return BlendArg(get(BLEND_SOURCE_ALPHA)._integer); }
+    BlendArg getBlendDestinationAlpha() const { return BlendArg(get(BLEND_DESTINATION_ALPHA)._integer); }
+    BlendOp getBlendOperationAlpha() const { return BlendOp(get(BLEND_OPERATION_ALPHA)._integer); }
+
+    void setBlendWriteMask(ColorMask mask) { set(BLEND_WRITE_MASK, mask); }
+    ColorMask getBlendWriteMask() const { return ColorMask(get(BLEND_WRITE_MASK)._integer); }
+
+    void setBlendFactor(const Vec4& factor) { set(BLEND_FACTOR_X, factor.x); set(BLEND_FACTOR_Y, factor.y); set(BLEND_FACTOR_Z, factor.z); set(BLEND_FACTOR_W, factor.w); }
+    Vec4 getBlendFactor() const { return Vec4(get(BLEND_FACTOR_X)._float, get(BLEND_FACTOR_Y)._float, get(BLEND_FACTOR_Z)._float, get(BLEND_FACTOR_W)._float); }
 
 protected:
     State(const State& state);
     State& operator=(const State& state);
 
+    FieldMap _fields;
+
     // This shouldn't be used by anything else than the Backend class with the proper casting.
     mutable GPUObject* _gpuObject = NULL;
     void setGPUObject(GPUObject* gpuObject) const { _gpuObject = gpuObject; }
@@ -79,7 +287,7 @@ protected:
     friend class Backend;
 };
 
-typedef QSharedPointer< State > StatePointer;
+typedef std::shared_ptr< State > StatePointer;
 typedef std::vector< StatePointer > States;
 
 };

libraries/model/src/model/Stage.cpp

@@ -281,6 +281,7 @@ void SunSkyStage::updateGraphicsObject() const {
 
 }
 
-void SunSkyStage::setSkybox(const Vec3& color) {
+void SunSkyStage::setSkybox(const SkyboxPointer& skybox) {
-    _skybox ;
+    _skybox = skybox;
+    invalidate();
 }

libraries/render-utils/src/DeferredLightingEffect.cpp

@@ -548,3 +548,7 @@ void DeferredLightingEffect::setGlobalLight(const glm::vec3& direction, const gl
     light->setColor(diffuse);
     light->setIntensity(intensity);
 }
+
+void DeferredLightingEffect::setGlobalSkybox(const model::SkyboxPointer& skybox) {
+    _skybox = skybox;
+}

libraries/render-utils/src/DeferredLightingEffect.h

@@ -76,6 +76,7 @@ public:
     void setGlobalLight(const glm::vec3& direction, const glm::vec3& diffuse, float intensity);
     void setGlobalAtmosphere(const model::AtmospherePointer& atmosphere) { _atmosphere = atmosphere; }
 
+    void setGlobalSkybox(const model::SkyboxPointer& skybox);
 private:
     DeferredLightingEffect() {}
     virtual ~DeferredLightingEffect() { }
@@ -150,6 +151,7 @@ private:
 
     int _ambientLightMode = 0;
     model::AtmospherePointer _atmosphere;
+    model::SkyboxPointer _skybox;
 };
 
 /// Simple interface for objects that require something to be rendered after deferred lighting.