diff options
| -rw-r--r-- | src/GPU2D.cpp | 4 | ||||
| -rw-r--r-- | src/GPU3D.cpp | 16 | ||||
| -rw-r--r-- | src/GPU3D.h | 3 | ||||
| -rw-r--r-- | src/GPU3D_OpenGL.cpp (renamed from src/GPU3D_OpenGL43.cpp) | 8 | ||||
| -rw-r--r-- | src/GPU3D_OpenGL_shaders.h (renamed from src/GPU3D_OpenGL43_shaders.h) | 6 |
5 files changed, 16 insertions, 21 deletions
diff --git a/src/GPU2D.cpp b/src/GPU2D.cpp index e810275..fe1645e 100644 --- a/src/GPU2D.cpp +++ b/src/GPU2D.cpp @@ -663,7 +663,7 @@ void GPU2D::DrawScanline(u32 line) else if ((CaptureCnt & (1<<31)) && (((CaptureCnt >> 29) & 0x3) != 1)) { _3DLine = GPU3D::GetLine(n3dline); - //GPU3D::GLRenderer43::PrepareCaptureFrame(); + //GPU3D::GLRenderer::PrepareCaptureFrame(); } } @@ -825,7 +825,7 @@ void GPU2D::VBlankEnd() // TODO: make optional if ((Num == 0) && (CaptureCnt & (1<<31)) && (((CaptureCnt >> 29) & 0x3) != 1)) { - GPU3D::GLRenderer43::PrepareCaptureFrame(); + GPU3D::GLRenderer::PrepareCaptureFrame(); } } diff --git a/src/GPU3D.cpp b/src/GPU3D.cpp index ec395ad..04ec55e 100644 --- a/src/GPU3D.cpp +++ b/src/GPU3D.cpp @@ -276,7 +276,7 @@ bool Init() CmdStallQueue = new FIFO<CmdFIFOEntry>(64); //if (!SoftRenderer::Init()) return false; - if (!GLRenderer43::Init()) return false; + if (!GLRenderer::Init()) return false; return true; } @@ -284,7 +284,7 @@ bool Init() void DeInit() { //SoftRenderer::DeInit(); - GLRenderer43::DeInit(); + GLRenderer::DeInit(); delete CmdFIFO; delete CmdPIPE; @@ -385,7 +385,7 @@ void Reset() ResetRenderingState(); //SoftRenderer::Reset(); - GLRenderer43::Reset(); + GLRenderer::Reset(); } void DoSavestate(Savestate* file) @@ -609,12 +609,12 @@ void SetEnabled(bool geometry, bool rendering) void SetDisplaySettings(int scale, bool accel) { - GLRenderer43::SetDisplaySettings(scale, accel); + GLRenderer::SetDisplaySettings(scale, accel); } int GetScale() { - return GLRenderer43::GetScale(); + return GLRenderer::GetScale(); } @@ -2437,18 +2437,18 @@ void VBlank() void VCount215() { //SoftRenderer::RenderFrame(); - GLRenderer43::RenderFrame(); + GLRenderer::RenderFrame(); } u32* GetLine(int line) { //return SoftRenderer::GetLine(line); - return GLRenderer43::GetLine(line); + return GLRenderer::GetLine(line); } void SetupAccelFrame() { - GLRenderer43::SetupAccelFrame(); + GLRenderer::SetupAccelFrame(); } diff --git a/src/GPU3D.h b/src/GPU3D.h index 708811f..280b99e 100644 --- a/src/GPU3D.h +++ b/src/GPU3D.h @@ -141,7 +141,7 @@ void SetupAccelFrame(); } -namespace GLRenderer43 +namespace GLRenderer { bool Init(); @@ -151,7 +151,6 @@ void Reset(); void SetDisplaySettings(int scale, bool accel); int GetScale(); -void VCount144(); void RenderFrame(); void PrepareCaptureFrame(); u32* GetLine(int line); diff --git a/src/GPU3D_OpenGL43.cpp b/src/GPU3D_OpenGL.cpp index f6e6312..0bb7e42 100644 --- a/src/GPU3D_OpenGL43.cpp +++ b/src/GPU3D_OpenGL.cpp @@ -21,11 +21,11 @@ #include "NDS.h" #include "GPU.h" #include "OpenGLSupport.h" -#include "GPU3D_OpenGL43_shaders.h" +#include "GPU3D_OpenGL_shaders.h" namespace GPU3D { -namespace GLRenderer43 +namespace GLRenderer { // GL version requirements @@ -768,10 +768,6 @@ void RenderSceneChunk(int y, int h) } -void VCount144() -{ -} - void RenderFrame() { ShaderConfig.uScreenSize[0] = ScreenW; diff --git a/src/GPU3D_OpenGL43_shaders.h b/src/GPU3D_OpenGL_shaders.h index 5be7060..e436544 100644 --- a/src/GPU3D_OpenGL43_shaders.h +++ b/src/GPU3D_OpenGL_shaders.h @@ -16,8 +16,8 @@ with melonDS. If not, see http://www.gnu.org/licenses/. */ -#ifndef GPU3D_OPENGL43_SHADERS_H -#define GPU3D_OPENGL43_SHADERS_H +#ifndef GPU3D_OPENGL_SHADERS_H +#define GPU3D_OPENGL_SHADERS_H #define kShaderHeader "#version 140" @@ -599,4 +599,4 @@ void main() } )"; -#endif // GPU3D_OPENGL43_SHADERS_H +#endif // GPU3D_OPENGL_SHADERS_H |