fix switch and wii u building locally

lovebrew · Aug 27, 2023 · 1725536 · 1725536
1 parent a530dde
commit 1725536
Show file tree

Hide file tree

Showing 26 changed files with 190 additions and 654 deletions.
diff --git a/include/modules/font/fontmodule.tcc b/include/modules/font/fontmodule.tcc
@@ -30,6 +30,6 @@ namespace love
         }
 
       protected:
-        StrongReference<Object> defaultFontData;
+        StrongReference<Data> defaultFontData;
     };
 } // namespace love
diff --git a/include/objects/font/font.tcc b/include/objects/font/font.tcc
@@ -13,6 +13,8 @@
 #include <utilities/driver/renderer/vertex.hpp>
 
 #include <objects/rasterizer/rasterizer.tcc>
+#include <objects/texture/texture.tcc>
+
 #include <vector>
 
 namespace love
@@ -62,7 +64,7 @@ namespace love
             int height;
         };
 
-        template<typename Tex, size_t N>
+        template<typename Tex = Texture<Console::Which>, size_t N = 4>
         struct Glyph
         {
             Tex* texture;
@@ -72,7 +74,7 @@ namespace love
             int sheet;
         };
 
-        template<typename Tex>
+        template<typename Tex = Texture<Console::Which>>
         struct DrawCommand
         {
             Tex* texture;

diff --git a/include/utilities/driver/renderer/drawbuffer.tcc b/include/utilities/driver/renderer/drawbuffer.tcc
diff --git a/include/utilities/driver/renderer/drawcommand.tcc b/include/utilities/driver/renderer/drawcommand.tcc
@@ -3,7 +3,7 @@
 #include <common/console.hpp>
 #include <common/vector.hpp>
 
-#include <objects/shader/shader.tcc>
+#include <objects/shader_ext.hpp>
 #include <objects/texture/texture.tcc>
 
 #include <utilities/driver/renderer/vertex.hpp>

diff --git a/include/utilities/driver/renderer/vertex.hpp b/include/utilities/driver/renderer/vertex.hpp
@@ -62,11 +62,6 @@ namespace love
 
         static constexpr size_t VERTEX_SIZE = sizeof(Vertex);
 
-        static inline uint16_t normto16t(float in)
-        {
-            return uint16_t(in * 0xFFFF);
-        }
-
         // clang-format off
         static constexpr BidirectionalMap cullModes = {
             "none",  CULL_NONE,

diff --git a/platform/cafe/include/objects/font_ext.hpp b/platform/cafe/include/objects/font_ext.hpp
@@ -13,13 +13,6 @@ namespace love
     class Font<Console::CAFE> : public Font<Console::ALL>
     {
       public:
-        struct DrawCommand
-        {
-            Texture<Console::CAFE>* texture;
-            int start;
-            int count;
-        };
-
         Font(Rasterizer<Console::CAFE>* rasterizer, const SamplerState& state);
 
         virtual ~Font()
@@ -88,31 +81,24 @@ namespace love
             return 0.0f;
         }
 
-        std::vector<DrawCommand> GenerateVertices(const ColoredCodepoints& codepoints,
-                                                  const Color& color,
-                                                  std::vector<vertex::Vertex>& vertices,
-                                                  float extraSpacing = 0.0f, Vector2 offset = {},
-                                                  TextInfo* info = nullptr);
+        std::vector<DrawCommand<>> GenerateVertices(const ColoredCodepoints& codepoints,
+                                                    const Color& color,
+                                                    std::vector<vertex::Vertex>& vertices,
+                                                    float extraSpacing = 0.0f, Vector2 offset = {},
+                                                    TextInfo* info = nullptr);
 
-        std::vector<DrawCommand> GenerateVerticesFormatted(const ColoredCodepoints& codepoints,
-                                                           const Color& color, float wrap,
-                                                           AlignMode align,
-                                                           std::vector<vertex::Vertex>& vertices,
-                                                           TextInfo* info = nullptr);
+        std::vector<DrawCommand<>> GenerateVerticesFormatted(const ColoredCodepoints& codepoints,
+                                                             const Color& color, float wrap,
+                                                             AlignMode align,
+                                                             std::vector<vertex::Vertex>& vertices,
+                                                             TextInfo* info = nullptr);
 
         uint32_t GetTextureCacheID() const
         {
             return this->textureCacheID;
         }
 
       private:
-        struct Glyph
-        {
-            Texture<Console::CAFE>* texture;
-            int spacing;
-            vertex::Vertex vertices[4];
-        };
-
         struct TextureSize
         {
             int width;
@@ -140,12 +126,12 @@ namespace love
 
         GlyphData* GetRasterizerGlyphData(uint32_t glyph, float& dpiScale);
 
-        const Glyph& AddGlyph(uint32_t glyph);
+        const Glyph<>& AddGlyph(uint32_t glyph);
 
-        const Glyph& FindGlyph(uint32_t glyph);
+        const Glyph<>& FindGlyph(uint32_t glyph);
 
         void Printv(Graphics<Console::CAFE>& graphics, const Matrix4<Console::CAFE>& transform,
-                    const std::vector<DrawCommand>& drawCommands,
+                    const std::vector<DrawCommand<>>& drawCommands,
                     const std::vector<vertex::Vertex>& vertices);
 
         int textureX;
@@ -159,7 +145,7 @@ namespace love
 
         std::vector<StrongReference<Texture<Console::CAFE>>> textures;
 
-        std::unordered_map<uint32_t, Glyph> glyphs;
+        std::unordered_map<uint32_t, Glyph<>> glyphs;
         std::unordered_map<uint64_t, float> kernings;
 
         std::vector<StrongRasterizer> rasterizers;

diff --git a/platform/cafe/include/objects/textbatch_ext.hpp b/platform/cafe/include/objects/textbatch_ext.hpp
@@ -47,7 +47,7 @@ namespace love
             Matrix4<Console::CAFE> matrix;
         };
 
-        std::vector<Font<Console::CAFE>::DrawCommand> drawCommands;
+        std::vector<Font<Console::CAFE>::DrawCommand<>> drawCommands;
         std::vector<TextData> textData;
         size_t vertexOffset;
         std::vector<vertex::Vertex> vertexBuffer;

diff --git a/platform/cafe/include/utilities/driver/buffer.hpp b/platform/cafe/include/utilities/driver/buffer.hpp