OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-24 03:41:03 +00:00
Code Issues Projects Releases Wiki Activity

Remove the glLoadGen bindings and switch to libepoxy. TODO: test what’d happen on MSVC.

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2014-11-19 11:17:56 +00:00
parent f5f06a592a
commit 45b5244e12
7 changed files with 9 additions and 2810 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/video_core/CMakeLists.txt
View File

@ -1,5 +1,4 @@
set(SRCS
renderer_opengl/generated/gl_3_2_core.c
renderer_opengl/renderer_opengl.cpp
renderer_opengl/gl_shader_util.cpp
debug_utils/debug_utils.cpp
@ -14,7 +13,6 @@ set(SRCS
set(HEADERS
debug_utils/debug_utils.h
renderer_opengl/generated/gl_3_2_core.h
renderer_opengl/gl_shader_util.h
renderer_opengl/gl_shaders.h
renderer_opengl/renderer_opengl.h
@ -40,3 +38,9 @@ if (PNG_FOUND)
include_directories(${PNG_INCLUDE_DIRS})
add_definitions(${PNG_DEFINITIONS})
endif()
if (EPOXY_FOUND)
target_link_libraries(video_core ${EPOXY_LIBRARIES})
include_directories(${EPOXY_INCLUDE_DIRS})
add_definitions(${EPOXY_DEFINITIONS})
endif()

5
src/video_core/renderer_opengl/generated/Readme.md
View File

@ -1,5 +0,0 @@
These file were generated by the [glLoadGen](https://bitbucket.org/alfonse/glloadgen/wiki/Home) OpenGL loader generator and have been checked in as-is. You can re-generate them using version 2.0.2 of glLoadGen and executing the following command:
```
lua LoadGen.lua -version 3.2 -profile core -indent space 3_2_core
```

1186
src/video_core/renderer_opengl/generated/gl_3_2_core.c
View File

File diff suppressed because it is too large Load Diff

1609
src/video_core/renderer_opengl/generated/gl_3_2_core.h
View File

File diff suppressed because it is too large Load Diff

2
src/video_core/renderer_opengl/gl_shader_util.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "generated/gl_3_2_core.h"
#include <epoxy/gl.h>
namespace ShaderUtil {

7
src/video_core/renderer_opengl/renderer_opengl.cpp
View File

@ -264,13 +264,8 @@ MathUtil::Rectangle<unsigned> RendererOpenGL::GetViewportExtent() {
void RendererOpenGL::Init() {
render_window->MakeCurrent();
int err = ogl_LoadFunctions();
if (ogl_LOAD_SUCCEEDED != err) {
LOG_CRITICAL(Render_OpenGL, "Failed to initialize GL functions! Exiting...");
exit(-1);
}
LOG_INFO(Render_OpenGL, "GL_VERSION: %s", glGetString(GL_VERSION));
InitOpenGLObjects();
}

2
src/video_core/renderer_opengl/renderer_opengl.h
View File

@ -6,7 +6,7 @@
#include <array>
#include "generated/gl_3_2_core.h"
#include <epoxy/gl.h>
#include "common/math_util.h"