CVS commit: xsrc/external/mit/libepoxy/src
Module Name:xsrc Committed By: christos Date: Wed Nov 4 22:46:20 UTC 2020 Modified Files: xsrc/external/mit/libepoxy/src: egl_generated_dispatch.c gl_generated_dispatch.c glx_generated_dispatch.c Log Message: fix lint build To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c \ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c diff -u xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.5 xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.6 --- xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.5 Sun Nov 1 23:47:22 2020 +++ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c Wed Nov 4 17:46:20 2020 @@ -11,7 +11,7 @@ #include "dispatch_common.h" #include "epoxy/egl.h" -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__lint__) #define EPOXY_NOINLINE __attribute__((noinline)) #elif defined (_MSC_VER) #define EPOXY_NOINLINE __declspec(noinline) Index: xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c diff -u xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.6 xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.7 --- xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.6 Sun Nov 1 23:47:22 2020 +++ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c Wed Nov 4 17:46:20 2020 @@ -26,7 +26,7 @@ #include "dispatch_common.h" #include "epoxy/gl.h" -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__lint__) #define EPOXY_NOINLINE __attribute__((noinline)) #elif defined (_MSC_VER) #define EPOXY_NOINLINE __declspec(noinline) Index: xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c diff -u xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.6 xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.7 --- xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.6 Sun Nov 1 23:47:22 2020 +++ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c Wed Nov 4 17:46:20 2020 @@ -26,7 +26,7 @@ #include "dispatch_common.h" #include "epoxy/glx.h" -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__lint__) #define EPOXY_NOINLINE __attribute__((noinline)) #elif defined (_MSC_VER) #define EPOXY_NOINLINE __declspec(noinline)
CVS commit: xsrc/external/mit/libepoxy/include
Module Name:xsrc Committed By: mrg Date: Mon Nov 2 06:25:35 UTC 2020 Modified Files: xsrc/external/mit/libepoxy/include: config.h Log Message: ensure PLATFORM_HAS_EGL and ENABLE_EGL are set consistently. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libepoxy/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libepoxy/include/config.h diff -u xsrc/external/mit/libepoxy/include/config.h:1.2 xsrc/external/mit/libepoxy/include/config.h:1.3 --- xsrc/external/mit/libepoxy/include/config.h:1.2 Mon Nov 2 04:47:22 2020 +++ xsrc/external/mit/libepoxy/include/config.h Mon Nov 2 06:25:35 2020 @@ -10,8 +10,10 @@ /* build WGL tests */ /* #undef BUILD_WGL */ +#if 0 /* in Makefile */ /* Whether EGL support is enabled */ #define ENABLE_EGL 1 +#endif /* Whether GLX support is enabled */ #define ENABLE_GLX 1
CVS commit: xsrc/external/mit/libepoxy
Module Name:xsrc Committed By: mrg Date: Mon Nov 2 04:47:22 UTC 2020 Modified Files: xsrc/external/mit/libepoxy/dist: configure xsrc/external/mit/libepoxy/include: config.h xsrc/external/mit/libepoxy/src: egl_generated.h egl_generated_dispatch.c gl_generated.h gl_generated_dispatch.c glx_generated.h glx_generated_dispatch.c Log Message: new generated files for libepoxy 1.5.4. update the fake configure version. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libepoxy/dist/configure cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/libepoxy/include/config.h cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libepoxy/src/egl_generated.h \ xsrc/external/mit/libepoxy/src/gl_generated.h \ xsrc/external/mit/libepoxy/src/glx_generated.h cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c \ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: xsrc/external/mit/libepoxy/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Nov 2 04:46:30 UTC 2020
Modified Files:
xsrc/external/mit/libepoxy/dist/src: dispatch_common.c
dispatch_common.h
Removed Files:
xsrc/external/mit/libepoxy/dist: .gitignore
xsrc/external/mit/libepoxy/dist/test: egl_and_glx_different_pointers.c
Log Message:
merge libepoxy 1.5.4.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libepoxy/dist/.gitignore
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libepoxy/dist/src/dispatch_common.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/libepoxy/dist/src/dispatch_common.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libepoxy/dist/test/egl_and_glx_different_pointers.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libepoxy/dist/src/dispatch_common.c
diff -u xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.4 xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.5
--- xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.4 Tue Jul 9 21:55:21 2019
+++ xsrc/external/mit/libepoxy/dist/src/dispatch_common.c Mon Nov 2 04:46:29 2020
@@ -41,7 +41,7 @@
* \section features_sec Features
*
* - Automatically initializes as new GL functions are used.
- * - GL 4.4 core and compatibility context support.
+ * - GL 4.6 core and compatibility context support.
* - GLES 1/2/3 context support.
* - Knows about function aliases so (e.g.) `glBufferData()` can be
* used with `GL_ARB_vertex_buffer_object` implementations, along
@@ -173,30 +173,33 @@
#include "dispatch_common.h"
-#ifdef __APPLE__
+#if defined(__APPLE__)
#define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
-#elif defined(ANDROID)
+#define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL"
+#define GLES1_LIB "libGLESv1_CM.so"
+#define GLES2_LIB "libGLESv2.so"
+#elif defined(__ANDROID__)
#define GLX_LIB "libGLESv2.so"
-#else
-#ifdef __NetBSD__
+#elif __NetBSD__
#define GLX_LIB "libGL.so"
-#else
-#define GLX_LIB "libGL.so.1"
-#endif
#endif
#if defined(ANDROID) || defined(__NetBSD__)
#define EGL_LIB "libEGL.so"
#define GLES1_LIB "libGLESv1_CM.so"
#define GLES2_LIB "libGLESv2.so"
-#elif defined _WIN32
+#elif defined(_WIN32)
#define EGL_LIB "libEGL.dll"
#define GLES1_LIB "libGLES_CM.dll"
#define GLES2_LIB "libGLESv2.dll"
+#define OPENGL_LIB "OPENGL32"
#else
+#define GLVND_GLX_LIB "libGLX.so.1"
+#define GLX_LIB "libGL.so.1"
#define EGL_LIB "libEGL.so.1"
#define GLES1_LIB "libGLESv1_CM.so.1"
#define GLES2_LIB "libGLESv2.so.2"
+#define OPENGL_LIB "libOpenGL.so.0"
#endif
#ifdef __GNUC__
@@ -230,13 +233,18 @@ struct api {
pthread_mutex_t mutex;
#endif
-/* dlopen() return value for libGL.so.1. */
+/*
+ * dlopen() return value for the GLX API. This is libGLX.so.1 if the
+ * runtime is glvnd-enabled, else libGL.so.1
+ */
void *glx_handle;
/*
- * dlopen() return value for OS X's GL library.
+ * dlopen() return value for the desktop GL library.
*
- * On linux, glx_handle is used instead.
+ * On Windows this is OPENGL32. On OSX this is classic libGL. On Linux
+ * this is either libOpenGL (if the runtime is glvnd-enabled) or
+ * classic libGL.so.1
*/
void *gl_handle;
@@ -290,14 +298,13 @@ library_init(void)
}
static bool
-get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail)
+get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool load)
{
if (*handle)
return true;
if (!library_initialized) {
-fprintf(stderr,
-"Attempting to dlopen() while in the dynamic linker.\n");
+fputs("Attempting to dlopen() while in the dynamic linker.\n", stderr);
abort();
}
@@ -306,11 +313,15 @@ get_dlopen_handle(void **handle, const c
#else
pthread_mutex_lock();
if (!*handle) {
-*handle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL);
+int flags = RTLD_LAZY | RTLD_LOCAL;
+if (!load)
+flags |= RTLD_NOLOAD;
+
+*handle = dlopen(lib_name, flags);
if (!*handle) {
if (exit_on_fail) {
fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror());
-exit(1);
+abort();
} else {
(void)dlerror();
}
@@ -323,15 +334,11 @@ get_dlopen_handle(void **handle, const c
}
static void *
-do_dlsym(void **handle, const char *lib_name, const char *name,
- bool exit_on_fail)
+do_dlsym(void **handle, const char *name, bool exit_on_fail)
{
void *result;
const char *error = "";
-if (!get_dlopen_handle(handle, lib_name, exit_on_fail))
-return NULL;
-
#ifdef _WIN32
result = GetProcAddress(*handle, name);
#else
@@ -340,8 +347,8 @@ do_dlsym(void **handle, const char *lib_
CVS commit: xsrc/external/mit/libepoxy/src
Module Name:xsrc Committed By: christos Date: Thu Apr 18 16:41:55 UTC 2019 Modified Files: xsrc/external/mit/libepoxy/src: egl_generated_dispatch.c gl_generated_dispatch.c glx_generated_dispatch.c Log Message: all we are saying is, give lint a chance To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c \ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c diff -u xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.1 xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.2 --- xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.1 Wed Aug 17 23:26:04 2016 +++ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c Thu Apr 18 12:41:55 2019 @@ -9,7 +9,7 @@ #include "dispatch_common.h" #include "epoxy/egl.h" -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__lint__) #define EPOXY_NOINLINE __attribute__((noinline)) #elif defined (_MSC_VER) #define EPOXY_NOINLINE __declspec(noinline) Index: xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c diff -u xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.2 xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.3 --- xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.2 Fri Aug 19 07:56:56 2016 +++ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c Thu Apr 18 12:41:55 2019 @@ -31,7 +31,7 @@ #include "dispatch_common.h" #include "epoxy/gl.h" -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__lint__) #define EPOXY_NOINLINE __attribute__((noinline)) #elif defined (_MSC_VER) #define EPOXY_NOINLINE __declspec(noinline) Index: xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c diff -u xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.2 xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.3 --- xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.2 Fri Aug 19 07:56:57 2016 +++ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c Thu Apr 18 12:41:55 2019 @@ -9,7 +9,7 @@ #include "dispatch_common.h" #include "epoxy/glx.h" -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__lint__) #define EPOXY_NOINLINE __attribute__((noinline)) #elif defined (_MSC_VER) #define EPOXY_NOINLINE __declspec(noinline)
CVS commit: xsrc/external/mit/libepoxy/dist/src
Module Name:xsrc Committed By: mrg Date: Thu Apr 18 10:09:37 UTC 2019 Modified Files: xsrc/external/mit/libepoxy/dist/src: dispatch_common.h Log Message: on NetBSD, don't define PLATFORM_HAS_EGL if it is already defined To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/libepoxy/dist/src/dispatch_common.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libepoxy/dist/src/dispatch_common.h diff -u xsrc/external/mit/libepoxy/dist/src/dispatch_common.h:1.3 xsrc/external/mit/libepoxy/dist/src/dispatch_common.h:1.4 --- xsrc/external/mit/libepoxy/dist/src/dispatch_common.h:1.3 Tue Apr 16 21:34:44 2019 +++ xsrc/external/mit/libepoxy/dist/src/dispatch_common.h Thu Apr 18 10:09:37 2019 @@ -39,7 +39,7 @@ #define PLATFORM_HAS_WGL 0 #define EPOXY_IMPORTEXPORT #else -#ifdef __NetBSD__ +#if defined(__NetBSD__) && !defined(PLATFORM_HAS_EGL) # if defined(__amd64__) || defined(__i386__) || defined(__aarch64__) // XXX evbarm32 # define PLATFORM_HAS_EGL 1 # else
CVS commit: xsrc/external/mit/libepoxy
Module Name:xsrc
Committed By: christos
Date: Fri Aug 19 11:56:57 UTC 2016
Modified Files:
xsrc/external/mit/libepoxy/dist/src: dispatch_common.c
xsrc/external/mit/libepoxy/src: gl_generated_dispatch.c
glx_generated_dispatch.c
Log Message:
play nice with lint
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libepoxy/dist/src/dispatch_common.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c \
xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libepoxy/dist/src/dispatch_common.c
diff -u xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.2 xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.3
--- xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.2 Fri Aug 19 04:15:28 2016
+++ xsrc/external/mit/libepoxy/dist/src/dispatch_common.c Fri Aug 19 07:56:56 2016
@@ -140,6 +140,9 @@
__pragma(section(".CRT$XCU",read)) \
__declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
+#elif defined(__lint__)
+#define CONSTRUCT(_func)
+#define DESTRUCT(_func)
#else
#error "You will need constructor support for your compiler"
#endif
Index: xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c
diff -u xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.1 xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.2
--- xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.1 Wed Aug 17 23:26:04 2016
+++ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c Fri Aug 19 07:56:56 2016
@@ -35,6 +35,8 @@
#define EPOXY_NOINLINE __attribute__((noinline))
#elif defined (_MSC_VER)
#define EPOXY_NOINLINE __declspec(noinline)
+#elif defined (__lint)
+#define EPOXY_NOINLINE
#endif
struct dispatch_table {
PFNGLACCUMPROC epoxy_glAccum;
Index: xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c
diff -u xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.1 xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.2
--- xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.1 Wed Aug 17 23:26:04 2016
+++ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c Fri Aug 19 07:56:57 2016
@@ -13,6 +13,8 @@
#define EPOXY_NOINLINE __attribute__((noinline))
#elif defined (_MSC_VER)
#define EPOXY_NOINLINE __declspec(noinline)
+#elif defined (__lint__)
+#define EPOXY_NOINLINE
#endif
struct dispatch_table {
PFNGLXBINDCHANNELTOWINDOWSGIXPROC epoxy_glXBindChannelToWindowSGIX;
CVS commit: xsrc/external/mit/libepoxy/dist/src
Module Name:xsrc Committed By: mrg Date: Fri Aug 19 08:15:28 UTC 2016 Modified Files: xsrc/external/mit/libepoxy/dist/src: dispatch_common.c Log Message: use libfoo.so not libfoo.so.x on netbsd. from prlw1. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/libepoxy/dist/src/dispatch_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libepoxy/dist/src/dispatch_common.c diff -u xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.1.1.1 xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.2 --- xsrc/external/mit/libepoxy/dist/src/dispatch_common.c:1.1.1.1 Wed Aug 17 05:22:33 2016 +++ xsrc/external/mit/libepoxy/dist/src/dispatch_common.c Fri Aug 19 08:15:28 2016 @@ -107,10 +107,14 @@ #elif defined(ANDROID) #define GLX_LIB "libGLESv2.so" #else +#ifdef __NetBSD__ +#define GLX_LIB "libGL.so" +#else #define GLX_LIB "libGL.so.1" #endif +#endif -#ifdef ANDROID +#if defined(ANDROID) || defined(__NetBSD__) #define EGL_LIB "libEGL.so" #define GLES1_LIB "libGLESv1_CM.so" #define GLES2_LIB "libGLESv2.so"
CVS commit: xsrc/external/mit/libepoxy
Module Name:xsrc Committed By: mrg Date: Thu Aug 18 03:26:04 UTC 2016 Modified Files: xsrc/external/mit/libepoxy/dist/src: dispatch_common.h Added Files: xsrc/external/mit/libepoxy/dist: configure xsrc/external/mit/libepoxy/src: egl_generated.h egl_generated_dispatch.c gl_generated.h gl_generated_dispatch.c glx_generated.h glx_generated_dispatch.c Log Message: turn off egl for now (we need to enable the mesa parts). add the python generated parts. add a configure so that pkgconfig stuff works properly. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 xsrc/external/mit/libepoxy/dist/configure cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/libepoxy/dist/src/dispatch_common.h cvs rdiff -u -r0 -r1.1 xsrc/external/mit/libepoxy/src/egl_generated.h \ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c \ xsrc/external/mit/libepoxy/src/gl_generated.h \ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c \ xsrc/external/mit/libepoxy/src/glx_generated.h \ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
