deon/glava
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/UnkDevE/glava

Browse Source
This commit is contained in:
Deon Spengler
2021-10-17 22:49:29 +02:00
parent 065d31f1c9 1158a396a3
commit 4db05c1c73
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glava/glava.c
View File

@@ -76,8 +76,8 @@ static volatile bool reload = false;
__attribute__((noreturn, visibility("default"))) void glava_return_builtin(void) { exit(EXIT_SUCCESS); }
__attribute__((noreturn, visibility("default"))) void glava_abort_builtin (void) { exit(EXIT_FAILURE); }
__attribute__((noreturn, visibility("default"))) void (*glava_return) (void) = glava_return_builtin;
__attribute__((noreturn, visibility("default"))) void (*glava_abort) (void) = glava_abort_builtin;
__attribute__((noreturn, visibility("default"))) static void (*glava_return) (void) = glava_return_builtin;
__attribute__((noreturn, visibility("default"))) static void (*glava_abort) (void) = glava_abort_builtin;
/* Copy installed shaders/configuration from the installed location
(usually /etc/xdg). Modules (folders) will be linked instead of

4
glava/glava.h
View File

@@ -14,8 +14,8 @@ struct glava_renderer;
/* External API */
typedef struct glava_renderer* volatile glava_handle;
__attribute__((noreturn, visibility("default"))) void (*glava_abort) (void);
__attribute__((noreturn, visibility("default"))) void (*glava_return) (void);
__attribute__((noreturn, visibility("default"))) static void (*glava_abort) (void);
__attribute__((noreturn, visibility("default"))) static void (*glava_return) (void);
__attribute__((visibility("default"))) void glava_assign_external_ctx (void* ctx);
__attribute__((visibility("default"))) void glava_entry (int argc, char** argv, glava_handle* ret);
__attribute__((visibility("default"))) void glava_terminate (glava_handle* ref);

2
glfft/glfft_gl_interface.hpp
View File

@@ -30,6 +30,8 @@ extern "C" {
#include <stdlib.h>
#include <string.h>
#include <error.h>
#include <stdio.h>
#include <errno.h>
}
#ifndef GLFFT_GLSL_LANG_STRING

1
glfft/glfft_wisdom.cpp
View File

@@ -20,6 +20,7 @@
#include "glfft_interface.hpp"
#include "glfft.hpp"
#include <utility>
#include <stdexcept>
/* GLAVA NOTICE: automatic wisdom serialization support may be added at a late date */
#ifdef GLFFT_SERIALIZATION