Permalink
Browse files

Removed GLee from source

  • Loading branch information...
FrodeSolheim committed Dec 12, 2017
1 parent a3c07da commit 3155eea48968d8adcb1ef443b070f1f3dfc7e78d
Showing with 7 additions and 35,907 deletions.
  1. +1 −0 ChangeLog
  2. +0 −10 Makefile.am
  3. +0 −2 configure.ac
  4. +0 −18,182 glee/GLee.c
  5. +0 −17,661 glee/GLee.h
  6. +0 −24 libfsemu/README
  7. +2 −4 libfsemu/src/emu/xml_shader.c
  8. +4 −22 libfsemu/src/ml/render.c
  9. +0 −1 libfsemu/src/ml/sdl.c
  10. +0 −1 libfsemu/src/ml/windows.c
@@ -1,5 +1,6 @@
Version 2.9.8dev:

* Removed GLee from source.
* Fixed JIT direct access on modern Linux distributions.
* Changed default sync method on Windows to swap-finish.
* Updated bezel.
@@ -789,16 +789,6 @@ AM_CPPFLAGS += -I$(s)/cef
fs_uae_LDADD += cef/libcef_dll/libcef_dll_wrapper.a -L $(s)/cef/Release -lcef
endif

if BUILTIN_GLEE
noinst_LIBRARIES += libglee.a
AM_CPPFLAGS += -I$(s)/glee
fs_uae_LDADD += libglee.a
fs_uae_device_helper_LDADD += libglee.a
libglee_a_SOURCES = \
glee/GLee.c \
glee/GLee.h
endif

if BUILTIN_MANYMOUSE
noinst_LIBRARIES += libmanymouse.a
AM_CPPFLAGS += -I$(s)/manymouse
@@ -185,8 +185,6 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32 gthread-2.0])

AC_CHECK_LIB([Iphlpapi], [main])

AM_CONDITIONAL([BUILTIN_GLEE], [false])

AC_ARG_WITH(glad, AS_HELP_STRING(
[--without-glad], [use GLAD OpenGL loader]))
AS_IF([test "x$with_glad" != xno], [
18,182 glee/GLee.c

This file was deleted.

Oops, something went wrong.
17,661 glee/GLee.h

This file was deleted.

Oops, something went wrong.
@@ -27,27 +27,3 @@ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.


Glee is Copyright (c)2009 Ben Woodhouse All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer as
the first lines of this file unmodified.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY BEN WOODHOUSE ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL BEN WOODHOUSE BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -103,8 +103,7 @@ typedef struct parse_data {
fs_emu_shader *shader;
} parse_data;

#ifdef USE_GLEE
#elif defined(WITH_GLEW)
#if defined(WITH_GLEW)
#elif defined(WITH_GLAD)
#else
static PFNGLGETSHADERIVPROC glGetShaderiv;
@@ -1264,8 +1263,7 @@ void fs_emu_xml_shader_init(void)
{
fs_log("[SHADERS] Initialize\n");

#ifdef USE_GLEE
#elif defined(WITH_GLEW)
#if defined(WITH_GLEW)
#elif defined(WITH_GLAD)
#else
glGetShaderiv = SDL_GL_GetProcAddress("glGetShaderiv");
@@ -33,19 +33,7 @@

#include <fs/thread.h>

#ifdef USE_GLEE
void * __GLeeGetProcAddress(const char *extname);
typedef int64_t GLint64;
typedef uint64_t GLuint64;
typedef struct __GLsync *GLsync;

static void (APIENTRYP glWaitSync)(GLsync sync, GLbitfield flags,
GLuint64 timeout) = NULL;
static GLenum (APIENTRYP glClientWaitSync)(GLsync sync, GLbitfield flags,
GLuint64 timeout) = NULL;
static GLsync (APIENTRYP glFenceSync)(GLenum condition,
GLbitfield flags) = NULL;
#elif defined(WITH_GLEW)
#if defined(WITH_GLEW)
#elif defined(WITH_GLAD)
#else
static FS_PFNGLWAITSYNCPROC _glWaitSync;
@@ -426,8 +414,7 @@ static void check_opengl_sync_capabilities(void)
if (strstr(ext, "GL_NV_fence") != NULL) {
g_has_nv_fence = 1;
fs_log("GL_NV_fence extension found \n");
#ifdef USE_GLEE
#elif defined(WITH_GLEW)
#if defined(WITH_GLEW)
#elif defined(WITH_GLAD)
#else
glGenFencesNV = SDL_GL_GetProcAddress("glGenFencesNV");
@@ -438,8 +425,7 @@ static void check_opengl_sync_capabilities(void)
if (strstr(ext, "GL_APPLE_fence") != NULL) {
g_has_apple_fence = 1;
fs_log("GL_APPLE_fence extension found\n");
#ifdef USE_GLEE
#elif defined(WITH_GLEW)
#if defined(WITH_GLEW)
#elif defined(WITH_GLAD)
#else
glGenFencesAPPLE = SDL_GL_GetProcAddress("glGenFencesAPPLE");
@@ -449,11 +435,7 @@ static void check_opengl_sync_capabilities(void)
}
if (strstr(ext, "GL_ARB_sync") != NULL) {
fs_log("GL_ARB_sync extension found\n");
#ifdef USE_GLEE
glFenceSync = __GLeeGetProcAddress("glFenceSync");
glWaitSync = __GLeeGetProcAddress("glWaitSync");
glClientWaitSync = __GLeeGetProcAddress("glClientWaitSync");
#elif defined(WITH_GLEW)
#if defined(WITH_GLEW)
#elif defined(WITH_GLAD)
#else
glFenceSync = SDL_GL_GetProcAddress("glFenceSync");
@@ -26,7 +26,6 @@

#include <fs/conf.h>
#include <fs/lazyness.h>
// #include <GLee.h>
#ifdef WITH_GLEW
#include <GL/glew.h>
#endif
@@ -198,7 +198,6 @@ void fs_ml_initialize_keymap()
#ifdef WITH_WINDOWS_VIDEO

#include "video.h"
// #include <fs/glee.>
#include <Ddraw.h>

/*

0 comments on commit 3155eea

Please sign in to comment.