switch primitives work

include/driver/graphics/DrawCommand.hpp

@@ -2,12 +2,12 @@
 
 #include "common/Exception.hpp"
 
+#include "driver/graphics/StreamBuffer.hpp"
+
 #include "modules/graphics/Shader.tcc"
 #include "modules/graphics/Texture.tcc"
 #include "modules/graphics/vertex.hpp"
 
-#include "driver/graphics/StreamBuffer.hpp"
-
 namespace love
 {
     struct BatchedDrawCommand

include/modules/graphics/Graphics.tcc

@@ -535,13 +535,7 @@ namespace love
             return this->states.back().lineJoin;
         }
 
-        void setPointSize(float size)
-        {
-            if (size != this->states.back().pointSize)
-                this->flushBatchedDraws();
-
-            this->states.back().pointSize = size;
-        }
+        virtual void setPointSize(float size) = 0;
 
         float getPointSize() const
         {

include/modules/graphics/Texture.tcc

@@ -312,7 +312,7 @@ namespace love
          * This is ONLY used on 3DS due to memory constraints.
          * The font textures are already on-device!
          */
-        virtual void setHandleData(void* data) = 0;
+        virtual void setHandleData(ptrdiff_t data) = 0;
 
         virtual void setSamplerState(const SamplerState& state) = 0;
 

include/modules/graphics/vertex.hpp

@@ -185,6 +185,7 @@ namespace love
         XYf_STf_RGBAf,  //< 2D position, 2D texture coordinates and 32-bit floating point RGBA color.
         XYf_STus_RGBAf, //< 2D position, 2D unsigned short texture coordinates and 32-bit floating point RGBA
                         // color.
+        XYf_RGBAf,
         XYf_STPf_RGBAf, //< 2D position, 3D texture coordinates and 32-bit floating point RGBA color.
     };
 

log.txt

