From 413c6d7d0672749b5f2ea610613a3800b4e6c272 Mon Sep 17 00:00:00 2001
From: Kai Blaschke <kai.blaschke@kb-dev.net>
Date: Tue, 11 Nov 2025 15:18:42 +0100
Subject: [PATCH 1/2] Set correct primitive type (triangle strip) for user
 sprites

---
 src/libprojectM/UserSprites/MilkdropSprite.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libprojectM/UserSprites/MilkdropSprite.cpp b/src/libprojectM/UserSprites/MilkdropSprite.cpp
index a5edd67ee3..aa5c4bf49b 100644
--- a/src/libprojectM/UserSprites/MilkdropSprite.cpp
+++ b/src/libprojectM/UserSprites/MilkdropSprite.cpp
@@ -28,6 +28,7 @@ namespace UserSprites {
 MilkdropSprite::MilkdropSprite()
     : m_mesh(Renderer::VertexBufferUsage::DynamicDraw, false, true)
 {
+    m_mesh.SetRenderPrimitiveType(Renderer::Mesh::PrimitiveType::TriangleStrip);
     m_mesh.SetVertexCount(4);
 }
 

From 5158ecbf7a50a60dbac260d09f417de02a95c2d4 Mon Sep 17 00:00:00 2001
From: Kai Blaschke <kai.blaschke@kb-dev.net>
Date: Tue, 11 Nov 2025 15:39:43 +0100
Subject: [PATCH 2/2] Load image file and create texture separately with SOIL2

The new combined function no longer returns the image size, so we need to load the image ourselves, store the size and then pass the buffer to SOIL_create_OGL_texture().
---
 src/libprojectM/Renderer/TextureManager.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/libprojectM/Renderer/TextureManager.cpp b/src/libprojectM/Renderer/TextureManager.cpp
index 858c7b7790..ebed793baf 100644
--- a/src/libprojectM/Renderer/TextureManager.cpp
+++ b/src/libprojectM/Renderer/TextureManager.cpp
@@ -212,13 +212,23 @@ auto TextureManager::LoadTexture(const ScannedFile& file) -> std::shared_ptr<Tex
 
     int width{};
     int height{};
+    int channels{};
 
-    unsigned int const tex = SOIL_load_OGL_texture(
-        file.filePath.c_str(),
-        SOIL_LOAD_RGBA,
+    std::unique_ptr<unsigned char, decltype(&SOIL_free_image_data)> imageData(SOIL_load_image(file.filePath.c_str(), &width, &height, &channels, SOIL_LOAD_RGBA), SOIL_free_image_data);
+
+    if (imageData == nullptr)
+    {
+        return {};
+    }
+
+    unsigned int const tex = SOIL_create_OGL_texture(
+        imageData.get(),
+        &width, &height, SOIL_LOAD_RGBA,
         SOIL_CREATE_NEW_ID,
         SOIL_FLAG_MULTIPLY_ALPHA);
 
+    imageData.reset();
+
     if (tex == 0)
     {
         return {};