From 5717d6746207e1e1e25ebd4f351181c3dd8a4c33 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sun, 3 Dec 2023 19:09:51 -0600
Subject: [PATCH] [nostalgia/core] Cleanup

---
 src/nostalgia/modules/core/include/nostalgia/core/context.hpp | 2 +-
 src/nostalgia/modules/core/src/opengl/context.cpp             | 2 +-
 src/nostalgia/modules/core/src/opengl/context.hpp             | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/nostalgia/modules/core/include/nostalgia/core/context.hpp b/src/nostalgia/modules/core/include/nostalgia/core/context.hpp
index 75186d0b..789f73bb 100644
--- a/src/nostalgia/modules/core/include/nostalgia/core/context.hpp
+++ b/src/nostalgia/modules/core/include/nostalgia/core/context.hpp
@@ -27,7 +27,7 @@ class Context {
 
 };
 
-ox::Result<ox::UniquePtr<Context>> init(turbine::Context &tctx, InitParams const& = {}) noexcept;
+ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const& = {}) noexcept;
 
 }
 
diff --git a/src/nostalgia/modules/core/src/opengl/context.cpp b/src/nostalgia/modules/core/src/opengl/context.cpp
index 03f34931..95204232 100644
--- a/src/nostalgia/modules/core/src/opengl/context.cpp
+++ b/src/nostalgia/modules/core/src/opengl/context.cpp
@@ -16,7 +16,7 @@ GlContext::~GlContext() noexcept {
 	shutdownGfx(*this);
 }
 
-ox::Result<ox::UniquePtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
+ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
 	auto ctx = ox::make_unique<GlContext>(tctx);
 	oxReturnError(initGfx(*ctx, params));
 	return ox::UPtr<Context>(ctx.release());
diff --git a/src/nostalgia/modules/core/src/opengl/context.hpp b/src/nostalgia/modules/core/src/opengl/context.hpp
index 61eee10d..150048e7 100644
--- a/src/nostalgia/modules/core/src/opengl/context.hpp
+++ b/src/nostalgia/modules/core/src/opengl/context.hpp
@@ -23,7 +23,6 @@ struct GlContext: public core::Context {
 	renderer::SpriteBlockset spriteBlocks;
 	ox::Array<Sprite, 128> spriteStates;
 	ox::Array<renderer::Background, 4> backgrounds;
-	ox::Optional<ox::Size> renderSize;
 	renderer::Drawer drawer;
 	explicit GlContext(turbine::Context &tctx) noexcept;
 	~GlContext() noexcept override;