Add PICA texel-format and topology types

Slowly stepping the codebase towards having renderer-agnostic types and keeping the translation of PICA-types to OpenGL/VK/DX/Software/etc to the renderer-backend.

include/PICA/regs.hpp

@@ -127,4 +127,51 @@ namespace PICAInternalRegs {
 		VertexShaderOpDescriptorData6 = 0x2DC,
 		VertexShaderOpDescriptorData7 = 0x2DD,
 	};
-}
+}
+
+enum class PICAColorFmt : u32 {
+	RGBA8 = 0,
+	BGR8 = 1,
+	RGB5A1 = 2,
+	RGB565 = 3,
+	RGBA4 = 4,
+
+	// Technically selectable, but their function is unknown
+	Unknown5 = 5,
+	Unknown6 = 6,
+	Unknown7 = 7,
+};
+
+enum class PICADepthFmt : u32 {
+	Depth16 = 0,
+	Unknown1 = 1,  // Technically selectable, but function is unknown
+	Depth24 = 2,
+	Depth24Stencil8 = 3,
+};
+
+// Size occupied by each pixel in bytes
+
+// All formats are 16BPP except for RGBA8 (32BPP) and BGR8 (24BPP)
+inline constexpr usize sizePerPixel(PICAColorFmt format) {
+	switch (format) {
+		case PICAColorFmt::BGR8: return 3;
+		case PICAColorFmt::RGBA8: return 4;
+		default: return 2;
+	}
+}
+
+inline constexpr usize sizePerPixel(PICADepthFmt format) {
+	switch (format) {
+		case PICADepthFmt::Depth16: return 2;
+		case PICADepthFmt::Depth24: return 3;
+		case PICADepthFmt::Depth24Stencil8: return 4;
+		default: return 1;  // Invalid format
+	}
+}
+
+enum class PICAPrimType : u32 {
+	TriangleList = 0,
+	TriangleStrip = 1,
+	TriangleFan = 2,
+	GeometryPrimitive = 3,
+};

include/renderer_gl/renderer_gl.hpp

@@ -7,6 +7,7 @@
 #include "opengl.hpp"
 #include "surface_cache.hpp"
 #include "textures.hpp"
+#include "PICA/regs.hpp"
 
 // More circular dependencies!
 class GPU;
@@ -46,11 +47,11 @@ class Renderer {
 	OpenGL::uvec2 fbSize;  // The size of the framebuffer (ie both the colour and depth buffer)'
 
 	u32 colourBufferLoc;                       // Location in 3DS VRAM for the colour buffer
-	ColourBuffer::Formats colourBufferFormat;  // Format of the colours stored in the colour buffer
+	PICAColorFmt colourBufferFormat;  // Format of the colours stored in the colour buffer
 
 	// Same for the depth/stencil buffer
 	u32 depthBufferLoc;
-	DepthBuffer::Formats depthBufferFormat;
+	PICADepthFmt depthBufferFormat;
 
 	// Dummy VAO/VBO for blitting the final output
 	OpenGL::VertexArray dummyVAO;
@@ -75,23 +76,19 @@ class Renderer {
 	void getGraphicsContext();                                                                      // Set up graphics context for rendering
 	void clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 control);                     // Clear a GPU buffer in VRAM
 	void displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u32 outputSize, u32 flags);  // Perform display transfer
-	void drawVertices(OpenGL::Primitives primType, std::span<const Vertex> vertices);               // Draw the given vertices
+	void drawVertices(PICAPrimType primType, std::span<const Vertex> vertices);               // Draw the given vertices
 
 	void setFBSize(u32 width, u32 height) {
 		fbSize.x() = width;
 		fbSize.y() = height;
 	}
 
