pending changes

Author: TurtleP

include/driver/display/Renderer.tcc

@@ -49,7 +49,7 @@ namespace love
       protected:
         struct ContextBase
         {
-            CullMode cullMode;
+            CullMode cullMode = CULL_MAX_ENUM;
             ColorChannelMask colorMask;
             BlendState blendState;
             StencilState stencilState;

platform/ctr/include/driver/display/citro3d.hpp

@@ -1,10 +1,13 @@
 #pragma once
 
 #include <3ds/gpu/enums.h>
+#include <c3d/framebuffer.h>
 #include <citro3d.h>
+#include <cstdint>
 
 #include "common/Map.hpp"
 #include "common/config.hpp"
+#include "common/int.hpp"
 #include "common/pixelformat.hpp"
 
 #include "driver/display/Framebuffer.hpp"
@@ -30,6 +33,20 @@ namespace love
             TEXENV_MODE_MAX_ENUM
         };
 
+        class CleanClearState
+        {
+          public:
+            CleanClearState(C3D_ClearBits flags);
+            ~CleanClearState();
+
+          private:
+            C3D_ClearBits flags;
+            uint32_t colorWriteMask;
+            uint32_t stencilWriteMask;
+            bool depthWrites;
+            bool scissor;
+        };
+
         citro3d();
 
         virtual void init() override;
@@ -65,6 +82,36 @@ namespace love
 
         virtual void present() override;
 
+        void setDepthWrites(bool enabled)
+        {
+            this->state.depthWritesEnabled = enabled;
+        }
+
+        bool hasDepthWrites() const
+        {
+            return this->state.depthWritesEnabled;
+        }
+
+        void setStencilWriteMask(uint32_t mask)
+        {
+            this->state.stencilWriteMask = mask;
+        }
+
+        bool getStencilWriteMask() const
+        {
+            return this->state.stencilWriteMask;
+        }
+
+        void setColorWriteMask(uint32_t mask)
+        {
+            this->state.colorWriteMask = mask;
+        }
+
+        bool getColorWriteMask() const
+        {
+            return this->state.colorWriteMask;
+        }
+
         C3D_RenderTarget* getFramebuffer();
 
         C3D_RenderTarget* getInternalBackbuffer() const;
@@ -111,7 +158,12 @@ namespace love
 
         // clang-format off
 
-       ENUMMAP_DECLARE(PrimitiveModes, PrimitiveType, GPU_Primitive_t,
+        ENUMMAP_DECLARE(FilterModes, SamplerState::FilterMode, GPU_TEXTURE_FILTER_PARAM,
+            { SamplerState::FILTER_LINEAR,  GPU_LINEAR  },
+            { SamplerState::FILTER_NEAREST, GPU_NEAREST }
+        );
+
+        ENUMMAP_DECLARE(PrimitiveModes, PrimitiveType, GPU_Primitive_t,
             { PRIMITIVE_TRIANGLES,      GPU_TRIANGLES      },
             { PRIMITIVE_TRIANGLE_STRIP, GPU_TRIANGLE_STRIP },
             { PRIMITIVE_TRIANGLE_FAN,   GPU_TRIANGLE_FAN   }
@@ -230,6 +282,15 @@ namespace love
 
         std::vector<std::function<void()>> deferred;
         std::array<C3D_TexEnv, TEXENV_MODE_MAX_ENUM> environments;
+
+        struct
+        {
+            GPU_CULLMODE faceCullMode;
+            uint32_t enabledAttribArrays;
+            bool depthWritesEnabled   = true;
+            uint32_t stencilWriteMask = LOVE_UINT32_MAX;
+            uint32_t colorWriteMask   = LOVE_UINT32_MAX;
+        } state;
     };
 
     extern citro3d c3d;

platform/ctr/source/driver/display/Framebuffer.cpp

@@ -1,9 +1,5 @@
-#include <algorithm>
-
-#include "common/Exception.hpp"
-
 #include "driver/display/Framebuffer.hpp"
-#include "driver/display/citro3d.hpp"
+#include "common/Exception.hpp"
 
 namespace love
 {

platform/ctr/source/driver/display/citro3d.cpp

@@ -5,9 +5,16 @@
 #include "modules/graphics/Shader.hpp"
 #include "modules/graphics/vertex.hpp"
 #include <3ds/gpu/enums.h>
+#include <c3d/effect.h>
 
 namespace love
 {
+    citro3d::CleanClearState::CleanClearState(C3D_ClearBits flags) : flags(flags)
+    {}
+
+    citro3d::CleanClearState::~CleanClearState()
+    {}
+
     citro3d::citro3d() : context {}
     {
         this->targets.reserve(3);
@@ -240,8 +247,11 @@ namespace love
 
     void citro3d::setSamplerState(C3D_Tex* texture, SamplerState state)
     {
-        auto magFilter = (state.minFilter == SamplerState::FILTER_NEAREST) ? GPU_NEAREST : GPU_LINEAR;
-        auto minFilter = (state.magFilter == SamplerState::FILTER_NEAREST) ? GPU_NEAREST : GPU_LINEAR;
+        GPU_TEXTURE_FILTER_PARAM magFilter;
+        citro3d::getConstant(state.magFilter, magFilter);
+
+        GPU_TEXTURE_FILTER_PARAM minFilter;
+        citro3d::getConstant(state.minFilter, minFilter);
 
         C3D_TexSetFilter(texture, magFilter, minFilter);
 
@@ -306,7 +316,8 @@ namespace love
                 const auto& format    = love::getDataFormatInfo(attribute.getFormat());
 
                 GPU_FORMATS attributeFormat;
-                citro3d::getConstant(format.baseType, attributeFormat);
+                if (!citro3d::getConstant(format.baseType, attributeFormat))
+                    throw love::Exception("Invalid data base type: {:d}.", (int)format.baseType);
 
                 AttrInfo_AddLoader(&info, i, attributeFormat, format.components);
             }

platform/ctr/source/modules/graphics/Graphics.cpp

@@ -618,6 +618,7 @@ namespace love
         c3d.setTexEnvMode(command.texture, command.isFont);
         c3d.setVertexAttributes(attributes, *command.buffers);
         c3d.bindTextureToUnit(command.texture, 0);
+        c3d.setCullMode(command.cullMode);
 
         const auto* indices = (const uint16_t*)command.indexBuffer->getHandle();
         const int index     = BUFFER_OFFSET(command.indexBufferOffset);
@@ -640,6 +641,7 @@ namespace love
         c3d.setTexEnvMode(command.texture, command.isFont);
         c3d.setVertexAttributes(attributes, *command.buffers);
         c3d.bindTextureToUnit(command.texture, 0);
+        c3d.setCullMode(command.cullMode);
 
         GPU_Primitive_t primitive;
         citro3d::getConstant(command.primitiveType, primitive);