Skip to content

Commit

Permalink
glx: Import glxvnd server module (v2)
Browse files Browse the repository at this point in the history
This is based on an out-of-tree module written by Kyle:

https://github.com/kbrenneman/libglvnd/tree/server-libglx

I (ajax) did a bunch of cosmetic fixes, ported it off xfree86 API,
added request length checks, and fixed a minor bug or two.

v2: Use separate functions to set/get a context tag's private data, and
call the backend's MakeCurrent when a client disconnects to unbind the
context. (Kyle Brenneman)

Signed-off-by: Adam Jackson <ajax@redhat.com>
  • Loading branch information
kbrenneman authored and nwnk committed Feb 14, 2018
1 parent d1fddde commit 8753218
Show file tree
Hide file tree
Showing 12 changed files with 2,125 additions and 1 deletion.
8 changes: 7 additions & 1 deletion glx/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ if DRI2
GLXDRI_LIBRARY = libglxdri.la
endif

noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY)
noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY) libglxvnd.la

AM_CFLAGS = \
@DIX_CFLAGS@ \
Expand Down Expand Up @@ -83,3 +83,9 @@ libglx_la_SOURCES = \
xfont.c

libglx_la_LIBADD = $(DLOPEN_LIBS)

libglxvnd_la_SOURCES = \
vndcmds.c \
vndext.c \
vndservermapping.c \
vndservervendor.c
21 changes: 21 additions & 0 deletions glx/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,24 @@ srcs_glxdri2 = []
if build_dri2 or build_dri3
srcs_glxdri2 = files('glxdri2.c')
endif

srcs_vnd = [
'vndcmds.c',
'vndext.c',
'vndservermapping.c',
'vndservervendor.c',
]

libglxvnd = ''
if build_glx
libglxvnd = static_library('libglxvnd',
srcs_vnd,
include_directories: inc,
dependencies: [
common_dep,
dl_dep,
dependency('glproto', version: '>= 1.4.17'),
dependency('gl', version: '>= 9.2.0'),
],
)
endif
Loading

0 comments on commit 8753218

Please sign in to comment.