picnoir/libglvnd
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
libglvnd/src/GLX/Makefile.am

98 lines
3.2 KiB
Makefile
Raw Normal View History

[GLX] First pass at implementing libGLX.so Add a makefile to build libGLX. Update dispatch functions for each of the GLX 1.4 entrypoints as well as stubs for glXGetProcAddress() and glXMake{Context,}Current() to use the new vendor library ABI.
2013-08-23 01:14:33 +02:00
# Copyright (c) 2013, NVIDIA CORPORATION.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and/or associated documentation files (the
# "Materials"), to deal in the Materials without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Materials, and to
# permit persons to whom the Materials are furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be included
# unaltered in all copies or substantial portions of the Materials.
# Any additions, deletions, or changes to the original source files
# must be clearly indicated in accompanying documentation.
#
# If only executable code is distributed, then the accompanying
# documentation must state that "this software is based in part on the
# work of the Khronos Group."
#
# THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL 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
# MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
[build] distribute files needed to build Everything needed to actually build the driver needs to be included in something that makes it end up in the distribution tarball. For headers, use noinst_HEADERS. For everything else, use EXTRA_DIST. Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Signed-off-by: Brian Nguyen <brnguyen@nvidia.com>
2013-09-27 03:47:05 +02:00
noinst_HEADERS = \
Move glvnd_genentry into the GLX directory. The glvnd_genentry code isn't used outside of GLX.
2017-06-15 00:01:58 +02:00
glvnd_genentry.h \
[build] distribute files needed to build Everything needed to actually build the driver needs to be included in something that makes it end up in the distribution tarball. For headers, use noinst_HEADERS. For everything else, use EXTRA_DIST. Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Signed-off-by: Brian Nguyen <brnguyen@nvidia.com>
2013-09-27 03:47:05 +02:00
libglxabipriv.h \
libglxcurrent.h \
libglxmapping.h \
Re-implement libGL such that ELF symbol filtering is optional Unfortunately, glibc has a bug where dlopening a shared library with DT_FILTER or DT_AUXILIARY ELF headers can cause the application to segfault (see https://sourceware.org/bugzilla/show_bug.cgi?id=16272). Hence, for now, we can't rely on ELF symbol filtering to implement the libGL compatibility library for libGLdispatch and libGLX. This change re-implements libGL such that this is no longer necessary, by building in the glapi static dispatch stubs and implementing thin wrapper functions around GLX entrypoints. - Rename getCachedProcAddress() to __glXGetCachedProcAddress() and give this public visibility. This is used by the libGL wrapper library to retrieve GLX entrypoints at load time. - Link libGLX with the -Bsymbolic flag so __glXGetCachedProcAddress() avoids referencing functions in the libGL wrapper library when libGL and libGLX are both loaded. - Replace the hand-coded no-op definitions in libglxnoopdefs.h with a spec file, glx_funcs.spec, and a simple Perl script, gen_stubs.pl, which parses the file and generates no-op functions as well as pass-through functions that are used by libGL. - Restructure GLdispatch/vnd-glapi/mapi/entry.c such that the pure C fallback code is in its own header, entry_pure_c.h. In each of the entry_*.h headers, separate code not related to implementing the static dispatch stubs into an "#if !defined(STATIC_DISPATCH_ONLY)" block. - Give u_current (which is #defined as _glapi_Current or _glapi_tls_Current depending on the thread storage model used) public visibility so it can be referenced from outside of libGLdispatch.so. - When building libGL, include GLdispatch/vnd-glapi/mapi/entry.c in the sources, and define STATIC_DISPATCH_ONLY so that only the static entrypoints are compiled. Remove the -Wl,--auxiliary flags from Makefile.am. Bonus: fix "make distcheck" by adding GLdispatchABI.h to noinst_HEADERS. Signed-off-by: Brian Nguyen <brnguyen@nvidia.com>
2013-12-03 21:06:47 +01:00
libglxgl.h \
GLX: Add functions for the GLX_EXT_libglvnd extension. Add some functions to handle requests for looking up vendor names and screen numbers using the GLX_EXT_libglvnd extension.
2016-03-08 00:31:09 +01:00
libglxthread.h \
libglxproto.h
[build] distribute files needed to build Everything needed to actually build the driver needs to be included in something that makes it end up in the distribution tarball. For headers, use noinst_HEADERS. For everything else, use EXTRA_DIST. Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Signed-off-by: Brian Nguyen <brnguyen@nvidia.com>
2013-09-27 03:47:05 +02:00
[GLX] First pass at implementing libGLX.so Add a makefile to build libGLX. Update dispatch functions for each of the GLX 1.4 entrypoints as well as stubs for glXGetProcAddress() and glXMake{Context,}Current() to use the new vendor library ABI.
2013-08-23 01:14:33 +02:00
lib_LTLIBRARIES = libGLX.la
UTIL_DIR = ../util
[GLX] Implement caching proc addresses in glXGetProcAddress() This also doubles as a way to store addresses of locally-exported GLX functions; we use a pthread_once() callback to initialize the table with these addresses.
2013-08-12 22:12:09 +02:00
UTHASH_DIR = ../util/uthash/src
Add GLdispatch DSO Move the GLdispatch header file to its own directory in src/GLdispatch, and build a real DSO that GLX will depend on. In GLdispatch.c, add stub functions which will later be fleshed out.
2013-08-12 22:12:09 +02:00
GL_DISPATCH_DIR = ../GLdispatch
Implement tracing This implements a small tracing convenience library for debugging purposess.
2013-08-23 01:20:01 +02:00
[GLX] First pass at implementing libGLX.so Add a makefile to build libGLX. Update dispatch functions for each of the GLX 1.4 entrypoints as well as stubs for glXGetProcAddress() and glXMake{Context,}Current() to use the new vendor library ABI.
2013-08-23 01:14:33 +02:00
# Warning settings
# Include paths
[build] fix srcdir != builddir mistakes When configure is run from a directory other than the source directory, various files fail to compile because the include paths use $(builddir) or $(top_builddir) when the source is actually in $(srcdir) or $(top_srcdir). Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
2013-09-26 23:57:06 +02:00
libGLX_la_CFLAGS = -I$(srcdir)/$(UTHASH_DIR)
libGLX_la_CFLAGS += -I$(srcdir)/$(UTIL_DIR)
libGLX_la_CFLAGS += -I$(srcdir)/$(GL_DISPATCH_DIR)
libGLX_la_CFLAGS += -I$(top_srcdir)/include
Use the pkg-config variables for X11 and Xext. In the makefiles, use the CFLAGS and LIBS variables set by the PKG_CHECK_MODULES macros for X11 and Xext.
2019-09-12 18:15:33 +02:00
libGLX_la_CFLAGS += $(GLPROTO_CFLAGS) $(X11_CFLAGS) $(XEXT_CFLAGS)
[GLX] First pass at implementing libGLX.so Add a makefile to build libGLX. Update dispatch functions for each of the GLX 1.4 entrypoints as well as stubs for glXGetProcAddress() and glXMake{Context,}Current() to use the new vendor library ABI.
2013-08-23 01:14:33 +02:00
# Required library flags
libGLX_la_CFLAGS += $(PTHREAD_CFLAGS)
# Required libraries
configure: Check if linking against libdl is necessary. Add an AC_CHECK_FUNC call to check whether dlopen is available without any additional libraries. Some systems provide dlopen as part of libc, in which case we can't (and don't need to) link against libdl.so.
2018-03-08 18:55:01 +01:00
libGLX_la_LIBADD = @LIB_DL@
[GLX] First pass at implementing libGLX.so Add a makefile to build libGLX. Update dispatch functions for each of the GLX 1.4 entrypoints as well as stubs for glXGetProcAddress() and glXMake{Context,}Current() to use the new vendor library ABI.
2013-08-23 01:14:33 +02:00
libGLX_la_LIBADD += $(X11_LIBS)
libGLX_la_LIBADD += $(XEXT_LIBS)
Add GLdispatch DSO Move the GLdispatch header file to its own directory in src/GLdispatch, and build a real DSO that GLX will depend on. In GLdispatch.c, add stub functions which will later be fleshed out.
2013-08-12 22:12:09 +02:00
libGLX_la_LIBADD += $(GL_DISPATCH_DIR)/libGLdispatch.la
Move trace.[ch] into the src/utils directory. Move trace.c and trace.h into the src/utils directory instead of a subdirectory.
2016-04-05 21:38:58 +02:00
libGLX_la_LIBADD += $(UTIL_DIR)/libtrace.la
Fix some autoconf warnings. Fixed a few order and variable name warnings. Defined convenience libraries for the source files under src/util, to avoid the subdir-objects warning from them.
2016-04-05 00:57:56 +02:00
libGLX_la_LIBADD += $(UTIL_DIR)/libglvnd_pthread.la
libGLX_la_LIBADD += $(UTIL_DIR)/libutils_misc.la
libGLX_la_LIBADD += $(UTIL_DIR)/libapp_error_check.la
GLX: Use winsys_dispatch to keep track of GLX dispatch stubs. Remove the __GLXdispatchIndexHash table, and use the list in winsys_dispatch.c to keep track of the function indices, names, and dispatch stubs. If libGLX generates a GLX dispatch stub, then it will now assign an index to it when it generates the stub, not when it fills in the stub. That lets it treat generated stubs the same way regardless of whether they've been filled in or not. When assigning an index, it will now call the setDispatchIndex callback for every vendor library, not just the vendor that provided the dispatch stub. When loading a vendor library, it will call the new vendor's setDispatchIndex callback for every existing GLX dispatch function.
2016-05-03 20:31:27 +02:00
libGLX_la_LIBADD += $(UTIL_DIR)/libwinsys_dispatch.la
[GLX] First pass at implementing libGLX.so Add a makefile to build libGLX. Update dispatch functions for each of the GLX 1.4 entrypoints as well as stubs for glXGetProcAddress() and glXMake{Context,}Current() to use the new vendor library ABI.
2013-08-23 01:14:33 +02:00
libOpenGL: Fix the linker flags for libOpenGL. Fixed a couple lines in the libOpenGL makefile where it was using the wrong variable name. Added an explicit -version-info flag for libGLdispatch and libGLX. Added the --no-undefined linker flag for libOpenGL, libGL, libGLdispatch, and libGLX on systems where it's available.
2015-07-24 22:35:45 +02:00
libGLX_la_LDFLAGS = -shared -Wl,-Bsymbolic -version-info 0 $(LINKER_FLAG_NO_UNDEFINED)
Re-implement libGL such that ELF symbol filtering is optional Unfortunately, glibc has a bug where dlopening a shared library with DT_FILTER or DT_AUXILIARY ELF headers can cause the application to segfault (see https://sourceware.org/bugzilla/show_bug.cgi?id=16272). Hence, for now, we can't rely on ELF symbol filtering to implement the libGL compatibility library for libGLdispatch and libGLX. This change re-implements libGL such that this is no longer necessary, by building in the glapi static dispatch stubs and implementing thin wrapper functions around GLX entrypoints. - Rename getCachedProcAddress() to __glXGetCachedProcAddress() and give this public visibility. This is used by the libGL wrapper library to retrieve GLX entrypoints at load time. - Link libGLX with the -Bsymbolic flag so __glXGetCachedProcAddress() avoids referencing functions in the libGL wrapper library when libGL and libGLX are both loaded. - Replace the hand-coded no-op definitions in libglxnoopdefs.h with a spec file, glx_funcs.spec, and a simple Perl script, gen_stubs.pl, which parses the file and generates no-op functions as well as pass-through functions that are used by libGL. - Restructure GLdispatch/vnd-glapi/mapi/entry.c such that the pure C fallback code is in its own header, entry_pure_c.h. In each of the entry_*.h headers, separate code not related to implementing the static dispatch stubs into an "#if !defined(STATIC_DISPATCH_ONLY)" block. - Give u_current (which is #defined as _glapi_Current or _glapi_tls_Current depending on the thread storage model used) public visibility so it can be referenced from outside of libGLdispatch.so. - When building libGL, include GLdispatch/vnd-glapi/mapi/entry.c in the sources, and define STATIC_DISPATCH_ONLY so that only the static entrypoints are compiled. Remove the -Wl,--auxiliary flags from Makefile.am. Bonus: fix "make distcheck" by adding GLdispatchABI.h to noinst_HEADERS. Signed-off-by: Brian Nguyen <brnguyen@nvidia.com>
2013-12-03 21:06:47 +01:00
GLX: Define the GLX dispatch stubs at compile time. Rewrote the generated dispatch stubs for GLX so that they're all defined at compile time, instead of generating them at runtime. Insted of patching the address of the vendor-provided functions into the assembly stubs, it will now keep a separate array of function pointers. The assembly stubs will look up the approprite entry in that array and jump to it. As a result, the assembly code is entirely static, so we don't need to deal with generating or modifying executable code at runtime.
2017-06-15 00:37:21 +02:00
GENERATE_DISPATCH_STUBS_SCRIPT = $(top_srcdir)/src/GLX/gen_glx_stubs.py
EXTRA_DIST = $(GENERATE_DISPATCH_STUBS_SCRIPT)
if HAVE_PYTHON
g_glx_dispatch_stub_list.h: $(GENERATE_DISPATCH_STUBS_SCRIPT)
$(AM_V_GEN)$(PYTHON) $(GENERATE_DISPATCH_STUBS_SCRIPT) > $@
BUILT_SOURCES = g_glx_dispatch_stub_list.h
CLEANFILES = $(BUILT_SOURCES)
endif
[GLX] First pass at implementing libGLX.so Add a makefile to build libGLX. Update dispatch functions for each of the GLX 1.4 entrypoints as well as stubs for glXGetProcAddress() and glXMake{Context,}Current() to use the new vendor library ABI.
2013-08-23 01:14:33 +02:00
libGLX_la_SOURCES = \
[GLX] Include libglxmapping.c and libglxnoop.h in build libglxmapping.c implements functions needed for libGLX to map function calls to vendors for dispatching. libglxnoop.h contains a pointer to a no-op dispatch table. These will be re-implemented in a later change.
2013-08-23 01:21:31 +02:00
libglx.c \
[GLX] Implement the no-op GLX dispatch table Set the __glXDispatchNoopPtr statically to the __glXDispatchNoop dispatch table, defined in libglxnoop.c. Define no-op GLX 1.4 templates in libglxnoopdefs.h, which is included by libglxnoop.c. We do this instead of defining the no-op functions directly because these functions will also be needed by the libGL filter library. To facilitate code sharing, these templates use GLXNOOP and NOOP_FUNC() macros to respectively define the function qualifiers and prefix (e.g. "glX") of each no-op function.
2013-08-23 01:23:20 +02:00
libglxmapping.c \
Move glvnd_genentry into the GLX directory. The glvnd_genentry code isn't used outside of GLX.
2017-06-15 00:01:58 +02:00
libglxproto.c \
GLX: Define the GLX dispatch stubs at compile time. Rewrote the generated dispatch stubs for GLX so that they're all defined at compile time, instead of generating them at runtime. Insted of patching the address of the vendor-provided functions into the assembly stubs, it will now keep a separate array of function pointers. The assembly stubs will look up the approprite entry in that array and jump to it. As a result, the assembly code is entirely static, so we don't need to deal with generating or modifying executable code at runtime.
2017-06-15 00:37:21 +02:00
glvnd_genentry.c \
g_glx_dispatch_stub_list.h
Merge pull request #84 from kbrenneman/fix-automake-warnings Fix the warnings that autogen.sh spits out. Added libtool convenience libraries for the source files in src/util instead of including them directly in other makefiles. This avoids a bunch of subdir-objects warnings. Added libtool convenience libraries for each of the glapi builds. Flattened the vnd-glapi directory. In theory, just setting the subdir-objects flag should be enough, but that causes failures where "make distcheck" doesn't build all of the source files.
2016-05-11 19:16:57 +02:00
Add pkg-config files for EGL, GL, GLES, and GLX. This preserves the names from Mesa's gl, glesv1_cm, glesv2, and egl pkgconfig data, and for compatibility with that, gl.pc gives you libGL. Also added glx.pc and opengl.pc for libglvnd's libGLX and libOpenGL libraries. If newer applications want to explicitly depend on libGLX and the appropriate rendering API they can ask for the new pkgconfig names. Note that the version numbers in each file are the API versions that each library exposes, not the libglvnd package version.
2019-09-03 16:13:34 +02:00
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = glx.pc
tests: Add symbol check tests These use the symbol-check.py script from mesa, and should help to ensure that glvnd doesn't start exposing/hiding new symbols. It's also useful to double check that meson and autotools are doing the same thing.
2019-11-06 01:05:53 +01:00
AM_TESTS_ENVIRONMENT = \
TOP_SRCDIR='$(top_srcdir)' \
TOP_BUILDDIR='$(top_builddir)' \
NM='$(NM)' \
PYTHON='$(PYTHON)'
TESTS = glx-symbol-check.sh
EXTRA_DIST += \
glx-symbol-check.sh \
autotools: Include meson.build and meson_options.txt in dist
2019-11-05 22:22:31 +01:00
glx.symbols \
meson.build
Reference in a new issue Copy permalink