we have the gamepad rendering

lovebrew · Sep 29, 2024 · 902f6e2 · 902f6e2
1 parent fc07b10
commit 902f6e2
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 22 deletions.
diff --git a/platform/cafe/include/driver/display/Framebuffer.hpp b/platform/cafe/include/driver/display/Framebuffer.hpp
@@ -56,15 +56,15 @@ namespace love
 
       private:
         static constexpr auto FORMAT      = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8;
-        static constexpr auto BUFFER_MODE = GX2_BUFFERING_MODE_DOUBLE;
+        static constexpr auto BUFFER_MODE = GX2_BUFFERING_MODE_SINGLE;
         static constexpr auto INVALIDATE_COLOR_BUFFER =
             GX2_INVALIDATE_MODE_CPU | GX2_INVALIDATE_MODE_COLOR_BUFFER;
 
         GX2ColorBuffer target;
         GX2DepthBuffer depth;
 
-        uint8_t mode;
-        uint8_t id;
+        uint8_t renderMode;
+        GX2ScanTarget id;
 
         Uniform* uniform;
 

diff --git a/platform/cafe/include/driver/display/Uniform.hpp b/platform/cafe/include/driver/display/Uniform.hpp
@@ -13,5 +13,19 @@ namespace love
     {
         glm::mat4 modelView;
         glm::mat4 projection;
+
+        void debug()
+        {
+            const auto count = sizeof(glm::mat4) / sizeof(uint32_t);
+
+            uint32_t* model = (uint32_t*)glm::value_ptr(this->modelView);
+            for (size_t index = 0; index < count; index++)
+                std::printf("modelView[%zu] = %u\n", index, model[index]);
+
+            uint32_t* projection = (uint32_t*)glm::value_ptr(this->projection);
+            for (size_t index = 0; index < count; index++)
+                std::printf("projection[%zu] = %u\n", index, projection[index]);
+        }
     };
+
 } // namespace love
diff --git a/platform/cafe/source/driver/display/Framebuffer.cpp b/platform/cafe/source/driver/display/Framebuffer.cpp
@@ -32,12 +32,12 @@ namespace love
 
         if (this->id == GX2_SCAN_TARGET_TV)
         {
-            const auto mode = (GX2TVRenderMode)this->mode;
+            const auto mode = (GX2TVRenderMode)this->renderMode;
             GX2SetTVBuffer(this->scanBuffer, this->scanBufferSize, mode, FORMAT, BUFFER_MODE);
         }
         else
         {
-            const auto mode = (GX2DrcRenderMode)this->mode;
+            const auto mode = (GX2DrcRenderMode)this->renderMode;
             GX2SetDRCBuffer(this->scanBuffer, this->scanBufferSize, mode, FORMAT, BUFFER_MODE);
         }
 
@@ -98,7 +98,7 @@ namespace love
 
             GX2CalcTVSize(mode, FORMAT, BUFFER_MODE, &this->scanBufferSize, &unknown);
             GX2SetTVScale(info.width, info.height);
-            this->mode = mode;
+            this->renderMode = mode;
         }
         else
         {
@@ -107,10 +107,10 @@ namespace love
 
             GX2CalcDRCSize(mode, FORMAT, BUFFER_MODE, &this->scanBufferSize, &unknown);
             GX2SetDRCScale(info.width, info.height);
-            this->mode = mode;
+            this->renderMode = mode;
         }
 
-        this->id     = info.id;
+        this->id     = (GX2ScanTarget)info.id;
         this->width  = info.width;
         this->height = info.height;
 

diff --git a/platform/cafe/source/driver/display/GX2.cpp b/platform/cafe/source/driver/display/GX2.cpp
@@ -185,7 +185,7 @@ namespace love
     {
         if (!this->inFrame)
         {
-            // GX2SetContextState(this->state);
+            GX2SetContextState(this->state);
             this->inFrame = true;
         }
     }
@@ -223,7 +223,6 @@ namespace love
 
         if (bindingModified)
         {
-            // this->targets[love::currentScreen].useState();
             GX2SetColorBuffer(target, GX2_RENDER_TARGET_0);
             this->setMode(target->surface.width, target->surface.height);
         }
@@ -318,8 +317,8 @@ namespace love
             this->inFrame = false;
         }
 
-        if (Keyboard()->hasTextInput())
-            nn::swkbd::DrawDRC();
+        // if (Keyboard()->hasTextInput())
+        //     nn::swkbd::DrawDRC();
 
         for (auto& target : this->targets)
             target.copyScanBuffer();

diff --git a/platform/cafe/source/modules/graphics/Shader.cpp b/platform/cafe/source/modules/graphics/Shader.cpp
@@ -108,7 +108,7 @@ namespace love
 
         auto transform = graphics->getTransform();
 
-        GX2Invalidate(GX2_INVALIDATE_MODE_UNIFORM_BLOCK, uniform, sizeof(Uniform));
+        GX2Invalidate(INVALIDATE_UNIFORM_BLOCK, uniform, sizeof(Uniform));
         GX2SetVertexUniformBlock(this->uniform.location, sizeof(Uniform), uniform);
     }
 
@@ -119,18 +119,18 @@ namespace love
 
     void Shader::attach()
     {
-        // if (current != this)
-        // {
-        Graphics::flushBatchedDrawsGlobal();
+        if (current != this)
+        {
+            Graphics::flushBatchedDrawsGlobal();
 
-        GX2SetShaderMode(GX2_SHADER_MODE_UNIFORM_BLOCK);
+            GX2SetShaderMode(GX2_SHADER_MODE_UNIFORM_BLOCK);
 
-        GX2SetFetchShader(&this->program.fetchShader);
-        GX2SetVertexShader(this->program.vertexShader);
-        GX2SetPixelShader(this->program.pixelShader);
+            GX2SetFetchShader(&this->program.fetchShader);
+            GX2SetVertexShader(this->program.vertexShader);
+            GX2SetPixelShader(this->program.pixelShader);
 
-        current = this;
-        // }
+            current = this;
+        }
     }
 
     bool Shader::validate(const char* filepath, std::string& error)