aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/GL/glx
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-04-10 02:45:24 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-25 00:39:27 +0200
commite60f281aa5bed47b117f4c001d93da7fa1e1e40d (patch)
treedd560752eca2e99ec69ca99897a7bc66886ce472 /nx-X11/programs/Xserver/GL/glx
parentb4e2ec70982358cfc0ad939367dcbfc1bc3b519b (diff)
downloadnx-libs-e60f281aa5bed47b117f4c001d93da7fa1e1e40d.tar.gz
nx-libs-e60f281aa5bed47b117f4c001d93da7fa1e1e40d.tar.bz2
nx-libs-e60f281aa5bed47b117f4c001d93da7fa1e1e40d.zip
hw/nxagent/NXglxext.c: Shrink file, drop duplicate code that can identically be found in GL/glx/glxext.c.
Diffstat (limited to 'nx-X11/programs/Xserver/GL/glx')
-rw-r--r--nx-X11/programs/Xserver/GL/glx/Imakefile13
-rw-r--r--nx-X11/programs/Xserver/GL/glx/glxext.c5
2 files changed, 16 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/Imakefile b/nx-X11/programs/Xserver/GL/glx/Imakefile
index 5683cf51c..05dfed738 100644
--- a/nx-X11/programs/Xserver/GL/glx/Imakefile
+++ b/nx-X11/programs/Xserver/GL/glx/Imakefile
@@ -24,11 +24,19 @@ LinkSourceFile(glcontextmodes.h, $(MESASRCDIR)/src/mesa/drivers/dri/common)
LinkSourceFile(indirect_size.c, $(MESASRCDIR)/src/glx/x11)
LinkSourceFile(indirect_size.h, $(MESASRCDIR)/src/glx/x11)
+#if (!(defined(NXAgentServer) && NXAgentServer))
+NXAGENT_SKIP_SRCS = \
+ glxext.c \
+ $(NULL)
+NXAGENT_SKIP_OBJS = \
+ glxext.o \
+ $(NULL)
+#endif
+
SRCS = global.c \
glxbuf.c \
glxcmds.c \
glxcmdsswap.c \
- glxext.c \
glxfb.c \
glximports.c \
glxmem.c \
@@ -56,13 +64,13 @@ LinkSourceFile(indirect_size.h, $(MESASRCDIR)/src/glx/x11)
glcontextmodes. c \
indirect_size.c \
$(MSRCS) \
+ $(NXAGENT_SKIP_SRCS) \
$(NULL)
OBJS = global.o \
glxbuf.o \
glxcmds.o \
glxcmdsswap.o \
- glxext.o \
glxfb.o \
glximports.o \
glxmem.o \
@@ -90,6 +98,7 @@ LinkSourceFile(indirect_size.h, $(MESASRCDIR)/src/glx/x11)
glcontextmodes.o \
indirect_size.o \
$(MOBJS) \
+ $(NXAGENT_SKIP_OBJS) \
$(NULL)
INCLUDES = -I$(SERVERSRC)/GL/glx \
diff --git a/nx-X11/programs/Xserver/GL/glx/glxext.c b/nx-X11/programs/Xserver/GL/glx/glxext.c
index e7ed3975c..8b4ae4252 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxext.c
+++ b/nx-X11/programs/Xserver/GL/glx/glxext.c
@@ -390,6 +390,8 @@ __GLXcontext *__glXForceCurrent(__GLXclientState *cl, GLXContextTag tag,
/************************************************************************/
+#ifndef NXAGENT_SERVER
+
/*
** Top level dispatcher; all commands are executed from here down.
*/
@@ -493,6 +495,9 @@ static int __glXSwapDispatch(ClientPtr client)
return (*proc)(cl, (GLbyte *) stuff);
}
+#endif /* NXAGENT_SERVER */
+
+
int __glXNoSuchSingleOpcode(__GLXclientState *cl, GLbyte *pc)
{
return BadRequest;