aboutsummaryrefslogtreecommitdiff
path: root/src/GPU_OpenGL.h
diff options
context:
space:
mode:
authorJesse Talavera-Greenberg <jesse@jesse.tg>2023-11-25 12:32:09 -0500
committerGitHub <noreply@github.com>2023-11-25 18:32:09 +0100
commit346dd4006ea1283136095d5c43f602324a095092 (patch)
treeedf04631782bbfcdb48eac79b79aebb11b40f479 /src/GPU_OpenGL.h
parent651b0f680c4531558990a5beb0e638968009dc51 (diff)
Move all core types into namespaces (#1886)
* Reorganize namespaces - Most types are now moved into the `melonDS` namespace - Only good chance to do this for a while, since a big refactor is next * Fix the build
Diffstat (limited to 'src/GPU_OpenGL.h')
-rw-r--r--src/GPU_OpenGL.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/GPU_OpenGL.h b/src/GPU_OpenGL.h
index 3763b6b..68462a9 100644
--- a/src/GPU_OpenGL.h
+++ b/src/GPU_OpenGL.h
@@ -23,7 +23,7 @@
#include <array>
#include <memory>
-namespace Melon
+namespace melonDS
{
class GPU;
struct RenderSettings;
@@ -31,7 +31,7 @@ struct RenderSettings;
class GLCompositor
{
public:
- static std::unique_ptr<GLCompositor> New(Melon::GPU& gpu) noexcept;
+ static std::unique_ptr<GLCompositor> New(melonDS::GPU& gpu) noexcept;
GLCompositor(const GLCompositor&) = delete;
GLCompositor& operator=(const GLCompositor&) = delete;
~GLCompositor();
@@ -44,8 +44,8 @@ public:
void RenderFrame();
void BindOutputTexture(int buf);
private:
- GLCompositor(std::array<GLuint, 3> CompShader, Melon::GPU& gpu) noexcept;
- Melon::GPU& GPU;
+ GLCompositor(std::array<GLuint, 3> CompShader, melonDS::GPU& gpu) noexcept;
+ melonDS::GPU& GPU;
int Scale;
int ScreenH, ScreenW;