@@ -0,0 +1,42 @@
+-- Updating Catnip cache
+-- Entering /d/lovepotion/build/main.release
+[1/6] Building CXX object CMakeFiles/lovepotion.dir/platform/hac/source/driver/display/deko.o
+D:/lovepotion/platform/hac/source/driver/display/deko.cpp: In constructor 'love::deko3d::deko3d()':
+D:/lovepotion/platform/hac/source/driver/display/deko.cpp:17:20: warning: 'void* memset(void*, int, size_t)' clearing an object of non-trivial type 'struct love::deko3d::Context'; use assignment or value-initialization instead [-Wclass-memaccess]
+   17 |         std::memset(&this->context, 0, sizeof(this->context));
+      |         ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In file included from D:/lovepotion/platform/hac/source/driver/display/deko.cpp:1:
+D:/lovepotion/platform/hac/include/driver/display/deko.hpp:225:16: note: 'struct love::deko3d::Context' declared here
+  225 |         struct Context : public ContextBase
+      |                ^~~~~~~
+D:/lovepotion/platform/hac/source/driver/display/deko.cpp: In member function 'virtual void love::deko3d::prepareDraw(love::GraphicsBase*)':
+D:/lovepotion/platform/hac/source/driver/display/deko.cpp:158:44: warning: unused parameter 'graphics' [-Wunused-parameter]
+  158 |     void deko3d::prepareDraw(GraphicsBase* graphics)
+      |                              ~~~~~~~~~~~~~~^~~~~~~~
+[2/6] Building CXX object CMakeFiles/lovepotion.dir/source/modules/love/love.o
+[3/6] Building CXX object CMakeFiles/lovepotion.dir/source/modules/window/wrap_Window.o
+[4/6] Linking CXX executable lovepotion.elf
+FAILED: lovepotion.elf lovepotion.lst lovepotion.map /d/lovepotion/build/main.release/lovepotion.lst /d/lovepotion/build/main.release/lovepotion.map 
+: && /opt/devkitpro/devkitA64/bin/aarch64-none-elf-g++.exe -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -ftls-model=local-exec -ffunction-sections -fdata-sections -D__SWITCH__ -g -O2 -DNDEBUG -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -ftls-model=local-exec -L/opt/devkitpro/libnx/lib -L/opt/devkitpro/portlibs/switch/lib -fPIE -specs=/opt/devkitpro/libnx/switch.specs    -Wl,-Map,/d/lovepotion/build/main.release/lovepotion.map CMakeFiles/lovepotion.dir/platform/hac/source/boot.o CMakeFiles/lovepotion.dir/platform/hac/source/common/screen.o CMakeFiles/lovepotion.dir/platform/hac/source/driver/audio/DigitalSound.o CMakeFiles/lovepotion.dir/platform/hac/source/driver/audio/MemoryPool.o CMakeFiles/lovepotion.dir/platform/hac/source/driver/display/deko3d/CIntrusiveTree.o CMakeFiles/lovepotion.dir/platform/hac/source/driver/display/deko3d/CMemPool.o CMakeFiles/lovepotion.dir/platform/hac/source/driver/display/Framebuffer.o CMakeFiles/lovepotion.dir/platform/hac/source/driver/display/deko.o CMakeFiles/lovepotion.dir/platform/hac/source/driver/EventQueue.o CMakeFiles/lovepotion.dir/platform/hac/source/modules/audio/Source.o CMakeFiles/lovepotion.dir/platform/hac/source/modules/graphics/Graphics.o CMakeFiles/lovepotion.dir/platform/hac/source/modules/graphics/Shader.o CMakeFiles/lovepotion.dir/platform/hac/source/modules/joystick/Joystick.o CMakeFiles/lovepotion.dir/platform/hac/source/modules/joystick/JoystickModule.o CMakeFiles/lovepotion.dir/platform/hac/source/modules/keyboard/Keyboard.o CMakeFiles/lovepotion.dir/platform/hac/source/modules/system/System.o CMakeFiles/lovepotion.dir/platform/hac/source/modules/timer/Timer.o CMakeFiles/lovepotion.dir/platform/hac/source/modules/window/Window.o CMakeFiles/lovepotion.dir/source/modules/image/magpie/ASTCHandler.o CMakeFiles/lovepotion.dir/source/modules/image/magpie/ddsHandler.o CMakeFiles/lovepotion.dir/source/modules/image/magpie/JPGHandler.o CMakeFiles/lovepotion.dir/source/modules/image/magpie/KTXHandler.o CMakeFiles/lovepotion.dir/source/modules/image/magpie/PKMHandler.o CMakeFiles/lovepotion.dir/source/modules/image/magpie/PNGHandler.o CMakeFiles/lovepotion.dir/source/modules/font/freetype/Font.o CMakeFiles/lovepotion.dir/source/modules/font/freetype/TrueTypeRasterizer.o CMakeFiles/lovepotion.dir/source/modules/graphics/freetype/Font.o CMakeFiles/lovepotion.dir/source/main.o CMakeFiles/lovepotion.dir/source/common/b64.o CMakeFiles/lovepotion.dir/source/common/Data.o CMakeFiles/lovepotion.dir/source/common/float.o CMakeFiles/lovepotion.dir/source/common/luax.o CMakeFiles/lovepotion.dir/source/common/Matrix.o CMakeFiles/lovepotion.dir/source/common/Message.o CMakeFiles/lovepotion.dir/source/common/Module.o CMakeFiles/lovepotion.dir/source/common/Object.o CMakeFiles/lovepotion.dir/source/common/pixelformat.o CMakeFiles/lovepotion.dir/source/common/Reference.o CMakeFiles/lovepotion.dir/source/common/Stream.o CMakeFiles/lovepotion.dir/source/common/types.o CMakeFiles/lovepotion.dir/source/common/Variant.o CMakeFiles/lovepotion.dir/source/utility/guid.o CMakeFiles/lovepotion.dir/source/modules/audio/Audio.o CMakeFiles/lovepotion.dir/source/modules/audio/Pool.o CMakeFiles/lovepotion.dir/source/modules/audio/Source.o CMakeFiles/lovepotion.dir/source/modules/audio/wrap_Audio.o CMakeFiles/lovepotion.dir/source/modules/audio/wrap_Source.o CMakeFiles/lovepotion.dir/source/modules/data/ByteData.o CMakeFiles/lovepotion.dir/source/modules/data/CompressedData.o CMakeFiles/lovepotion.dir/source/modules/data/DataModule.o CMakeFiles/lovepotion.dir/source/modules/data/DataStream.o CMakeFiles/lovepotion.dir/source/modules/data/DataView.o CMakeFiles/lovepotion.dir/source/modules/data/wrap_ByteData.o CMakeFiles/lovepotion.dir/source/modules/data/wrap_CompressedData.o CMakeFiles/lovepotion.dir/source/modules/data/wrap_Data.o CMakeFiles/lovepotion.dir/source/modules/data/wrap_DataModule.o CMakeFiles/lovepotion.dir/source/modules/data/wrap_DataView.o CMakeFiles/lovepotion.dir/source/modules/event/Event.o CMakeFiles/lovepotion.dir/source/modules/event/wrap_Event.o CMakeFiles/lovepotion.dir/source/modules/filesystem/FileData.o CMakeFiles/lovepotion.dir/source/modules/filesystem/wrap_File.o CMakeFiles/lovepotion.dir/source/modules/filesystem/wrap_FileData.o CMakeFiles/lovepotion.dir/source/modules/filesystem/wrap_Filesystem.o CMakeFiles/lovepotion.dir/source/modules/font/Font.o CMakeFiles/lovepotion.dir/source/modules/font/GlyphData.o CMakeFiles/lovepotion.dir/source/modules/font/Rasterizer.o CMakeFiles/lovepotion.dir/source/modules/font/TextShaper.o CMakeFiles/lovepotion.dir/source/modules/font/GenericShaper.o CMakeFiles/lovepotion.dir/source/modules/font/wrap_Font.o CMakeFiles/lovepotion.dir/source/modules/font/wrap_Rasterizer.o CMakeFiles/lovepotion.dir/source/modules/font/wrap_GlyphData.o CMakeFiles/lovepotion.dir/source/modules/graphics/Buffer.o CMakeFiles/lovepotion.dir/source/modules/graphics/Graphics.o CMakeFiles/lovepotion.dir/source/modules/graphics/FontBase.o CMakeFiles/lovepotion.dir/source/modules/graphics/Mesh.o CMakeFiles/lovepotion.dir/source/modules/graphics/Polyline.o CMakeFiles/lovepotion.dir/source/modules/graphics/wrap_Mesh.o CMakeFiles/lovepotion.dir/source/modules/graphics/TextBatch.o CMakeFiles/lovepotion.dir/source/modules/graphics/renderstate.o CMakeFiles/lovepotion.dir/source/modules/graphics/samplerstate.o CMakeFiles/lovepotion.dir/source/modules/graphics/Shader.o CMakeFiles/lovepotion.dir/source/modules/graphics/Quad.o CMakeFiles/lovepotion.dir/source/modules/graphics/Volatile.o CMakeFiles/lovepotion.dir/source/modules/graphics/vertex.o CMakeFiles/lovepotion.dir/source/modules/graphics/wrap_Graphics.o CMakeFiles/lovepotion.dir/source/modules/graphics/wrap_Texture.o CMakeFiles/lovepotion.dir/source/modules/graphics/wrap_TextBatch.o CMakeFiles/lovepotion.dir/source/modules/graphics/wrap_Font.o CMakeFiles/lovepotion.dir/source/modules/graphics/wrap_Quad.o CMakeFiles/lovepotion.dir/source/modules/graphics/Texture.o CMakeFiles/lovepotion.dir/source/modules/image/CompressedImageData.o CMakeFiles/lovepotion.dir/source/modules/image/CompressedSlice.o CMakeFiles/lovepotion.dir/source/modules/image/FormatHandler.o CMakeFiles/lovepotion.dir/source/modules/image/Image.o CMakeFiles/lovepotion.dir/source/modules/image/ImageData.o CMakeFiles/lovepotion.dir/source/modules/image/ImageDataBase.o CMakeFiles/lovepotion.dir/source/modules/image/wrap_CompressedImageData.o CMakeFiles/lovepotion.dir/source/modules/image/wrap_Image.o CMakeFiles/lovepotion.dir/source/modules/image/wrap_ImageData.o CMakeFiles/lovepotion.dir/source/modules/joystick/JoystickModule.o CMakeFiles/lovepotion.dir/source/modules/joystick/wrap_Joystick.o CMakeFiles/lovepotion.dir/source/modules/joystick/wrap_JoystickModule.o CMakeFiles/lovepotion.dir/source/modules/keyboard/wrap_Keyboard.o CMakeFiles/lovepotion.dir/source/modules/love/love.o CMakeFiles/lovepotion.dir/source/modules/math/BezierCurve.o CMakeFiles/lovepotion.dir/source/modules/math/MathModule.o CMakeFiles/lovepotion.dir/source/modules/math/RandomGenerator.o CMakeFiles/lovepotion.dir/source/modules/math/Transform.o CMakeFiles/lovepotion.dir/source/modules/math/wrap_BezierCurve.o CMakeFiles/lovepotion.dir/source/modules/math/wrap_MathModule.o CMakeFiles/lovepotion.dir/source/modules/math/wrap_RandomGenerator.o CMakeFiles/lovepotion.dir/source/modules/math/wrap_Transform.o CMakeFiles/lovepotion.dir/source/modules/sensor/Sensor.o CMakeFiles/lovepotion.dir/source/modules/sensor/wrap_Sensor.o CMakeFiles/lovepotion.dir/source/modules/sound/Decoder.o CMakeFiles/lovepotion.dir/source/modules/sound/Sound.o CMakeFiles/lovepotion.dir/source/modules/sound/SoundData.o CMakeFiles/lovepotion.dir/source/modules/sound/wrap_Decoder.o CMakeFiles/lovepotion.dir/source/modules/sound/wrap_Sound.o CMakeFiles/lovepotion.dir/source/modules/sound/wrap_SoundData.o CMakeFiles/lovepotion.dir/source/modules/system/wrap_System.o CMakeFiles/lovepotion.dir/source/modules/thread/Channel.o CMakeFiles/lovepotion.dir/source/modules/thread/LuaThread.o CMakeFiles/lovepotion.dir/source/modules/thread/Thread.o CMakeFiles/lovepotion.dir/source/modules/thread/Threadable.o CMakeFiles/lovepotion.dir/source/modules/thread/ThreadModule.o CMakeFiles/lovepotion.dir/source/modules/thread/wrap_Channel.o CMakeFiles/lovepotion.dir/source/modules/thread/wrap_LuaThread.o CMakeFiles/lovepotion.dir/source/modules/thread/wrap_Thread.o CMakeFiles/lovepotion.dir/source/modules/timer/wrap_Timer.o CMakeFiles/lovepotion.dir/source/modules/touch/Touch.o CMakeFiles/lovepotion.dir/source/modules/touch/wrap_Touch.o CMakeFiles/lovepotion.dir/source/modules/window/wrap_Window.o CMakeFiles/lovepotion.dir/source/modules/data/misc/Compressor.o CMakeFiles/lovepotion.dir/source/modules/data/misc/HashFunction.o CMakeFiles/lovepotion.dir/source/modules/filesystem/physfs/File.o CMakeFiles/lovepotion.dir/source/modules/filesystem/physfs/Filesystem.o CMakeFiles/lovepotion.dir/source/modules/sound/lullaby/FLACDecoder.o CMakeFiles/lovepotion.dir/source/modules/sound/lullaby/ModPlugDecoder.o CMakeFiles/lovepotion.dir/source/modules/sound/lullaby/MP3Decoder.o CMakeFiles/lovepotion.dir/source/modules/sound/lullaby/VorbisDecoder.o CMakeFiles/lovepotion.dir/source/modules/sound/lullaby/WaveDecoder.o -o lovepotion.elf  -ldeko3d  /opt/devkitpro/portlibs/switch/lib/libfreetype.a  -lbz2  -lpng  -lturbojpeg  libddsparse.a  liblove_physfs.a  libwuff.a  libnoise1234.a  -lvorbisidec  -lz  libluabit.a  liblua53.a  -logg  -lmodplug  liblua-https.a  libluasocket.a  /opt/devkitpro/portlibs/switch/lib/liblz4.a  /opt/devkitpro/portlibs/switch/lib/libcurl.a  /opt/devkitpro/libnx/lib/libnx.a  /opt/devkitpro/portlibs/switch/lib/libz.a  /opt/devkitpro/libnx/lib/libnx.a  /opt/devkitpro/portlibs/switch/lib/libz.a  /opt/devkitpro/portlibs/switch/lib/liblua5.1.a  /opt/devkitpro/devkitA64/aarch64-none-elf/lib/pic/libm.a  -lnx -lm && /bin/sh CMakeFiles/lovepotion.dir/post-build.sh 62f60396062a37ea
+C:/msys64/opt/devkitpro/devkitA64/bin/../lib/gcc/aarch64-none-elf/14.2.0/../../../../aarch64-none-elf/bin/ld.exe: CMakeFiles/lovepotion.dir/platform/hac/source/modules/graphics/Graphics.o:(.data.rel.ro._ZTVN4love8GraphicsE[_ZTVN4love8GraphicsE]+0x40): undefined reference to `love::Graphics::newTexture(love::TextureBase::Settings const&, love::TextureBase::Slices const*)'
+C:/msys64/opt/devkitpro/devkitA64/bin/../lib/gcc/aarch64-none-elf/14.2.0/../../../../aarch64-none-elf/bin/ld.exe: CMakeFiles/lovepotion.dir/platform/hac/source/modules/graphics/Graphics.o:(.data.rel.ro._ZTVN4love8GraphicsE[_ZTVN4love8GraphicsE]+0x48): undefined reference to `love::Graphics::newFont(love::Rasterizer*)'
+C:/msys64/opt/devkitpro/devkitA64/bin/../lib/gcc/aarch64-none-elf/14.2.0/../../../../aarch64-none-elf/bin/ld.exe: CMakeFiles/lovepotion.dir/platform/hac/source/modules/graphics/Graphics.o:(.data.rel.ro._ZTVN4love8GraphicsE[_ZTVN4love8GraphicsE]+0x50): undefined reference to `love::Graphics::newDefaultFont(int, love::Rasterizer::Settings const&)'
+C:/msys64/opt/devkitpro/devkitA64/bin/../lib/gcc/aarch64-none-elf/14.2.0/../../../../aarch64-none-elf/bin/ld.exe: CMakeFiles/lovepotion.dir/platform/hac/source/modules/graphics/Graphics.o:(.data.rel.ro._ZTVN4love8GraphicsE[_ZTVN4love8GraphicsE]+0xb0): undefined reference to `love::Graphics::setRenderTargetsInternal(love::GraphicsBase::RenderTargets const&, int, int, bool)'
+C:/msys64/opt/devkitpro/devkitA64/bin/../lib/gcc/aarch64-none-elf/14.2.0/../../../../aarch64-none-elf/bin/ld.exe: CMakeFiles/lovepotion.dir/platform/hac/source/modules/graphics/Graphics.o:(.data.rel.ro._ZTVN4love8GraphicsE[_ZTVN4love8GraphicsE]+0xb8): undefined reference to `love::Graphics::isPixelFormatSupported(love::PixelFormat, unsigned int)'
+C:/msys64/opt/devkitpro/devkitA64/bin/../lib/gcc/aarch64-none-elf/14.2.0/../../../../aarch64-none-elf/bin/ld.exe: CMakeFiles/lovepotion.dir/source/modules/graphics/wrap_Texture.o: in function `Wrap_Texture::setDepthSampleMode(lua_State*)':
+D:/lovepotion/source/modules/graphics/wrap_Texture.cpp:370:(.text._ZN12Wrap_Texture18setDepthSampleModeEP9lua_State+0xf4): undefined reference to `love::Texture::setSamplerState(love::SamplerState const&)'
+C:/msys64/opt/devkitpro/devkitA64/bin/../lib/gcc/aarch64-none-elf/14.2.0/../../../../aarch64-none-elf/bin/ld.exe: CMakeFiles/lovepotion.dir/source/modules/graphics/wrap_Texture.o: in function `Wrap_Texture::setWrap(lua_State*)':
+D:/lovepotion/source/modules/graphics/wrap_Texture.cpp:261:(.text._ZN12Wrap_Texture7setWrapEP9lua_State+0x1bc): undefined reference to `love::Texture::setSamplerState(love::SamplerState const&)'
+C:/msys64/opt/devkitpro/devkitA64/bin/../lib/gcc/aarch64-none-elf/14.2.0/../../../../aarch64-none-elf/bin/ld.exe: CMakeFiles/lovepotion.dir/source/modules/graphics/wrap_Texture.o: in function `Wrap_Texture::setMipmapFilter(lua_State*)':
+D:/lovepotion/source/modules/graphics/wrap_Texture.cpp:219:(.text._ZN12Wrap_Texture15setMipmapFilterEP9lua_State+0x7c): undefined reference to `love::Texture::setSamplerState(love::SamplerState const&)'
+C:/msys64/opt/devkitpro/devkitA64/bin/../lib/gcc/aarch64-none-elf/14.2.0/../../../../aarch64-none-elf/bin/ld.exe: CMakeFiles/lovepotion.dir/source/modules/graphics/wrap_Texture.o: in function `Wrap_Texture::setFilter(lua_State*)':
+D:/lovepotion/source/modules/graphics/wrap_Texture.cpp:175:(.text._ZN12Wrap_Texture9setFilterEP9lua_State+0x170): undefined reference to `love::Texture::setSamplerState(love::SamplerState const&)'
+collect2.exe: error: ld returned 1 exit status
+ninja: build stopped: subcommand failed.
+CMake Error at /opt/devkitpro/cmake/Catnip/Verb-Build.cmake:91 (message):
+  Failed to build main.release
+Call Stack (most recent call first):
+  /opt/devkitpro/cmake/Catnip/Verb-Build.cmake:102 (__catnip_build)
+  /opt/devkitpro/cmake/catnip-main.cmake:11 (include)
+
+

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

@@ -34,6 +34,8 @@ namespace love
 
         virtual void setBlendState(const BlendState& state) override;
 
+        virtual void setPointSize(float size) override;
+
         virtual FontBase* newFont(Rasterizer* data) override;
 
         virtual FontBase* newDefaultFont(int size, const Rasterizer::Settings& settings) override;

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

@@ -208,6 +208,14 @@ namespace love
         state.scissorRect = scissor;
     }
 
+    void Graphics::setPointSize(float size)
+    {
+        if (size != this->states.back().pointSize)
+            this->flushBatchedDraws();
+
+        this->states.back().pointSize = size;
+    }
+
     void Graphics::setScissor()
     {
         if (this->states.back().scissor)

platform/ctr/include/modules/graphics/Graphics.hpp

@@ -31,6 +31,14 @@ namespace love
 
         virtual void setColorMask(ColorChannelMask mask) override;
 
+        virtual void setPointSize(float size) override
+        {
+            if (size != this->states.back().pointSize)
+                this->flushBatchedDraws();
+
+            this->states.back().pointSize = size;
+        }
+
         virtual void setBlendState(const BlendState& state) override;
 
         virtual FontBase* newFont(Rasterizer* data) override;

platform/ctr/include/modules/graphics/Texture.hpp

@@ -32,9 +32,9 @@ namespace love
 
         void generateMipmapsInternal() override;
 
-        void setHandleData(void* data) override
+        void setHandleData(ptrdiff_t data) override
         {
-            this->texture->data = data;
+            this->texture->data = (void*)data;
         }
 
         // bool validateDimensions(bool throwException) const;

platform/hac/CMakeLists.txt

@@ -35,9 +35,12 @@ source/driver/display/deko3d/CIntrusiveTree.cpp
 source/driver/display/deko3d/CMemPool.cpp
 source/driver/display/Framebuffer.cpp
 source/driver/display/deko.cpp
+source/driver/graphics/StreamBuffer.cpp
 source/driver/EventQueue.cpp
 source/modules/audio/Source.cpp
 source/modules/graphics/Graphics.cpp
+source/modules/graphics/Shader.cpp
+source/modules/graphics/Texture.cpp
 source/modules/joystick/Joystick.cpp
 source/modules/joystick/JoystickModule.cpp
 source/modules/keyboard/Keyboard.cpp