From 7adff320f743b85cf534427fdff75bbb9a439aa6 Mon Sep 17 00:00:00 2001 From: Arisotura Date: Thu, 5 Dec 2019 22:55:32 +0100 Subject: [PATCH] lay base HARK HARK HARK HARK --- melonDS.cbp | 2 ++ src/CMakeLists.txt | 1 + src/GPU.cpp | 2 +- src/GPU_OpenGL.cpp | 32 ++++++++++++++++++++++++++++++++ src/GPU_OpenGL_shaders.h | 27 +++++++++++++++++++++++++++ 5 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/GPU_OpenGL.cpp create mode 100644 src/GPU_OpenGL_shaders.h diff --git a/melonDS.cbp b/melonDS.cbp index fb42cb47..d94ad1f6 100644 --- a/melonDS.cbp +++ b/melonDS.cbp @@ -128,6 +128,8 @@ + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a1110f1f..0543b59b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,6 +11,7 @@ add_library(core STATIC CRC32.cpp DMA.cpp GPU.cpp + GPU_OpenGL.cpp GPU2D.cpp GPU3D.cpp GPU3D_OpenGL.cpp diff --git a/src/GPU.cpp b/src/GPU.cpp index 071d5f65..13f2727f 100644 --- a/src/GPU.cpp +++ b/src/GPU.cpp @@ -20,7 +20,7 @@ #include #include "NDS.h" #include "GPU.h" -u64 vbltime; + namespace GPU { diff --git a/src/GPU_OpenGL.cpp b/src/GPU_OpenGL.cpp new file mode 100644 index 00000000..147f5d67 --- /dev/null +++ b/src/GPU_OpenGL.cpp @@ -0,0 +1,32 @@ +/* + Copyright 2016-2019 Arisotura + + This file is part of melonDS. + + melonDS is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation, either version 3 of the License, or (at your option) + any later version. + + melonDS is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with melonDS. If not, see http://www.gnu.org/licenses/. +*/ + +#include +#include +#include "NDS.h" +#include "GPU.h" +#include "Config.h" +#include "OpenGLSupport.h" +#include "GPU_OpenGL_shaders.h" + +namespace GPU +{ + +// shit goes here + +} diff --git a/src/GPU_OpenGL_shaders.h b/src/GPU_OpenGL_shaders.h new file mode 100644 index 00000000..52c45a8d --- /dev/null +++ b/src/GPU_OpenGL_shaders.h @@ -0,0 +1,27 @@ +/* + Copyright 2016-2019 Arisotura + + This file is part of melonDS. + + melonDS is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation, either version 3 of the License, or (at your option) + any later version. + + melonDS is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with melonDS. If not, see http://www.gnu.org/licenses/. +*/ + +#ifndef GPU_OPENGL_SHADERS_H +#define GPU_OPENGL_SHADERS_H + +#define kShaderHeader "#version 140" + + +// shader shit goes here + +#endif // GPU_OPENGL_SHADERS_H