Imported nx-X11-3.1.0-1.tar.gznx-X11/3.1.0-1

Summary: Imported nx-X11-3.1.0-1.tar.gz
Keywords:

Imported nx-X11-3.1.0-1.tar.gz
into Git repository

2 files changed, 127 insertions, 0 deletions

diff --git a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile
new file mode 100644
index 000000000..bbdec9764
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile
@@ -0,0 +1,98 @@
+XCOMM $XFree86$
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+#define MesaGrammarBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
+		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+      ASM_DIR = x86
+     ASM_SRCS =
+     ASM_OBJS =
+#if MesaUseMMX
+     MMX_DEFS = -DUSE_MMX_ASM
+#endif
+#if MesaUse3DNow
+   3DNOW_DEFS = -DUSE_3DNOW_ASM
+#endif
+#if MesaUseSSE
+     SSE_DEFS = -DUSE_SSE_ASM
+#endif
+     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+#endif
+
+#ifdef SparcArchitecture
+      ASM_DIR = sparc
+     ASM_SRCS =
+     ASM_OBJS =
+     ASM_DEFS = -DUSE_SPARC_ASM
+#endif
+
+#ifdef UseCompaqMathLibrary
+      MATHDEF = -DCCPML
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+                -I$(MESASRCDIR)/src/mesa/shader/grammar \
+		-I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
+		-I$(MESASRCDIR)/include \
+		-I../../../include -I$(XINCLUDESRC)
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+         SRCS = $(MESA_GRAMMAR_SRCS)
+         OBJS = $(MESA_GRAMMAR_OBJS)
+
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc
new file mode 100644
index 000000000..b2e885f89
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc
@@ -0,0 +1,29 @@
+XCOMM $XFree86$
+
+#ifndef MesaGrammarBuildDir
+#define MesaGrammarBuildDir $(GLXLIBSRC)/mesa/shader/grammar/
+#endif
+
+MESAGRAMMARBUILDDIR=MesaGrammarBuildDir
+
+  MESA_GRAMMAR_SRCS =	$(MESAGRAMMARBUILDDIR)grammar_mesa.c
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(grammar.c, $(MESASRCDIR)/src/mesa/shader/grammar)
+LinkSourceFile(grammar.h, $(MESASRCDIR)/src/mesa/shader/grammar)
+LinkSourceFile(grammar_syn.h, $(MESASRCDIR)/src/mesa/shader/grammar)
+LinkSourceFile(grammar_mesa.c, $(MESASRCDIR)/src/mesa/shader/grammar)
+LinkSourceFile(grammar_mesa.h, $(MESASRCDIR)/src/mesa/shader/grammar)
+#endif
+
+  MESA_GRAMMAR_OBJS =	 $(MESAGRAMMARBUILDDIR)grammar_mesa.o
+
+#if defined(DoSharedLib) && DoSharedLib
+ MESA_GRAMMAR_UOBJS = $(MESAGRAMMARBUILDDIR)unshared/grammar_mesa.o
+#else
+ MESA_GRAMMAR_UOBJS = $(MESA_GRAMMAR_OBJS)
+#endif
+
+ MESA_GRAMMAR_DOBJS = $(MESAGRAMMARBUILDDIR)debugger/grammar_mesa.o
+
+ MESA_GRAMMAR_POBJS = $(MESAGRAMMARBUILDDIR)profiled/grammar_mesa.o