aboutsummaryrefslogtreecommitdiff
path: root/src/GPU3D_OpenGL.cpp
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/GPU3D_OpenGL.cpp
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/GPU3D_OpenGL.cpp')
-rw-r--r--src/GPU3D_OpenGL.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/GPU3D_OpenGL.cpp b/src/GPU3D_OpenGL.cpp
index 629ec15..fb9f246 100644
--- a/src/GPU3D_OpenGL.cpp
+++ b/src/GPU3D_OpenGL.cpp
@@ -25,7 +25,7 @@
#include "GPU.h"
#include "GPU3D_OpenGL_shaders.h"
-namespace GPU3D
+namespace melonDS
{
bool GLRenderer::BuildRenderShader(u32 flags, const char* vs, const char* fs)
@@ -97,14 +97,14 @@ void SetupDefaultTexParams(GLuint tex)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
}
-GLRenderer::GLRenderer(Melon::GPU& gpu) noexcept : Renderer3D(true), GPU(gpu)
+GLRenderer::GLRenderer(melonDS::GPU& gpu) noexcept : Renderer3D(true), GPU(gpu)
{
// GLRenderer::New() will be used to actually initialize the renderer;
// The various glDelete* functions silently ignore invalid IDs,
// so we can just let the destructor clean up a half-initialized renderer.
}
-std::unique_ptr<GLRenderer> GLRenderer::New(Melon::GPU& gpu) noexcept
+std::unique_ptr<GLRenderer> GLRenderer::New(melonDS::GPU& gpu) noexcept
{
assert(glEnable != nullptr);
@@ -329,7 +329,7 @@ void GLRenderer::Reset()
{
}
-void GLRenderer::SetRenderSettings(const Melon::RenderSettings& settings) noexcept
+void GLRenderer::SetRenderSettings(const RenderSettings& settings) noexcept
{
int scale = settings.GL_ScaleFactor;