diff options
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/Makefile.in | 21 | ||||
| -rw-r--r-- | xorg-server/glx/glxext.c | 15 |
2 files changed, 26 insertions, 10 deletions
diff --git a/xorg-server/glx/Makefile.in b/xorg-server/glx/Makefile.in index 65db3fd38..b915ec5d7 100644 --- a/xorg-server/glx/Makefile.in +++ b/xorg-server/glx/Makefile.in @@ -58,7 +58,8 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libglx_la_LIBADD = +am__DEPENDENCIES_1 = +libglx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am__objects_1 = indirect_dispatch.lo indirect_dispatch_swap.lo \ indirect_reqsize.lo indirect_size_get.lo indirect_table.lo \ glapi.lo glthread.lo @@ -73,7 +74,7 @@ libglx_la_OBJECTS = $(am_libglx_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent -libglxdri_la_LIBADD = +libglxdri_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am__libglxdri_la_SOURCES_DIST = glxdri.c extension_string.c \ extension_string.h glxdri2.c @DRI2_AIGLX_TRUE@am__objects_2 = glxdri2.lo @@ -152,6 +153,7 @@ DGA_LIBS = @DGA_LIBS@ DIX_CFLAGS = @DIX_CFLAGS@ DIX_LIB = @DIX_LIB@ DLLTOOL = @DLLTOOL@ +DLOPEN_LIBS = @DLOPEN_LIBS@ DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@ DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@ @@ -182,6 +184,13 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FONT100DPIDIR = @FONT100DPIDIR@ +FONT75DPIDIR = @FONT75DPIDIR@ +FONTMISCDIR = @FONTMISCDIR@ +FONTOTFDIR = @FONTOTFDIR@ +FONTROOTDIR = @FONTROOTDIR@ +FONTTTFDIR = @FONTTTFDIR@ +FONTTYPE1DIR = @FONTTYPE1DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ @@ -192,6 +201,7 @@ GREP = @GREP@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_LIBS = @HAL_LIBS@ INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -241,6 +251,8 @@ OBJCFLAGS = @OBJCFLAGS@ OBJCLINK = @OBJCLINK@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OS_LIB = @OS_LIB@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -265,6 +277,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ +SHA1_CFLAGS = @SHA1_CFLAGS@ +SHA1_LIBS = @SHA1_LIBS@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@ @@ -355,7 +369,6 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -437,6 +450,7 @@ glapi_sources = \ libglxdri_la_SOURCES = glxdri.c extension_string.c extension_string.h \ $(am__append_2) +libglxdri_la_LIBADD = $(DLOPEN_LIBS) libglx_la_SOURCES = \ $(indirect_sources) \ $(glapi_sources) \ @@ -475,6 +489,7 @@ libglx_la_SOURCES = \ unpack.h \ xfont.c +libglx_la_LIBADD = $(DLOPEN_LIBS) all: all-am .SUFFIXES: diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c index c8885fd3a..a3b5b62dd 100644 --- a/xorg-server/glx/glxext.c +++ b/xorg-server/glx/glxext.c @@ -349,13 +349,14 @@ void GlxExtensionInit(void) __GLXprovider *p; Bool glx_provided = False; - __glXContextRes = CreateNewResourceType((DeleteType)ContextGone); - __glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone); - __glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone); - - RegisterResourceName(__glXContextRes, "GLXContext"); - RegisterResourceName(__glXDrawableRes, "GLXDrawable"); - RegisterResourceName(__glXSwapBarrierRes, "GLXSwapBarrier"); + __glXContextRes = CreateNewResourceType((DeleteType)ContextGone, + "GLXContext"); + __glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone, + "GLXDrawable"); + __glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone, + "GLXSwapBarrier"); + if (!__glXContextRes || !__glXDrawableRes || !__glXSwapBarrierRes) + return; if (!dixRequestPrivate(glxClientPrivateKey, sizeof (__GLXclientState))) return; |