[PICA] More textoor

include/colour.hpp

@@ -0,0 +1,13 @@
+#pragma once
+#include "helpers.hpp"
+
+// Helpers functions for converting colour channels between bit depths
+namespace Colour {
+    inline static u8 convert4To8Bit(u8 c) {
+        return (c << 4) | c;
+    }
+
+    inline static u8 convert5To8Bit(u8 c) {
+        return (c << 3) | (c >> 2);
+    }
+}

include/renderer_gl/renderer_gl.hpp

@@ -45,6 +45,7 @@ class Renderer {
 	const std::array<u32, regNum>& regs;
 
 	OpenGL::Framebuffer getColourFBO();
+	OpenGL::Texture getTexture(Texture& tex);
 
 	MAKE_LOG_FUNCTION(log, rendererLogger)
 

include/renderer_gl/surface_cache.hpp

@@ -41,7 +41,7 @@ public:
     }
 
     // Adds a surface object to the cache and returns it
-    SurfaceType add(SurfaceType& surface) {
+    SurfaceType add(const SurfaceType& surface) {
         if (size >= capacity) {
             Helpers::panic("Surface cache full! Add emptying!");
         }

include/renderer_gl/textures.hpp

@@ -55,9 +55,12 @@ struct Texture {
     }
 
     void allocate();
+    void decodeTexture(void* data);
     void free();
     u64 sizeInBytes();
 
+    u32 decodeTexel(u32 u, u32 v, Formats fmt, void* data);
+
     // Get the morton interleave offset of a texel based on its U and V values
     static u32 mortonInterleave(u32 u, u32 v);
     // Get the byte offset of texel (u, v) in the texture