Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-08-07 03:04:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client/common] restructure project in prep for full SDL removal

Browse Source
This commit is contained in:
Geoffrey McRae
2021-01-25 19:58:36 +11:00
parent 6f1c19b3b0
commit bf583290a4
42 changed files with 1668 additions and 1822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/renderers/EGL/egl.c
View File

@@ -24,7 +24,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "common/sysinfo.h"
#include "common/time.h"
#include "common/locking.h"
#include "utils.h"
#include "util.h"
#include "dynamic/fonts.h"
#include <SDL2/SDL_syswm.h>

1
client/renderers/EGL/fps.c
View File

@@ -19,7 +19,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "fps.h"
#include "common/debug.h"
#include "utils.h"
#include "texture.h"
#include "shader.h"

3
client/renderers/EGL/model.c
View File

@@ -22,7 +22,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "texture.h"
#include "common/debug.h"
#include "utils.h"
#include "ll.h"
#include <stdlib.h>
@@ -216,4 +215,4 @@ void update_uniform_bindings(EGL_Model * model)
const int count = egl_texture_count(model->texture);
egl_shader_associate_textures(model->shader, count);
}
}

8
client/renderers/EGL/shader.c
View File

@@ -19,7 +19,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "shader.h"
#include "common/debug.h"
#include "utils.h"
#include "util.h"
#include <stdlib.h>
#include <string.h>
@@ -63,7 +63,7 @@ bool egl_shader_load(EGL_Shader * this, const char * vertex_file, const char * f
char * vertex_code, * fragment_code;
size_t vertex_size, fragment_size;
if (!file_get_contents(vertex_file, &vertex_code, &vertex_size))
if (!util_fileGetContents(vertex_file, &vertex_code, &vertex_size))
{
DEBUG_ERROR("Failed to read vertex shader");
return false;
@@ -71,7 +71,7 @@ bool egl_shader_load(EGL_Shader * this, const char * vertex_file, const char * f
DEBUG_INFO("Loaded vertex shader: %s", vertex_file);
if (!file_get_contents(fragment_file, &fragment_code, &fragment_size))
if (!util_fileGetContents(fragment_file, &fragment_code, &fragment_size))
{
DEBUG_ERROR("Failed to read fragment shader");
free(vertex_code);
@@ -222,4 +222,4 @@ GLint egl_shader_get_uniform_location(EGL_Shader * this, const char * name)
}
return glGetUniformLocation(this->shader, name);
}
}

1
client/renderers/EGL/splash.c
View File

@@ -19,7 +19,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "splash.h"
#include "common/debug.h"
#include "utils.h"
#include "draw.h"
#include "texture.h"

1
client/renderers/EGL/texture.c
View File

@@ -21,7 +21,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "common/debug.h"
#include "common/framebuffer.h"
#include "dynprocs.h"
#include "utils.h"
#include "egldebug.h"
#include <stdlib.h>