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
This commit is contained in:
Jesse Talavera-Greenberg
2023-11-25 12:32:09 -05:00
committed by GitHub
parent 651b0f680c
commit 346dd4006e
178 changed files with 529 additions and 268 deletions

View File

@ -23,20 +23,17 @@
#include "OpenGLSupport.h"
namespace Melon
namespace melonDS
{
class GPU;
}
namespace GPU3D
{
class GLRenderer : public Renderer3D
{
public:
virtual ~GLRenderer() override;
virtual void Reset() override;
virtual void SetRenderSettings(const Melon::RenderSettings& settings) noexcept override;
virtual void SetRenderSettings(const RenderSettings& settings) noexcept override;
virtual void VCount144() override {};
virtual void RenderFrame() override;
@ -45,10 +42,10 @@ public:
void SetupAccelFrame();
void PrepareCaptureFrame();
static std::unique_ptr<GLRenderer> New(Melon::GPU& gpu) noexcept;
static std::unique_ptr<GLRenderer> New(melonDS::GPU& gpu) noexcept;
private:
// Used by New()
GLRenderer(Melon::GPU& gpu) noexcept;
GLRenderer(melonDS::GPU& gpu) noexcept;
// GL version requirements
// * texelFetch: 3.0 (GLSL 1.30) (3.2/1.50 for MS)
@ -68,7 +65,7 @@ private:
u32 RenderKey;
};
Melon::GPU& GPU;
melonDS::GPU& GPU;
RendererPolygon PolygonList[2048] {};
bool BuildRenderShader(u32 flags, const char* vs, const char* fs);