[nostalgia/core/opengl] Cleanup

src/glutils/glutils.cpp

@@ -184,4 +184,9 @@ void sendEbo(const BufferSet &bs) noexcept {
 	glBufferData(GL_ELEMENT_ARRAY_BUFFER, bufferSize, bs.elements.data(), GL_STATIC_DRAW);
 }
 
+void clearScreen() noexcept {
+	glClearColor(0, 0, 0, 1);
+	glClear(GL_COLOR_BUFFER_BIT);
+}
+
 }

src/glutils/glutils.hpp

@@ -15,7 +15,7 @@
 
 namespace glutils {
 
-constexpr auto GlslVersion = "#version 330";
+constexpr ox::StringView GlslVersion = "#version 330";
 
 struct Empty {};
 
@@ -176,4 +176,6 @@ void sendVbo(const BufferSet &bs) noexcept;
 
 void sendEbo(const BufferSet &bs) noexcept;
 
+void clearScreen() noexcept;
+
 }

src/nostalgia/modules/core/src/opengl/gfx.cpp

@@ -346,7 +346,8 @@ ox::Error initGfx(
 	const auto spriteFshad = ox::sfmt(renderer::spritefshadTmpl, glutils::GlslVersion);
 	auto &gctx = static_cast<GlContext&>(*ctx);
 	oxReturnError(glutils::buildShaderProgram(bgVshad.c_str(), bgFshad.c_str()).moveTo(&gctx.bgShader));
-	oxReturnError(glutils::buildShaderProgram(spriteVshad.c_str(), spriteFshad.c_str()).moveTo(&gctx.spriteShader));
+	oxReturnError(
+			glutils::buildShaderProgram(spriteVshad.c_str(), spriteFshad.c_str()).moveTo(&gctx.spriteShader));
 	for (auto &bg : gctx.cbbs) {
 		initBackgroundBufferset(ctx, gctx.bgShader, &bg);
 	}
@@ -435,6 +436,7 @@ void puts(Context *ctx, int column, int row, ox::CRStringView str) noexcept {
 		setTile(ctx, 0, static_cast<int>(col + i), row, static_cast<uint8_t>(charMap[static_cast<uint8_t>(str[i])]));
 	}
 }
+
 void setBgCbb(Context *ctx, unsigned bgIdx, unsigned cbbIdx) noexcept {
 	auto &gctx = static_cast<GlContext&>(*ctx);
 	auto &bg = gctx.backgrounds[bgIdx];
@@ -577,9 +579,7 @@ namespace gl {
 
 void drawMainView(core::Context *ctx, ox::Size const&renderSz) noexcept {
 	glViewport(0, 0, renderSz.width, renderSz.height);
-	// clear screen
+	glutils::clearScreen();
-	glClearColor(0, 0, 0, 1);
-	glClear(GL_COLOR_BUFFER_BIT);
 	auto &gctx = static_cast<GlContext&>(*ctx);
 	renderer::drawBackgrounds(&gctx, renderSz);
 	if (gctx.spriteBlocks.tex) {

src/studio/applib/src/builtinmodules.hpp

@@ -1,11 +0,0 @@
-/*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <studio/module.hpp>
-
-#include <ox/std/memory.hpp>
-
-extern ox::Vector<std::function<ox::UPtr<studio::Module>()>> BuiltinModules;

src/studio/applib/src/studioapp.cpp

@@ -5,10 +5,10 @@
 #include <imgui.h>
 
 #include <keel/media.hpp>
+#include <glutils/glutils.hpp>
 #include <turbine/turbine.hpp>
 
 #include <studio/configio.hpp>
-#include "builtinmodules.hpp"
 #include "clawviewer.hpp"
 #include "filedialogmanager.hpp"
 #include "studioapp.hpp"
@@ -119,6 +119,7 @@ void StudioUI::handleKeyEvent(turbine::Key key, bool down) noexcept {
 }
 
 void StudioUI::draw() noexcept {
+	glutils::clearScreen();
 	drawMenu();
 	drawTabBar();
 	if (m_showProjectExplorer) {