From f4092abdf94af6a99aff944d6264bc1284e8bdd4 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Mon, 10 Oct 2011 17:43:39 +0200 Subject: Imported nx-X11-3.1.0-1.tar.gz Summary: Imported nx-X11-3.1.0-1.tar.gz Keywords: Imported nx-X11-3.1.0-1.tar.gz into Git repository --- nx-X11/lib/GL/mesa/shader/slang/Imakefile | 108 +++++++++++++++++++++ nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc | 90 +++++++++++++++++ nx-X11/lib/GL/mesa/shader/slang/library/Imakefile | 97 ++++++++++++++++++ .../lib/GL/mesa/shader/slang/library/Imakefile.inc | 14 +++ 4 files changed, 309 insertions(+) create mode 100644 nx-X11/lib/GL/mesa/shader/slang/Imakefile create mode 100644 nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc create mode 100644 nx-X11/lib/GL/mesa/shader/slang/library/Imakefile create mode 100644 nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc (limited to 'nx-X11/lib/GL/mesa/shader/slang') diff --git a/nx-X11/lib/GL/mesa/shader/slang/Imakefile b/nx-X11/lib/GL/mesa/shader/slang/Imakefile new file mode 100644 index 000000000..096a8ea63 --- /dev/null +++ b/nx-X11/lib/GL/mesa/shader/slang/Imakefile @@ -0,0 +1,108 @@ +XCOMM $XFree86$ + +#include + +/* + * 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 MesaSlangBuildDir /**/ +#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/shader/slang \ + -I$(MESASRCDIR)/src/mesa/shader/slang/library \ + -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_SLANG_SRCS) + OBJS = $(MESA_SLANG_OBJS) + + +#include + +#define IHaveSubdirs +#define PassCDebugFlags + +SUBDIRS = library + +MakeSubdirs($(SUBDIRS)) +DependSubdirs($(SUBDIRS)) + +LibraryObjectRule() + +SubdirLibraryRule($(OBJS)) +NormalLintTarget($(SRCS)) + +DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc new file mode 100644 index 000000000..d824ca797 --- /dev/null +++ b/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc @@ -0,0 +1,90 @@ +XCOMM $XFree86$ + +#ifndef MesaSlangBuildDir +#define MesaSlangBuildDir $(GLXLIBSRC)/mesa/shader/slang/ +#endif + +MESASLANGBUILDDIR=MesaSlangBuildDir + + MESA_SLANG_SRCS = $(MESASLANGBUILDDIR)slang_assemble_assignment.c \ + $(MESASLANGBUILDDIR)slang_assemble.c \ + $(MESASLANGBUILDDIR)slang_assemble_conditional.c \ + $(MESASLANGBUILDDIR)slang_assemble_constructor.c \ + $(MESASLANGBUILDDIR)slang_assemble_typeinfo.c \ + $(MESASLANGBUILDDIR)slang_compile.c \ + $(MESASLANGBUILDDIR)slang_execute.c \ + $(MESASLANGBUILDDIR)slang_preprocess.c \ + $(MESASLANGBUILDDIR)slang_storage.c \ + $(MESASLANGBUILDDIR)slang_utility.c + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(slang_assemble_assignment.c, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_assemble_assignment.h, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_assemble.c, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_assemble.h, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_assemble_conditional.c, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_assemble_conditional.h, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_assemble_constructor.c, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_assemble_constructor.h, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_assemble_typeinfo.c, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_assemble_typeinfo.h, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_compile.c, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_compile.h, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_execute.c, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_execute.h, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_preprocess.c, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_preprocess.h, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_storage.c, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_storage.h, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_utility.c, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(slang_utility.h, $(MESASRCDIR)/src/mesa/shader/slang) +LinkSourceFile(traverse_wrap.h, $(MESASRCDIR)/src/mesa/shader/slang) +#endif + + MESA_SLANG_OBJS = $(MESASLANGBUILDDIR)slang_assemble_assignment.o \ + $(MESASLANGBUILDDIR)slang_assemble.o \ + $(MESASLANGBUILDDIR)slang_assemble_conditional.o \ + $(MESASLANGBUILDDIR)slang_assemble_constructor.o \ + $(MESASLANGBUILDDIR)slang_assemble_typeinfo.o \ + $(MESASLANGBUILDDIR)slang_compile.o \ + $(MESASLANGBUILDDIR)slang_execute.o \ + $(MESASLANGBUILDDIR)slang_preprocess.o \ + $(MESASLANGBUILDDIR)slang_storage.o \ + $(MESASLANGBUILDDIR)slang_utility.o + +#if defined(DoSharedLib) && DoSharedLib + MESA_SLANG_UOBJS = $(MESASLANGBUILDDIR)unshared/slang_assemble_assignment.o \ + $(MESASLANGBUILDDIR)unshared/slang_assemble.o \ + $(MESASLANGBUILDDIR)unshared/slang_assemble_conditional.o \ + $(MESASLANGBUILDDIR)unshared/slang_assemble_constructor.o \ + $(MESASLANGBUILDDIR)unshared/slang_assemble_typeinfo.o \ + $(MESASLANGBUILDDIR)unshared/slang_compile.o \ + $(MESASLANGBUILDDIR)unshared/slang_execute.o \ + $(MESASLANGBUILDDIR)unshared/slang_preprocess.o \ + $(MESASLANGBUILDDIR)unshared/slang_storage.o \ + $(MESASLANGBUILDDIR)unshared/slang_utility.o +#else + MESA_SLANG_UOBJS = $(MESA_SLANG_OBJS) +#endif + + MESA_SLANG_DOBJS = $(MESASLANGBUILDDIR)debuggerslang_assemble_assignment.o \ + $(MESASLANGBUILDDIR)debuggerslang_assemble.o \ + $(MESASLANGBUILDDIR)debuggerslang_assemble_conditional.o \ + $(MESASLANGBUILDDIR)debuggerslang_assemble_constructor.o \ + $(MESASLANGBUILDDIR)debuggerslang_assemble_typeinfo.o \ + $(MESASLANGBUILDDIR)debuggerslang_compile.o \ + $(MESASLANGBUILDDIR)debuggerslang_execute.o \ + $(MESASLANGBUILDDIR)debuggerslang_preprocess.o \ + $(MESASLANGBUILDDIR)debuggerslang_storage.o \ + $(MESASLANGBUILDDIR)debuggerslang_utility.o + + MESA_SLANG_POBJS = $(MESASLANGBUILDDIR)profiled/slang_assemble_assignment.o \ + $(MESASLANGBUILDDIR)profiled/slang_assemble.o \ + $(MESASLANGBUILDDIR)profiled/slang_assemble_conditional.o \ + $(MESASLANGBUILDDIR)profiled/slang_assemble_constructor.o \ + $(MESASLANGBUILDDIR)profiled/slang_assemble_typeinfo.o \ + $(MESASLANGBUILDDIR)profiled/slang_compile.o \ + $(MESASLANGBUILDDIR)profiled/slang_execute.o \ + $(MESASLANGBUILDDIR)profiled/slang_preprocess.o \ + $(MESASLANGBUILDDIR)profiled/slang_storage.o \ + $(MESASLANGBUILDDIR)profiled/slang_utility.o diff --git a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile new file mode 100644 index 000000000..de32171ae --- /dev/null +++ b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile @@ -0,0 +1,97 @@ +XCOMM $XFree86$ + +#include + +/* + * 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 MesaShaderBuildDir /**/ +#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/slang \ + -I$(MESASRCDIR)/src/mesa/shader/slang/library \ + -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_SLANG_SRCS) + OBJS = $(MESA_SLANG_OBJS) + + +#include + +SubdirLibraryRule($(OBJS)) +NormalLintTarget($(SRCS)) + +DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc new file mode 100644 index 000000000..3489b7a28 --- /dev/null +++ b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc @@ -0,0 +1,14 @@ +XCOMM $XFree86:$ + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(slang_common_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) +LinkSourceFile(slang_common_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) +LinkSourceFile(slang_core_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) +LinkSourceFile(slang_core_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) +LinkSourceFile(slang_fragment_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) +LinkSourceFile(slang_fragment_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) +LinkSourceFile(slang_shader_syn.h, $(MESASRCDIR)/src/mesa/shader/slang/library) +LinkSourceFile(slang_version_syn.h, $(MESASRCDIR)/src/mesa/shader/slang/library) +LinkSourceFile(slang_vertex_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) +LinkSourceFile(slang_vertex_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) +#endif -- cgit v1.2.3