-	void setColourFormat(ColourBuffer::Formats format) { colourBufferFormat = format; }
-	void setColourFormat(u32 format) { colourBufferFormat = static_cast<ColourBuffer::Formats>(format); }
-
-	void setDepthFormat(DepthBuffer::Formats format) { depthBufferFormat = format; }
-	void setDepthFormat(u32 format) {
-		if (format == 1) {
+	void setColourFormat(PICAColorFmt format) { colourBufferFormat = format; }
+	void setDepthFormat(PICADepthFmt format) {
+		if (format == PICADepthFmt::Unknown1) {
 			Helpers::panic("[PICA] Undocumented depth-stencil mode!");
 		}
-
-		depthBufferFormat = static_cast<DepthBuffer::Formats>(format);
+		depthBufferFormat = format;
 	}
 
 	void setColourBufferLoc(u32 loc) { colourBufferLoc = loc; }

include/renderer_gl/surfaces.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include "PICA/regs.hpp"
 #include "boost/icl/interval.hpp"
 #include "helpers.hpp"
 #include "opengl.hpp"
@@ -7,18 +8,8 @@ template <typename T>
 using Interval = boost::icl::right_open_interval<T>;
 
 struct ColourBuffer {
-    enum class Formats : u32 {
-        RGBA8 = 0,
-        BGR8 = 1,
-        RGB5A1 = 2,
-        RGB565 = 3,
-        RGBA4 = 4,
-        
-        Trash1 = 5, Trash2 = 6, Trash3 = 7 // Technically selectable, but their function is unknown
-    };
-
     u32 location;
-    Formats format;
+    PICAColorFmt format;
     OpenGL::uvec2 size;
     bool valid;
 
@@ -30,7 +21,7 @@ struct ColourBuffer {
 
     ColourBuffer() : valid(false) {}
 
-    ColourBuffer(u32 loc, Formats format, u32 x, u32 y, bool valid = true)
+    ColourBuffer(u32 loc, PICAColorFmt format, u32 x, u32 y, bool valid = true)
         : location(loc), format(format), size({x, y}), valid(valid) {
 
         u64 endLoc = (u64)loc + sizeInBytes();
@@ -78,31 +69,14 @@ struct ColourBuffer {
             size.x() == other.size.x() && size.y() == other.size.y();
     }
 
-    // Size occupied by each pixel in bytes
-    // All formats are 16BPP except for RGBA8 (32BPP) and BGR8 (24BPP)
-    size_t sizePerPixel() {
-        switch (format) {
-            case Formats::BGR8: return 3;
-            case Formats::RGBA8: return 4;
-            default: return 2;
-        }
-    }
-
     size_t sizeInBytes() {
-        return (size_t)size.x() * (size_t)size.y() * sizePerPixel();
+        return (size_t)size.x() * (size_t)size.y() * sizePerPixel(format);
     }
 };
 
 struct DepthBuffer {
-    enum class Formats : u32 {
-        Depth16 = 0,
-        Garbage = 1,
-        Depth24 = 2,
-        Depth24Stencil8 = 3
-    };
-
     u32 location;
-    Formats format;
+    PICADepthFmt format;
     OpenGL::uvec2 size; // Implicitly set to the size of the framebuffer
     bool valid;
 
@@ -113,7 +87,7 @@ struct DepthBuffer {
 
     DepthBuffer() : valid(false) {}
 
-    DepthBuffer(u32 loc, Formats format, u32 x, u32 y, bool valid = true) :
+    DepthBuffer(u32 loc, PICADepthFmt format, u32 x, u32 y, bool valid = true) :
         location(loc), format(format), size({x, y}), valid(valid) {
 
         u64 endLoc = (u64)loc + sizeInBytes();
@@ -122,7 +96,7 @@ struct DepthBuffer {
     }
 
     bool hasStencil() {
-        return format == Formats::Depth24Stencil8;
+        return format == PICADepthFmt::Depth24Stencil8;
     }
 
     void allocate() {
@@ -167,18 +141,7 @@ struct DepthBuffer {
             size.x() == other.size.x() && size.y() == other.size.y();
     }
 
-    // Size occupied by each pixel in bytes
-    size_t sizePerPixel() {
-        switch (format) {
-            case Formats::Depth16: return 2;
-            case Formats::Depth24: return 3;
-            case Formats::Depth24Stencil8: return 4;
-
-            default: return 1; // Invalid format
-        }
-    }
-
     size_t sizeInBytes() {
-        return (size_t)size.x() * (size_t)size.y() * sizePerPixel();
+        return (size_t)size.x() * (size_t)size.y() * sizePerPixel(format);
     }
 };