push some changes

platform/cafe/include/driver/display/GX2.hpp

@@ -5,9 +5,9 @@
 
 #include "driver/display/Framebuffer.hpp"
 #include "driver/display/Renderer.tcc"
+#include "driver/display/Uniform.hpp"
 
 #include "modules/graphics/vertex.hpp"
-
 #include <gx2/enum.h>
 #include <gx2/sampler.h>
 #include <gx2/texture.h>
@@ -180,6 +180,8 @@ namespace love
             GX2ColorBuffer* boundFramebuffer = nullptr;
         } context;
 
+        Uniform* uniform;
+
         bool inForeground;
 
         void* commandBuffer;

platform/cafe/include/driver/display/Uniform.hpp

@@ -5,10 +5,14 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
+#include "utility/logfile.hpp"
+
 namespace love
 {
-    static void updateGlmMatrix(glm::mat4& out, const glm::mat4& matrix)
+    static glm::mat4 updateMatrix(const glm::mat4& matrix)
     {
+        glm::mat4 out(1.0f);
+
         unsigned int* destination  = (unsigned int*)glm::value_ptr(out);
         const unsigned int* source = (const unsigned int*)glm::value_ptr(matrix);
 
@@ -17,7 +21,7 @@ namespace love
         for (size_t i = 0; i < count; i++)
             destination[i] = __builtin_bswap32(source[i]);
 
-        out = glm::make_mat4(destination);
+        return glm::make_mat4(destination);
     }
 
     struct Uniform
@@ -28,9 +32,7 @@ namespace love
       public:
         Uniform()
         {
-            updateGlmMatrix(this->modelView, glm::mat4(1.0f));
+            this->modelView = updateMatrix(glm::mat4(1.0f));
         }
     };
-
-    static Uniform* uniform;
 } // namespace love

platform/cafe/include/driver/graphics/StreamBuffer.hpp

@@ -48,7 +48,7 @@ namespace love
             else
                 info.data = &this->data[this->index];
 
-            info.size = this->bufferSize;
+            info.size = this->bufferSize - this->frameGPUReadOffset;
             return info;
         }
 

platform/cafe/include/modules/graphics/Shader.hpp

@@ -25,7 +25,7 @@ namespace love
 
         ptrdiff_t getHandle() const override;
 
-        void updateBuiltinUniforms(GraphicsBase* graphics);
+        void updateBuiltinUniforms(GraphicsBase* graphics, Uniform* uniform);
 
         uint32_t getPixelSamplerLocation(int index);
 

platform/cafe/source/driver/display/GX2.cpp

@@ -32,6 +32,8 @@ namespace love
 
         GX2Shutdown();
 
+        delete this->uniform;
+
         free(this->state);
         this->state = nullptr;
 
@@ -137,7 +139,8 @@ namespace love
         this->context.depthWrite  = false;
         this->context.compareMode = GX2_COMPARE_FUNC_ALWAYS;
 
-        uniform = (Uniform*)std::aligned_alloc(0x100, sizeof(Uniform));
+        this->uniform = new (std::align_val_t(0x100)) Uniform();
+
         this->bindFramebuffer(&this->targets[0].get());
 
         this->initialized = true;
@@ -257,7 +260,7 @@ namespace love
         if ((Shader*)ShaderBase::current != nullptr)
         {
             auto* shader = (Shader*)ShaderBase::current;
-            shader->updateBuiltinUniforms(graphics);
+            shader->updateBuiltinUniforms(graphics, this->uniform);
         }
     }
 
@@ -324,7 +327,7 @@ namespace love
         GX2SetViewport(x, y, width, height, Framebuffer::Z_NEAR, Framebuffer::Z_FAR);
 
         auto ortho = glm::ortho(x, width, height, y, (int)Framebuffer::Z_NEAR, (int)Framebuffer::Z_FAR);
-        updateGlmMatrix(love::uniform->projection, ortho);
+        this->uniform->projection = updateMatrix(ortho);
 
         this->context.viewport = viewport;
     }

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

@@ -10,6 +10,8 @@
 #include <gx2/draw.h>
 #include <gx2r/draw.h>
 
+#include "utility/logfile.hpp"
+
 namespace love
 {
     Graphics::Graphics() : GraphicsBase("love.graphics.gx2")
@@ -273,7 +275,6 @@ namespace love
         else
             gx2.bindFramebuffer((GX2ColorBuffer*)targets.getFirstTarget().texture->getRenderTargetHandle());
 
-        bool tilt = isWindow ? true : false;
         gx2.setViewport({ 0, 0, pixelWidth, pixelHeight });
 
         if (state.scissor)
@@ -379,8 +380,8 @@ namespace love
 
         const auto mode      = GX2::getPrimitiveType(command.primitiveType);
         const auto indexType = GX2::getIndexType(command.indexType);
-
-        GX2DrawIndexedEx(mode, command.indexCount, indexType, buffer, offset, command.instanceCount);
+        LOG("{:d}", (int)indexType);
+        GX2DrawIndexedEx(mode, command.indexCount, indexType, &buffer[offset], 0, command.instanceCount);
 
         ++this->drawCalls;
     }

platform/cafe/source/modules/graphics/Shader.cpp

@@ -70,13 +70,13 @@ namespace love
         return this->program.pixelShader->samplerVars[index].location;
     }
 
-    void Shader::updateBuiltinUniforms(GraphicsBase* graphics)
+    void Shader::updateBuiltinUniforms(GraphicsBase* graphics, Uniform* uniform)
     {
         if (current != this)
             return;
 
-        GX2Invalidate(INVALIDATE_UNIFORM_BLOCK, (void*)&love::uniform, sizeof(Uniform));
-        GX2SetVertexUniformBlock(1, sizeof(Uniform), (const void*)&love::uniform);
+        GX2Invalidate(INVALIDATE_UNIFORM_BLOCK, (void*)uniform, sizeof(Uniform));
+        GX2SetVertexUniformBlock(1, sizeof(Uniform), (const void*)uniform);
     }
 
     ptrdiff_t Shader::getHandle() const