Raise clang-format column size, make std::span support in opengl.hpp version-dependent

.clang-format

@@ -1,6 +1,6 @@
 BasedOnStyle: Google
 IndentWidth: 4
-ColumnLimit: 120
+ColumnLimit: 150
 AccessModifierOffset: -2
 TabWidth: 4
 NamespaceIndentation: All

include/opengl.hpp

@@ -23,7 +23,6 @@
 #include <functional>
 #include <initializer_list>
 #include <iostream>
-#include <span>
 #include <stdexcept>
 #include <string_view>
 #include <type_traits>
@@ -31,6 +30,19 @@
 
 #include "gl3w.h"
 
+// Check if we have C++20. If yes, we can add C++20 std::span support
+#ifdef _MSVC_LANG // MSVC does not properly define __cplusplus without a compiler flag...
+#if _MSVC_LANG >= 202002L
+#define OPENGL_HAVE_CPP20
+#endif
+#elif __cplusplus >= 202002L
+#define OPENGL_HAVE_CPP20
+#endif // MSVC_LANG
+
+#ifdef OPENGL_HAVE_CPP20
+#include <span>
+#endif
+
 // Uncomment the following define if you want GL objects to automatically free themselves when their lifetime ends
 // #define OPENGL_DESTRUCTORS
 
@@ -389,17 +401,30 @@ namespace OpenGL {
         void bind() { glBindBuffer(GL_ARRAY_BUFFER, m_handle); }
         void free() { glDeleteBuffers(1, &m_handle); }
 
-		// Reallocates the buffer on every call. Prefer the sub version if possible.
+        // Reallocates the buffer on every call. Prefer the sub version if possible.
+		template <typename VertType>
+		void bufferVerts(VertType* vertices, int vertCount, GLenum usage = GL_DYNAMIC_DRAW) {
+			glBufferData(GL_ARRAY_BUFFER, sizeof(VertType) * vertCount, vertices, usage);
+		}
+
+		// Only use if you used createFixedSize
+		template <typename VertType>
+		void bufferVertsSub(VertType* vertices, int vertCount, GLintptr offset = 0) {
+			glBufferSubData(GL_ARRAY_BUFFER, offset, sizeof(VertType) * vertCount, vertices);
+		}
+
+        // If C++20 is available, add overloads that take std::span instead of raw pointers
+#ifdef OPENGL_HAVE_CPP20
 		template <typename VertType>
 		void bufferVerts(std::span<const VertType> vertices, GLenum usage = GL_DYNAMIC_DRAW) {
 			glBufferData(GL_ARRAY_BUFFER, sizeof(VertType) * vertices.size(), vertices.data(), usage);
 		}
 
-		// Only use if you used createFixedSize
 		template <typename VertType>
 		void bufferVertsSub(std::span<const VertType> vertices, GLintptr offset = 0) {
 			glBufferSubData(GL_ARRAY_BUFFER, offset, sizeof(VertType) * vertices.size(), vertices.data());
 		}
+#endif
 	};
 
     enum DepthFunc {

include/renderer_gl/renderer_gl.hpp

@@ -26,7 +26,7 @@ class Renderer {
 	OpenGL::VertexBuffer vbo;
 	GLint alphaControlLoc = -1;
 	GLint texUnitConfigLoc = -1;
-	
+
 	// Depth configuration uniform locations
 	GLint depthOffsetLoc = -1;
 	GLint depthScaleLoc = -1;
@@ -43,11 +43,11 @@ class Renderer {
 	SurfaceCache<ColourBuffer, 10> colourBufferCache;
 	SurfaceCache<Texture, 256> textureCache;
 
-	OpenGL::uvec2 fbSize; // The size of the framebuffer (ie both the colour and depth buffer)'
+	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
 
-	u32 colourBufferLoc; // Location in 3DS VRAM for the colour buffer
-	ColourBuffer::Formats colourBufferFormat; // Format of the colours stored in the colour buffer
-	
 	// Same for the depth/stencil buffer
 	u32 depthBufferLoc;
 	DepthBuffer::Formats depthBufferFormat;
@@ -56,7 +56,7 @@ class Renderer {
 	OpenGL::VertexArray dummyVAO;
 	OpenGL::VertexBuffer dummyVBO;
 
-	static constexpr u32 regNum = 0x300; // Number of internal PICA registers
+	static constexpr u32 regNum = 0x300;  // Number of internal PICA registers
 	const std::array<u32, regNum>& regs;
 
 	OpenGL::Framebuffer getColourFBO();
@@ -66,18 +66,16 @@ class Renderer {
 	void setupBlending();
 	void bindDepthBuffer();
 
-public:
+  public:
 	Renderer(GPU& gpu, const std::array<u32, regNum>& internalRegs) : gpu(gpu), regs(internalRegs) {}
 
 	void reset();
-	void display();              // Display the 3DS screen contents to the window
+	void display();                                                                                 // Display the 3DS screen contents to the window
-	void initGraphicsContext();  // Initialize graphics context
+	void initGraphicsContext();                                                                     // Initialize graphics context
-	void getGraphicsContext();   // Set up graphics context for rendering
+	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 clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 control);                     // Clear a GPU buffer in VRAM
-	void displayTransfer(
+	void displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u32 outputSize, u32 flags);  // Perform display transfer
-		u32 inputAddr, u32 outputAddr, u32 inputSize, u32 outputSize, u32 flags
+	void drawVertices(OpenGL::Primitives primType, std::span<const Vertex> vertices);               // Draw the given vertices
-	);                                                                            // Perform display transfer
-	void drawVertices(OpenGL::Primitives primType, std::span<const Vertex> vertices);  // Draw the given vertices
 
 	void setFBSize(u32 width, u32 height) {
 		fbSize.x() = width;

src/core/renderer_gl/renderer_gl.cpp

@@ -213,7 +213,6 @@ void Renderer::initGraphicsContext() {
 
 void Renderer::getGraphicsContext() {
 	OpenGL::disableScissor();
-	OpenGL::setViewport(400, 240);
 
 	vbo.bind();
 	vao.bind();