Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-08 23:25:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate OpenGL specific headers to renderer_gl

Browse source
This commit is contained in:
Wunkolo 2023-07-10 10:31:46 -07:00
parent a636a0d1da
commit 4864c51125
7 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -145,7 +145,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp
include/PICA/dynapica/shader_rec_emitter_x64.hpp include/PICA/pica_hash.hpp include/result/result.hpp include/PICA/dynapica/shader_rec_emitter_x64.hpp include/PICA/pica_hash.hpp include/result/result.hpp
include/result/result_common.hpp include/result/result_fs.hpp include/result/result_fnd.hpp include/result/result_common.hpp include/result/result_fs.hpp include/result/result_fnd.hpp
include/result/result_gsp.hpp include/result/result_kernel.hpp include/result/result_os.hpp include/result/result_gsp.hpp include/result/result_kernel.hpp include/result/result_os.hpp
include/crypto/aes_engine.hpp include/metaprogramming.hpp include/PICA/pica_vertex.hpp include/gl_state.hpp include/crypto/aes_engine.hpp include/metaprogramming.hpp include/PICA/pica_vertex.hpp
include/config.hpp include/services/ir_user.hpp include/httpserver.hpp include/config.hpp include/services/ir_user.hpp include/httpserver.hpp
) )
@ -186,10 +186,11 @@ if(PANDA3DS_ENABLE_OPENGL)
set(RENDERER_GL_INCLUDE_FILES include/opengl.hpp set(RENDERER_GL_INCLUDE_FILES include/opengl.hpp
include/renderer_gl/renderer_gl.hpp include/renderer_gl/textures.hpp include/renderer_gl/renderer_gl.hpp include/renderer_gl/textures.hpp
include/renderer_gl/surfaces.hpp include/renderer_gl/surface_cache.hpp include/renderer_gl/surfaces.hpp include/renderer_gl/surface_cache.hpp
include/renderer_gl/gl_state.hpp
) )
set(RENDERER_GL_SOURCE_FILES src/core/renderer_gl/renderer_gl.cpp set(RENDERER_GL_SOURCE_FILES src/core/renderer_gl/renderer_gl.cpp
src/core/renderer_gl/textures.cpp src/core/renderer_gl/etc1.cpp src/core/renderer_gl/textures.cpp src/core/renderer_gl/etc1.cpp
src/gl_state.cpp src/core/renderer_gl/gl_state.cpp
) )
source_group("Source Files\\Core\\OpenGL Renderer" FILES ${RENDERER_GL_SOURCE_FILES}) source_group("Source Files\\Core\\OpenGL Renderer" FILES ${RENDERER_GL_SOURCE_FILES})

5
include/emulator.hpp
View file

@ -13,10 +13,6 @@
#include "io_file.hpp" #include "io_file.hpp"
#include "memory.hpp" #include "memory.hpp"
#if PANDA3DS_ENABLE_OPENGL
#include "gl_state.hpp"
#endif
#ifdef PANDA3DS_ENABLE_HTTP_SERVER #ifdef PANDA3DS_ENABLE_HTTP_SERVER
#include "httpserver.hpp" #include "httpserver.hpp"
#endif #endif
@ -35,7 +31,6 @@ class Emulator {
#if PANDA3DS_ENABLE_OPENGL #if PANDA3DS_ENABLE_OPENGL
SDL_GLContext glContext; SDL_GLContext glContext;
GLStateManager gl;
#endif #endif
SDL_GameController* gameController = nullptr; SDL_GameController* gameController = nullptr;

0
include/gl_state.hpp → include/renderer_gl/gl_state.hpp
View file

0
include/opengl.hpp → include/renderer_gl/opengl.hpp
View file

2
src/gl_state.cpp → src/core/renderer_gl/gl_state.cpp
View file

@ -1,4 +1,4 @@
#include "gl_state.hpp" #include "renderer_gl/gl_state.hpp"
void GLStateManager::resetBlend() { void GLStateManager::resetBlend() {
blendEnabled = false; blendEnabled = false;

2
src/core/renderer_gl/renderer_gl.cpp
View file

@ -607,6 +607,8 @@ void RendererGL::reset() {
} }
void RendererGL::initGraphicsContext() { void RendererGL::initGraphicsContext() {
gl.reset();
OpenGL::Shader vert(vertexShader, OpenGL::Vertex); OpenGL::Shader vert(vertexShader, OpenGL::Vertex);
OpenGL::Shader frag(fragmentShader, OpenGL::Fragment); OpenGL::Shader frag(fragmentShader, OpenGL::Fragment);
triangleProgram.create({vert, frag}); triangleProgram.create({vert, frag});

7
src/emulator.cpp
View file

@ -433,12 +433,7 @@ bool Emulator::loadELF(std::ifstream& file) {
} }
// Reset our graphics context and initialize the GPU's graphics context // Reset our graphics context and initialize the GPU's graphics context
void Emulator::initGraphicsContext() { void Emulator::initGraphicsContext() { gpu.initGraphicsContext(); }
#if PANDA3DS_ENABLE_OPENGL
gl.reset(); // TODO (For when we have multiple backends): Only do this if we are using OpenGL
#endif
gpu.initGraphicsContext();
}
#ifdef PANDA3DS_ENABLE_HTTP_SERVER #ifdef PANDA3DS_ENABLE_HTTP_SERVER
void Emulator::pollHttpServer() { void Emulator::pollHttpServer() {