summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-02-27 00:34:31 +1100
committerBen Skeggs <skeggsb@gmail.com>2008-02-27 00:34:31 +1100
commit68ef52886263690632552ae187a4673945c2ab74 (patch)
tree0453c0063397c196ebe5e3dcd4d9c91392496d77
parent026e2fd3c6eb87a010a9c90341e8a77b09376b5b (diff)
parentad6bb870de6103ed240fa1f9f828bd13a4401a9a (diff)
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
-rw-r--r--.gitignore2
-rw-r--r--Makefile.DJ88
-rw-r--r--Makefile.mgw110
-rw-r--r--SConstruct100
-rw-r--r--configs/config.mgw42
-rw-r--r--descrip.mms22
-rw-r--r--doxygen/gallium.doxy3
-rw-r--r--mms.config23
-rw-r--r--progs/demos/descrip.mms90
-rw-r--r--progs/samples/Makefile.DJ85
-rw-r--r--progs/samples/Makefile.mgw93
-rw-r--r--progs/tests/descrip.mms84
-rw-r--r--progs/trivial/.gitignore1
-rw-r--r--progs/trivial/Makefile1
-rw-r--r--progs/trivial/line-smooth.c172
-rw-r--r--progs/util/descrip.mms42
-rw-r--r--progs/xdemos/descrip.mms83
-rw-r--r--src/SConscript11
-rw-r--r--src/descrip.mms43
-rw-r--r--src/gallium/SConscript11
-rw-r--r--src/gallium/auxiliary/cso_cache/cso_cache.c196
-rw-r--r--src/gallium/auxiliary/cso_cache/cso_cache.h87
-rw-r--r--src/gallium/auxiliary/cso_cache/cso_hash.c45
-rw-r--r--src/gallium/auxiliary/cso_cache/cso_hash.h22
-rw-r--r--src/gallium/auxiliary/draw/SConscript3
-rw-r--r--src/gallium/auxiliary/draw/draw_aapoint.c202
-rw-r--r--src/gallium/auxiliary/draw/draw_context.c24
-rw-r--r--src/gallium/auxiliary/draw/draw_pstipple.c4
-rw-r--r--src/gallium/auxiliary/draw/draw_validate.c16
-rw-r--r--src/gallium/auxiliary/pipebuffer/pb_buffer.h1
-rw-r--r--src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c2
-rw-r--r--src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c4
-rw-r--r--src/gallium/auxiliary/rtasm/rtasm_x86sse.c19
-rw-r--r--src/gallium/auxiliary/tgsi/Makefile1
-rw-r--r--src/gallium/auxiliary/tgsi/SConscript2
-rw-r--r--src/gallium/auxiliary/tgsi/exec/tgsi_exec.c2
-rw-r--r--src/gallium/auxiliary/tgsi/util/tgsi_dump.c4
-rw-r--r--src/gallium/auxiliary/tgsi/util/tgsi_scan.c117
-rw-r--r--src/gallium/auxiliary/tgsi/util/tgsi_scan.h57
-rw-r--r--src/gallium/drivers/cell/ppu/cell_context.h2
-rw-r--r--src/gallium/drivers/cell/ppu/cell_draw_arrays.c1
-rw-r--r--src/gallium/drivers/cell/ppu/cell_flush.h4
-rw-r--r--src/gallium/drivers/cell/ppu/cell_vertex_shader.c6
-rw-r--r--src/gallium/drivers/cell/spu/spu_dcache.c52
-rw-r--r--src/gallium/drivers/cell/spu/spu_exec.c8
-rw-r--r--src/gallium/drivers/cell/spu/spu_main.c5
-rw-r--r--src/gallium/drivers/cell/spu/spu_main.h5
-rw-r--r--src/gallium/drivers/cell/spu/spu_vertex_fetch.c2
-rw-r--r--src/gallium/drivers/i915simple/i915_context.c4
-rw-r--r--src/gallium/drivers/i915simple/i915_context.h43
-rw-r--r--src/gallium/drivers/i915simple/i915_flush.c3
-rw-r--r--src/gallium/drivers/i915simple/i915_fpc.h23
-rw-r--r--src/gallium/drivers/i915simple/i915_fpc_emit.c163
-rw-r--r--src/gallium/drivers/i915simple/i915_fpc_translate.c183
-rw-r--r--src/gallium/drivers/i915simple/i915_prim_emit.c40
-rw-r--r--src/gallium/drivers/i915simple/i915_prim_vbuf.c9
-rw-r--r--src/gallium/drivers/i915simple/i915_state.c38
-rw-r--r--src/gallium/drivers/i915simple/i915_state_derived.c104
-rw-r--r--src/gallium/drivers/i915simple/i915_state_emit.c39
-rw-r--r--src/gallium/drivers/softpipe/SConscript3
-rw-r--r--src/gallium/drivers/softpipe/sp_fs_exec.c4
-rw-r--r--src/gallium/drivers/softpipe/sp_fs_llvm.c2
-rw-r--r--src/gallium/drivers/softpipe/sp_prim_setup.c4
-rw-r--r--src/gallium/drivers/softpipe/sp_quad.c5
-rw-r--r--src/gallium/drivers/softpipe/sp_state.h7
-rw-r--r--src/gallium/drivers/softpipe/sp_state_derived.c39
-rw-r--r--src/gallium/drivers/softpipe/sp_state_fs.c22
-rw-r--r--src/gallium/drivers/softpipe/sp_tex_sample.c6
-rw-r--r--src/gallium/include/pipe/p_compiler.h12
-rw-r--r--src/gallium/include/pipe/p_context.h10
-rw-r--r--src/gallium/include/pipe/p_defines.h8
-rw-r--r--src/gallium/include/pipe/p_format.h8
-rw-r--r--src/gallium/include/pipe/p_inlines.h9
-rw-r--r--src/gallium/include/pipe/p_pointer.h95
-rw-r--r--src/gallium/include/pipe/p_shader_tokens.h2
-rw-r--r--src/gallium/include/pipe/p_state.h10
-rw-r--r--src/gallium/include/pipe/p_util.h44
-rw-r--r--src/gallium/include/pipe/p_winsys.h20
-rw-r--r--src/gallium/winsys/SConscript3
-rw-r--r--src/gallium/winsys/dri/intel/intel_batchbuffer.c1
-rw-r--r--src/gallium/winsys/dri/intel/intel_batchbuffer.h1
-rw-r--r--src/gallium/winsys/dri/intel/intel_context.c3
-rw-r--r--src/glu/descrip.mms9
-rw-r--r--src/glu/mesa/Makefile.DJ100
-rw-r--r--src/glu/mesa/descrip.mms61
-rw-r--r--src/glu/mesa/mms_depend15
-rw-r--r--src/glu/sgi/Makefile.DJ188
-rw-r--r--src/glu/sgi/Makefile.mgw229
-rw-r--r--src/glu/sgi/descrip.mms451
-rw-r--r--src/glut/dos/Makefile.DJ126
-rw-r--r--src/glut/glx/Makefile.mgw198
-rw-r--r--src/glut/glx/descrip.mms208
-rw-r--r--src/glut/glx/mms_depend72
-rw-r--r--src/mesa/Makefile.DJ166
-rw-r--r--src/mesa/Makefile.mgw235
-rw-r--r--src/mesa/descrip.mms26
-rw-r--r--src/mesa/drivers/common/descrip.mms38
-rw-r--r--src/mesa/drivers/osmesa/descrip.mms41
-rw-r--r--src/mesa/drivers/x11/descrip.mms51
-rw-r--r--src/mesa/glapi/descrip.mms37
-rw-r--r--src/mesa/main/descrip.mms221
-rw-r--r--src/mesa/math/descrip.mms45
-rw-r--r--src/mesa/shader/descrip.mms76
-rw-r--r--src/mesa/shader/grammar/descrip.mms41
-rw-r--r--src/mesa/shader/slang/descrip.mms65
-rw-r--r--src/mesa/state_tracker/st_atom_rasterizer.c14
-rw-r--r--src/mesa/state_tracker/st_cache.c13
-rw-r--r--src/mesa/swrast/descrip.mms80
-rw-r--r--src/mesa/swrast_setup/descrip.mms39
-rw-r--r--src/mesa/tnl/descrip.mms75
-rw-r--r--src/mesa/vbo/descrip.mms60
-rw-r--r--vms/analyze_map.com148
-rw-r--r--vms/xlib.opt2
-rw-r--r--vms/xlib_share.opt7
-rw-r--r--winddk.py278
-rw-r--r--windows/VC6/mesa/gdi/gdi.dsp211
-rw-r--r--windows/VC6/mesa/glu/compileDebug.txt82
-rw-r--r--windows/VC6/mesa/glu/compileRelease.txt82
-rw-r--r--windows/VC6/mesa/glu/glu.dsp2579
-rw-r--r--windows/VC6/mesa/glu/objectsDebug.txt73
-rw-r--r--windows/VC6/mesa/glu/objectsRelease.txt73
-rw-r--r--windows/VC6/mesa/mesa.dsw74
-rw-r--r--windows/VC6/mesa/mesa/mesa.dsp1582
-rw-r--r--windows/VC6/mesa/osmesa/osmesa.dsp195
-rw-r--r--windows/VC6/progs/demos/gears.dsp114
-rw-r--r--windows/VC6/progs/glut/glut.dsp333
-rw-r--r--windows/VC6/progs/progs.dsw41
-rw-r--r--windows/VC7/mesa/gdi/gdi.vcproj181
-rw-r--r--windows/VC7/mesa/glu/glu.vcproj752
-rw-r--r--windows/VC7/mesa/mesa.sln41
-rw-r--r--windows/VC7/mesa/mesa/mesa.vcproj1114
-rw-r--r--windows/VC7/mesa/osmesa/osmesa.vcproj168
-rw-r--r--windows/VC7/progs/demos/gears.vcproj154
-rw-r--r--windows/VC7/progs/glut/glut.vcproj322
-rw-r--r--windows/VC7/progs/progs.sln27
-rw-r--r--windows/VC8/mesa/gdi/gdi.vcproj260
-rw-r--r--windows/VC8/mesa/glu/glu.vcproj1022
-rw-r--r--windows/VC8/mesa/mesa.sln43
-rw-r--r--windows/VC8/mesa/mesa/mesa.vcproj1753
-rw-r--r--windows/VC8/mesa/osmesa/osmesa.vcproj243
-rw-r--r--windows/VC8/progs/demos/gears.vcproj239
-rw-r--r--windows/VC8/progs/glut/glut.vcproj449
-rw-r--r--windows/VC8/progs/progs.sln28
143 files changed, 1904 insertions, 16712 deletions
diff --git a/.gitignore b/.gitignore
index b5e59dfc3e..5c9129535a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
*.a
*.o
+*.pyc
+*.pyo
*.so
*.sw[a-z]
*~
diff --git a/Makefile.DJ b/Makefile.DJ
deleted file mode 100644
index deaac09d18..0000000000
--- a/Makefile.DJ
+++ /dev/null
@@ -1,88 +0,0 @@
-# Mesa 3-D graphics library
-# Version: 4.0
-#
-# Copyright (C) 1999 Brian Paul All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# DOS/DJGPP makefile for Mesa
-#
-# Author: Daniel Borca
-# Email : dborca@users.sourceforge.net
-# Web : http://www.geocities.com/dborca
-
-
-#
-# Available options:
-#
-# Environment variables:
-# GLIDE path to Glide3 SDK; used with FX.
-# default = $(TOP)/glide3
-# FX=1 build for 3dfx Glide3. Note that this disables
-# compilation of most DMesa code and requires fxMesa.
-# As a consequence, you'll need the DJGPP Glide3
-# library to build any application.
-# default = no
-# X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow).
-# default = no
-#
-# Targets:
-# all: build everything
-# libgl: build GL
-# libglu: build GLU
-# libglut: build GLUT
-# clean: remove object files
-# realclean: remove all generated files
-#
-
-
-
-.PHONY : all libgl libglu libglut clean realclean
-
-CFLAGS = -Wall -W -pedantic
-CFLAGS += -O2 -ffast-math
-
-export CFLAGS
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-all: libgl libglu libglut
-
-libgl: lib
- $(MAKE) -f Makefile.DJ -C src/mesa
-libglu: lib
- $(MAKE) -f Makefile.DJ -C src/glu/sgi
-libglut: lib
- $(MAKE) -f Makefile.DJ -C src/glut/dos
-
-lib:
- mkdir lib
-
-clean:
- $(MAKE) -f Makefile.DJ clean -C src/mesa
- $(MAKE) -f Makefile.DJ clean -C src/glu/mesa
- $(MAKE) -f Makefile.DJ clean -C src/glu/sgi
- $(MAKE) -f Makefile.DJ clean -C src/glut/dos
-
-realclean: clean
- -$(call UNLINK,lib/*.a)
- -$(call UNLINK,lib/*.dxe)
diff --git a/Makefile.mgw b/Makefile.mgw
deleted file mode 100644
index 3dc9f62643..0000000000
--- a/Makefile.mgw
+++ /dev/null
@@ -1,110 +0,0 @@
-# Mesa 3-D graphics library
-# Version: 4.0
-#
-# Copyright (C) 1999 Brian Paul All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# MinGW makefile v1.2 for Mesa
-#
-# Copyright (C) 2002 - Daniel Borca
-# Email : dborca@users.sourceforge.net
-# Web : http://www.geocities.com/dborca
-
-
-#
-# Available options:
-#
-# Environment variables:
-# GLIDE path to Glide3 SDK; used with FX.
-# default = $(TOP)/glide3
-# FX=1 build for 3dfx Glide3. Note that this disables
-# compilation of most WMesa code and requires fxMesa.
-# As a consequence, you'll need the Win32 Glide3
-# library to build any application.
-# default = no
-# ICD=1 build the installable client driver interface
-# (windows opengl driver interface)
-# default = no
-# X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow).
-# default = no
-#
-# Targets:
-# all: build everything
-# libgl: build GL
-# clean: remove object files
-# realclean: remove all generated files
-#
-
-# MinGW core makefile updated for Mesa 7.0
-#
-# Updated : by Heromyth, on 2007-7-21
-# Email : zxpmyth@yahoo.com.cn
-# Bugs : 1) All the default settings work fine. But the setting X86=1 can't work.
-# The others havn't been tested yet.
-# 2) The generated DLLs are *not* compatible with the ones built
-# with the other compilers like VC8, especially for GLUT.
-# 3) MAlthough more tests are needed, it can be used individually!
-
-
-.PHONY : all libgl clean realclean
-
-ifeq ($(ICD),1)
- # when -std=c99 mingw will not define WIN32
- CFLAGS = -Wall -Werror
-else
- # I love c89
- CFLAGS = -Wall -pedantic
-endif
-CFLAGS += -O2 -ffast-math
-
-export CFLAGS
-
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-all: libgl libglu libglut example
-
-libgl: lib
- $(MAKE) -f Makefile.mgw -C src/mesa
-
-libglu: libgl
- $(MAKE) -f Makefile.mgw -C src/glu/sgi
-
-libglut: libglu
- $(MAKE) -f Makefile.mgw -C src/glut/glx
-
-example: libglut
- $(MAKE) -f Makefile.mgw star -C progs/samples
- copy progs\samples\star.exe lib
-
-lib:
- mkdir lib
-
-clean:
- $(MAKE) -f Makefile.mgw clean -C src/mesa
- $(MAKE) -f Makefile.mgw clean -C src/glu/sgi
- $(MAKE) -f Makefile.mgw clean -C src/glut/glx
-
-realclean: clean
- -$(call UNLINK,lib/*.a)
- -$(call UNLINK,lib/*.dll)
diff --git a/SConstruct b/SConstruct
index 0420195395..e4926f29b6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -33,17 +33,53 @@ platform_map = {
'win32': 'winddk',
}
-platform = platform_map.get(sys.platform, sys.platform)
+default_platform = platform_map.get(sys.platform, sys.platform)
+
+if default_platform in ('linux', 'freebsd', 'darwin'):
+ default_statetrackers = 'mesa'
+ default_drivers = 'softpipe,failover,i915simple,i965simple'
+ default_winsys = 'xlib'
+ default_dri = 'yes'
+elif default_platform in ('winddk',):
+ default_statetrackers = 'none'
+ default_drivers = 'softpipe,i915simple'
+ default_winsys = 'none'
+ default_dri = 'no'
+else:
+ default_drivers = 'all'
+ default_winsys = 'all'
+ default_dri = 'no'
+
# TODO: auto-detect defaults
opts = Options('config.py')
opts.Add(BoolOption('debug', 'build debug version', False))
-opts.Add(BoolOption('dri', 'build dri drivers', False))
-opts.Add(BoolOption('llvm', 'use llvm', False))
opts.Add(EnumOption('machine', 'use machine-specific assembly code', 'x86',
allowed_values=('generic', 'x86', 'x86-64')))
-opts.Add(EnumOption('platform', 'target platform', platform,
+opts.Add(EnumOption('platform', 'target platform', default_platform,
allowed_values=('linux', 'cell', 'winddk')))
+opts.Add(ListOption('statetrackers', 'state_trackers to build', default_statetrackers,
+ [
+ 'mesa',
+ ],
+ ))
+opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,
+ [
+ 'softpipe',
+ 'failover',
+ 'i915simple',
+ 'i965simple',
+ 'cell',
+ ],
+ ))
+opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
+ [
+ 'xlib',
+ 'intel',
+ ],
+ ))
+opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
+opts.Add(BoolOption('dri', 'build DRI drivers', default_dri))
env = Environment(
options = opts,
@@ -84,26 +120,14 @@ Export([
if platform == 'winddk':
- import ntpath
- escape = env['ESCAPE']
- env.Tool('msvc')
- if 'BASEDIR' in os.environ:
- WINDDK = os.environ['BASEDIR']
- else:
- WINDDK = "C:\\WINDDK\\3790.1830"
- # NOTE: We need this elaborate construct to get the absolute paths and
- # forward slashes to msvc unharmed when cross compiling from posix platforms
- env.Append(CPPFLAGS = [
- escape('/I' + ntpath.join(WINDDK, 'inc\\ddk\\wxp')),
- escape('/I' + ntpath.join(WINDDK, 'inc\\ddk\\wdm\\wxp')),
- escape('/I' + ntpath.join(WINDDK, 'inc\\crt')),
- ])
- env.Append(CPPDEFINES = [
- ('i386', '1'),
- ])
- if debug:
- env.Append(CPPDEFINES = ['DBG'])
+ env.Tool('winddk', ['.'])
+ env.Append(CPPPATH = [
+ env['SDK_INC_PATH'],
+ env['DDK_INC_PATH'],
+ env['WDM_INC_PATH'],
+ env['CRT_INC_PATH'],
+ ])
# Optimization flags
if gcc:
@@ -114,17 +138,41 @@ if gcc:
env.Append(CFLAGS = '-O3 -g3')
env.Append(CXXFLAGS = '-O3 -g3')
- env.Append(CFLAGS = '-Wall -Wmissing-prototypes -std=c99 -ffast-math -pedantic')
+ env.Append(CFLAGS = '-Wall -Wmissing-prototypes -Wno-long-long -ffast-math -pedantic')
env.Append(CXXFLAGS = '-Wall -pedantic')
# Be nice to Eclipse
env.Append(CFLAGS = '-fmessage-length=0')
env.Append(CXXFLAGS = '-fmessage-length=0')
+if msvc:
+ env.Append(CFLAGS = '/W3')
+ if debug:
+ cflags = [
+ '/Od', # disable optimizations
+ '/Oy-', # disable frame pointer omission
+ '/Zi', # enable enable debugging information
+ ]
+ else:
+ cflags = [
+ '/Ox', # maximum optimizations
+ '/Os', # favor code space
+ '/Zi', # enable enable debugging information
+ ]
+ env.Append(CFLAGS = cflags)
+ env.Append(CXXFLAGS = cflags)
+
# Defines
if debug:
- env.Append(CPPDEFINES = ['DEBUG'])
+ if gcc:
+ env.Append(CPPDEFINES = ['DEBUG'])
+ if msvc:
+ env.Append(CPPDEFINES = [
+ ('DBG', '1'),
+ ('DEBUG', '1'),
+ ('_DEBUG', '1'),
+ ])
else:
env.Append(CPPDEFINES = ['NDEBUG'])
@@ -192,7 +240,7 @@ if llvm:
# libGL
-if 1:
+if platform not in ('winddk',):
env.Append(LIBS = [
'X11',
'Xext',
diff --git a/configs/config.mgw b/configs/config.mgw
deleted file mode 100644
index b961eb965c..0000000000
--- a/configs/config.mgw
+++ /dev/null
@@ -1,42 +0,0 @@
-# MinGW config include file updated for Mesa 7.0
-#
-# Updated : by Heromyth, on 2007-7-21
-# Email : zxpmyth@yahoo.com.cn
-# Bugs : 1) All the default settings work fine. But the setting X86=1 can't work.
-# The others havn't been tested yet.
-# 2) The generated DLLs are *not* compatible with the ones built
-# with the other compilers like VC8, especially for GLUT.
-# 3) Although more tests are needed, it can be used individually!
-
-# The generated DLLs by MingW with STDCALL are not totally compatible
-# with the ones linked by Microsoft's compilers.
-#
-# xxx_USING_STDCALL = 1 Compiling MESA with __stdcall. This is default!
-#
-# xxx_USING_STDCALL = 0 Compiling MESA without __stdcall. I like this:)
-#
-
-# In fact, GL_USING_STDCALL and GLUT_USING_STDCALL can be
-# different. For example:
-#
-# GL_USING_STDCALL = 0
-# GLUT_USING_STDCALL = 1
-#
-# Suggested setting:
-#
-# ALL_USING_STDCALL = 1
-#
-# That's default!
-#
-
-
-ALL_USING_STDCALL = 1
-
-
-ifeq ($(ALL_USING_STDCALL),1)
- GL_USING_STDCALL = 1
- GLUT_USING_STDCALL = 1
-else
- GL_USING_STDCALL = 0
- GLUT_USING_STDCALL = 0
-endif
diff --git a/descrip.mms b/descrip.mms
deleted file mode 100644
index f2f8434913..0000000000
--- a/descrip.mms
+++ /dev/null
@@ -1,22 +0,0 @@
-# Makefile for Mesa for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-
-macro :
- @ macro=""
-.ifdef NOSHARE
-.else
- @ if f$getsyi("HW_MODEL") .ge. 1024 then macro= "/MACRO=(SHARE=1)"
-.endif
- $(MMS)$(MMSQUALIFIERS)'macro' all
-
-all :
- if f$search("lib.dir") .eqs. "" then create/directory [.lib]
- set default [.src]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.progs.util]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.demos]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.xdemos]
- $(MMS)$(MMSQUALIFIERS)
- if f$search("[-]tests.DIR") .nes. "" then pipe set default [-.tests] ; $(MMS)$(MMSQUALIFIERS)
diff --git a/doxygen/gallium.doxy b/doxygen/gallium.doxy
index 3ef8c6c297..1a38c8d12c 100644
--- a/doxygen/gallium.doxy
+++ b/doxygen/gallium.doxy
@@ -479,8 +479,7 @@ WARN_LOGFILE =
INPUT = gallium.doc \
../src/gallium \
- ../src/mesa/state_tracker \
- ../src/mesa/x86/rtasm
+ ../src/mesa/state_tracker
# This tag can be used to specify the character encoding of the source files that
# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default
diff --git a/mms.config b/mms.config
deleted file mode 100644
index 6a960084b3..0000000000
--- a/mms.config
+++ /dev/null
@@ -1,23 +0,0 @@
-# Makefile for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-
-
-#vms
-.ifdef SHARE
-GL_SHAR = libMesaGL.exe
-GLU_SHAR = libMesaGLU.exe
-GLUT_SHAR = libglut.exe
-.endif
-GL_LIB = libMesaGL.olb
-GLU_LIB = libMesaGLU.olb
-GLUT_LIB = libglut.olb
-CC = cc
-CXX = cxx/define=(LIBRARYBUILD=1)/assume=(nostdnew,noglobal_array_new)
-CFLAGS1 =
-MAKELIB = library/create
-RANLIB = true
-.ifdef SHARE
-XLIBS = [--.vms]xlib_share/opt
-.else
-XLIBS = [--.vms]xlib/opt
-.endif
diff --git a/progs/demos/descrip.mms b/progs/demos/descrip.mms
deleted file mode 100644
index bb2489fc3b..0000000000
--- a/progs/demos/descrip.mms
+++ /dev/null
@@ -1,90 +0,0 @@
-# Makefile for GLUT-based demo programs for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-# Last update : 20 May 2005
-
-.first
- define gl [--.include.gl]
-
-.include [--]mms.config
-
-##### MACROS #####
-
-INCDIR = ([--.include],[-.util])
-CFLAGS =/include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
-
-.ifdef SHARE
-GL_LIBS = $(XLIBS)
-LIB_DEP = [--.lib]$(GL_SHAR) [--.lib]$(GLU_SHAR) [--.lib]$(GLUT_SHAR)
-.else
-GL_LIBS = [--.lib]libGLUT/l,libMesaGLU/l,libMesaGL/l,$(XLIBS)
-LIB_DEP = [--.lib]$(GL_LIB) [--.lib]$(GLU_LIB) [--.lib]$(GLUT_LIB)
-.endif
-
-
-PROGS = bounce.exe;,clearspd.exe;,drawpix.exe;,gamma.exe;,gears.exe;,\
- glinfo.exe;,glutfx.exe;,isosurf.exe;,morph3d.exe;,\
- paltex.exe;,pointblast.exe;,reflect.exe;,spectex.exe;,stex3d.exe;,\
- tessdemo.exe;,texcyl.exe;,texobj.exe;,trispd.exe;,winpos.exe;
-
-
-##### RULES #####
-.obj.exe :
- cxxlink $(MMS$TARGET_NAME),$(GL_LIBS)
-
-##### TARGETS #####
-default :
- $(MMS)$(MMSQUALIFIERS) $(PROGS)
-
-clean :
- delete *.obj;*
-
-realclean :
- delete $(PROGS)
- delete *.obj;*
-
-bounce.exe; : bounce.obj $(LIB_DEP)
-clearspd.exe; : clearspd.obj $(LIB_DEP)
-drawpix.exe; : drawpix.obj $(LIB_DEP) [-.util]readtex.obj
- cxxlink $(MMS$TARGET_NAME),[-.util]readtex.obj,$(GL_LIBS)
-gamma.exe; : gamma.obj $(LIB_DEP)
-gears.exe; : gears.obj $(LIB_DEP)
-glinfo.exe; : glinfo.obj $(LIB_DEP)
-glutfx.exe; : glutfx.obj $(LIB_DEP)
-isosurf.exe; : isosurf.obj $(LIB_DEP) [-.util]readtex.obj
- cxxlink $(MMS$TARGET_NAME),[-.util]readtex.obj,$(GL_LIBS)
-morph3d.exe; : morph3d.obj $(LIB_DEP)
-paltex.exe; : paltex.obj $(LIB_DEP)
-pointblast.exe; : pointblast.obj $(LIB_DEP)
-reflect.exe; : reflect.obj [-.util]readtex.obj [-.util]showbuffer.obj\
- $(LIB_DEP)
- cxxlink $(MMS$TARGET_NAME),[-.util]readtex,showbuffer,$(GL_LIBS)
-spectex.exe; : spectex.obj $(LIB_DEP)
-stex3d.exe; : stex3d.obj $(LIB_DEP)
-tessdemo.exe; : tessdemo.obj $(LIB_DEP)
-texcyl.exe; : texcyl.obj [-.util]readtex.obj $(LIB_DEP)
- cxxlink $(MMS$TARGET_NAME),[-.util]readtex.obj,$(GL_LIBS)
-texobj.exe; : texobj.obj $(LIB_DEP)
-trispd.exe; : trispd.obj $(LIB_DEP)
-winpos.exe; : winpos.obj [-.util]readtex.obj $(LIB_DEP)
- cxxlink $(MMS$TARGET_NAME),[-.util]readtex.obj,$(GL_LIBS)
-
-
-bounce.obj : bounce.c
-clearspd.obj : clearspd.c
-drawpix.obj : drawpix.c
-gamma.obj : gamma.c
-gears.obj : gears.c
-glinfo.obj : glinfo.c
-glutfx.obj : glutfx.c
-isosurf.obj : isosurf.c
-morph3d.obj : morph3d.c
-paltex.obj : paltex.c
-pointblast.obj : pointblast.c
-reflect.obj : reflect.c
-spectex.obj : spectex.c
-stex3d.obj : stex3d.c
-tessdemo.obj : tessdemo.c
-texcyl.obj : texcyl.c
-texobj.obj : texobj.c
-trispd.obj : trispd.c
-winpos.obj : winpos.c
diff --git a/progs/samples/Makefile.DJ b/progs/samples/Makefile.DJ
deleted file mode 100644
index cda4e05941..0000000000
--- a/progs/samples/Makefile.DJ
+++ /dev/null
@@ -1,85 +0,0 @@
-# Mesa 3-D graphics library
-# Version: 4.0
-#
-# Copyright (C) 1999 Brian Paul All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# DOS/DJGPP samples makefile v1.6 for Mesa
-#
-# Copyright (C) 2002 - Daniel Borca
-# Email : dborca@users.sourceforge.net
-# Web : http://www.geocities.com/dborca
-
-
-#
-# Available options:
-#
-# Environment variables:
-# GLIDE path to Glide3 SDK; used with FX.
-# default = $(TOP)/glide3
-# FX=1 build for 3dfx Glide3. Note that this disables
-# compilation of most DMesa code and requires fxMesa.
-# As a consequence, you'll need the DJGPP Glide3
-# library to build any application.
-# default = no
-# DXE=1 use DXE modules (see README.DJ for details).
-# default = no
-#
-# Targets:
-# <file.exe> build a specific file
-#
-
-
-
-.PHONY: all
-.SUFFIXES: .c .o .exe
-.SECONDARY: ../util/readtex.o ../util/showbuffer.o
-
-TOP = ../..
-GLIDE ?= $(TOP)/glide3
-
-CC = gcc
-CFLAGS = -Wall -W -pedantic
-CFLAGS += -O2 -ffast-math
-CFLAGS += -I$(TOP)/include -I../util
-CFLAGS += -DGLUT_IMPORT_LIB
-ifeq ($(FX),1)
-CFLAGS += -DFX
-endif
-
-LD = gxx
-LDFLAGS = -s -L$(TOP)/lib
-
-ifeq ($(DXE),1)
-LDLIBS += -liglut -liglu -ligl
-else
-LDLIBS = -lglut -lglu -lgl
-ifeq ($(FX),1)
-LDFLAGS += -L$(GLIDE)/lib
-LDLIBS += -lgld3x
-endif
-endif
-
-.c.o:
- $(CC) -o $@ $(CFLAGS) -c $<
-%.exe: ../util/readtex.o ../util/showbuffer.o %.o
- $(LD) -o $@ $(LDFLAGS) $^ $(LDLIBS)
-
-all:
- $(error Must specify <filename.exe> to build)
diff --git a/progs/samples/Makefile.mgw b/progs/samples/Makefile.mgw
deleted file mode 100644
index 3b2fd785de..0000000000
--- a/progs/samples/Makefile.mgw
+++ /dev/null
@@ -1,93 +0,0 @@
-# Mesa 3-D graphics library
-# Version: 4.0
-#
-# Copyright (C) 1999 Brian Paul All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# MinGW samples makefile v1.2 for Mesa
-#
-# Copyright (C) 2002 - Daniel Borca
-# Email : dborca@users.sourceforge.net
-# Web : http://www.geocities.com/dborca
-
-# MinGW samples makefile updated for Mesa 7.0
-#
-# Updated : by Heromyth, on 2007-7-21
-# Email : zxpmyth@yahoo.com.cn
-# Bugs : 1) All the default settings work fine. But the setting X86=1 can't work.
-# The others havn't been tested yet.
-# 2) The generated DLLs are *not* compatible with the ones built
-# with the other compilers like VC8, especially for GLUT.
-# 3) Although more tests are needed, it can be used individually!
-
-#
-# Available options:
-#
-# Environment variables:
-#
-# Targets:
-# <file.exe> build a specific file
-#
-
-
-
-.PHONY: all
-.SUFFIXES: .c .o .exe
-.SECONDARY: ../util/readtex.o ../util/showbuffer.o
-
-TOP = ../..
-
-include $(TOP)/configs/config.mgw
-ALL_USING_STDCALL ?= 1
-GL_USING_STDCALL ?= 1
-GLUT_USING_STDCALL ?= 1
-
-CC = mingw32-gcc
-CFLAGS = -Wall -pedantic
-CFLAGS += -O2 -ffast-math
-CFLAGS += -I$(TOP)/include -I../util
-ifeq ($(FX),1)
- CFLAGS += -DFX
-endif
-
-CFLAGS += -DGLUT_DISABLE_ATEXIT_HACK
-
-ifeq ($(GL_USING_STDCALL),0)
- CFLAGS += -DGL_NO_STDCALL
-endif
-
-ifeq ($(GLUT_USING_STDCALL),1)
- CFLAGS += -D_STDCALL_SUPPORTED
-else
- CFLAGS += -DGLUT_NO_STDCALL
-endif
-
-
-LD = mingw32-g++
-LDFLAGS = -s -L$(TOP)/lib
-
-LDLIBS = -lglut32 -lglu32 -lopengl32
-
-.c.o:
- $(CC) -o $@ $(CFLAGS) -c $<
-%.exe: ../util/readtex.o ../util/showbuffer.o %.o
- $(LD) -o $@ $(LDFLAGS) $^ $(LDLIBS)
-
-all:
- $(error Must specify <filename.exe> to build)
diff --git a/progs/tests/descrip.mms b/progs/tests/descrip.mms
deleted file mode 100644
index 567b76bc4b..0000000000
--- a/progs/tests/descrip.mms
+++ /dev/null
@@ -1,84 +0,0 @@
-# Makefile for GLUT-based demo programs for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-
-
-.first
- define gl [--.include.gl]
-
-.include [--]mms.config
-
-##### MACROS #####
-
-INCDIR = ([--.include],[-.util])
-CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
-
-.ifdef SHARE
-GL_LIBS = $(XLIBS)
-.else
-GL_LIBS = [--.lib]libGLUT/l,libMesaGLU/l,libMesaGL/l,$(XLIBS)
-.endif
-
-LIB_DEP = [--.lib]$(GL_LIB) [--.lib]$(GLU_LIB) [--.lib]$(GLUT_LIB)
-
-PROGS = cva.exe,\
- dinoshade.exe,\
- fogcoord.exe,\
- manytex.exe,\
- multipal.exe,\
- projtex.exe,\
- seccolor.exe,\
- sharedtex.exe,\
- texline.exe,\
- texwrap.exe,\
- vptest1.exe,\
- vptest2.exe,\
- vptest3.exe,\
- vptorus.exe,\
- vpwarpmesh.exe
-
-##### RULES #####
-.obj.exe :
- cxxlink $(MMS$TARGET_NAME),$(GL_LIBS)
-
-##### TARGETS #####
-default :
- $(MMS)$(MMSQUALIFIERS) $(PROGS)
-
-clean :
- delete *.obj;*
-
-realclean :
- delete $(PROGS)
- delete *.obj;*
-
-cva.exe : cva.obj $(LIB_DEP)
-dinoshade.exe : dinoshade.obj $(LIB_DEP)
-fogcoord.exe : fogcoord.obj $(LIB_DEP)
-manytex.exe : manytex.obj $(LIB_DEP)
-multipal.exe : multipal.obj $(LIB_DEP)
-projtex.exe : projtex.obj $(LIB_DEP)
-seccolor.exe : seccolor.obj $(LIB_DEP)
-sharedtex.exe : sharedtex.obj $(LIB_DEP)
-texline.exe : texline.obj $(LIB_DEP)
-texwrap.exe : texwrap.obj $(LIB_DEP)
-vptest1.exe : vptest1.obj $(LIB_DEP)
-vptest2.exe : vptest2.obj $(LIB_DEP)
-vptest3.exe : vptest3.obj $(LIB_DEP)
-vptorus.exe : vptorus.obj $(LIB_DEP)
-vpwarpmesh.exe : vpwarpmesh.obj $(LIB_DEP)
-
-cva.obj : cva.c
-dinoshade.obj : dinoshade.c
-fogcoord.obj : fogcoord.c
-manytex.obj : manytex.c
-multipal.obj : multipal.c
-projtex.obj : projtex.c
-seccolor.obj : seccolor.c
-sharedtex.obj : sharedtex.c
-texline.obj : texline.c
-texwrap.obj : texwrap.c
-vptest1.obj : vptest1.c
-vptest2.obj : vptest2.c
-vptest3.obj : vptest3.c
-vptorus.obj : vptorus.c
-vpwarpmesh.obj : vpwarpmesh.c
diff --git a/progs/trivial/.gitignore b/progs/trivial/.gitignore
index cdd04092bd..aafc4a7291 100644
--- a/progs/trivial/.gitignore
+++ b/progs/trivial/.gitignore
@@ -27,6 +27,7 @@ linestrip
linestrip-flat-stipple
linestrip-stipple
linestrip-stipple-wide
+pgon-mode
point
point-clip
point-param
diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile
index d19abe7e86..8bc6ad4e38 100644
--- a/progs/trivial/Makefile
+++ b/progs/trivial/Makefile
@@ -25,6 +25,7 @@ SOURCES = \
fs-tri.c \
line-clip.c \
line-cull.c \
+ line-smooth.c \
line-stipple-wide.c \
line-userclip-clip.c \
line-userclip-nop-clip.c \
diff --git a/progs/trivial/line-smooth.c b/progs/trivial/line-smooth.c
new file mode 100644
index 0000000000..f030de9b9f
--- /dev/null
+++ b/progs/trivial/line-smooth.c
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 1991, 1992, 1993 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the name of
+ * Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Silicon Graphics.
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF
+ * ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <GL/glut.h>
+
+
+#define CI_OFFSET_1 16
+#define CI_OFFSET_2 32
+
+
+GLenum doubleBuffer;
+GLboolean smooth = GL_TRUE;
+GLfloat width = 1.0;
+
+
+static void Init(void)
+{
+ float range[2], aarange[2];
+ fprintf(stderr, "GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
+ fprintf(stderr, "GL_VERSION = %s\n", (char *) glGetString(GL_VERSION));
+ fprintf(stderr, "GL_VENDOR = %s\n", (char *) glGetString(GL_VENDOR));
+ glGetFloatv(GL_LINE_WIDTH_RANGE, aarange);
+ glGetFloatv(GL_ALIASED_LINE_WIDTH_RANGE, range);
+ printf("Non-AA line width range: %f .. %f\n", range[0], range[1]);
+ printf("AA line width range: %f .. %f\n", aarange[0], aarange[1]);
+}
+
+
+static void Reshape(int width, int height)
+{
+ glViewport(0, 0, (GLint)width, (GLint)height);
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ glOrtho(-1.0, 1.0, -1.0, 1.0, -0.5, 1000.0);
+ glMatrixMode(GL_MODELVIEW);
+ glLoadIdentity();
+ glTranslatef(0, 0, -30);
+}
+
+static void Key(unsigned char key, int x, int y)
+{
+ switch (key) {
+ case 'w':
+ width -= 0.5;
+ if (width < 0.5)
+ width = 0.5;
+ break;
+ case 'W':
+ width += 0.5;
+ break;
+ case 's':
+ smooth = !smooth;
+ break;
+ case 27:
+ exit(1);
+ default:
+ return;
+ }
+ printf("LineWidth: %g\n", width);
+ glutPostRedisplay();
+}
+
+
+static void Draw(void)
+{
+ float a;
+
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ glLineWidth(width);
+
+ if (smooth) {
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glEnable(GL_BLEND);
+ glEnable(GL_LINE_SMOOTH);
+ }
+
+ glColor3f(1, 1, 1);
+
+ glBegin(GL_LINES);
+ for (a = 0; a < 3.14159; a += 0.2) {
+ float x = .9 * cos(a);
+ float y = .9 * sin(a);
+
+ glVertex2f(-x, -y);
+ glVertex2f( x, y);
+ }
+ glEnd();
+
+ glDisable(GL_LINE_SMOOTH);
+ glDisable(GL_BLEND);
+
+ glFlush();
+
+ if (doubleBuffer) {
+ glutSwapBuffers();
+ }
+}
+
+static GLenum Args(int argc, char **argv)
+{
+ GLint i;
+
+ doubleBuffer = GL_FALSE;
+
+ for (i = 1; i < argc; i++) {
+ if (strcmp(argv[i], "-sb") == 0) {
+ doubleBuffer = GL_FALSE;
+ } else if (strcmp(argv[i], "-db") == 0) {
+ doubleBuffer = GL_TRUE;
+ } else {
+ fprintf(stderr, "%s (Bad option).\n", argv[i]);
+ return GL_FALSE;
+ }
+ }
+ return GL_TRUE;
+}
+
+
+int main(int argc, char **argv)
+{
+ GLenum type;
+
+ glutInit(&argc, argv);
+
+ if (Args(argc, argv) == GL_FALSE) {
+ exit(1);
+ }
+
+ glutInitWindowPosition(0, 0); glutInitWindowSize( 250, 250);
+
+ type = GLUT_RGB;
+ type |= (doubleBuffer) ? GLUT_DOUBLE : GLUT_SINGLE;
+ glutInitDisplayMode(type);
+
+ if (glutCreateWindow(argv[0]) == GL_FALSE) {
+ exit(1);
+ }
+
+ Init();
+
+ glutReshapeFunc(Reshape);
+ glutKeyboardFunc(Key);
+ glutDisplayFunc(Draw);
+ glutMainLoop();
+ return 0;
+}
diff --git a/progs/util/descrip.mms b/progs/util/descrip.mms
deleted file mode 100644
index b2ee5ec971..0000000000
--- a/progs/util/descrip.mms
+++ /dev/null
@@ -1,42 +0,0 @@
-# Makefile for GLUT-based demo programs for VMS
-# contributed by Jouk Jansen joukj@crys.chem.uva.nl
-
-
-.first
- define gl [--.include.gl]
-
-.include [--]mms.config
-
-##### MACROS #####
-
-INCDIR = ([--.include],[-.util])
-CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
-
-.ifdef SHARE
-GL_LIBS = $(XLIBS)
-LIB_DEP = [--.lib]$(GL_SHAR) [--.lib]$(GLU_SHAR) [--.lib]$(GLUT_SHAR)
-.else
-GL_LIBS = [--.lib]libGLUT/l,libMesaGLU/l,libMesaGL/l,$(XLIBS)
-LIB_DEP = [--.lib]$(GL_LIB) [--.lib]$(GLU_LIB) [--.lib]$(GLUT_LIB)
-.endif
-
-
-OBJS =readtex.obj,showbuffer.obj
-
-
-##### RULES #####
-.obj.exe :
- cxxlink $(MMS$TARGET_NAME),$(GL_LIBS)
-
-##### TARGETS #####
-default :
- $(MMS)$(MMSQUALIFIERS) $(OBJS)
-
-clean :
- delete *.obj;*
-
-realclean :
- delete *.obj;*
-
-readtex.obj : readtex.c
-showbuffer.obj : showbuffer.c
diff --git a/progs/xdemos/descrip.mms b/progs/xdemos/descrip.mms
deleted file mode 100644
index fe6a3c44e6..0000000000
--- a/progs/xdemos/descrip.mms
+++ /dev/null
@@ -1,83 +0,0 @@
-# Makefile for GLUT-based demo programs for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-
-
-.first
- define gl [--.include.gl]
-
-.include [--]mms.config
-
-##### MACROS #####
-
-INCDIR = ([--.include],[-.util])
-CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)/nowarn/float=ieee/ieee=denorm
-
-.ifdef SHARE
-GL_LIBS = $(XLIBS)
-.else
-GL_LIBS = [--.lib]libGLUT/l,libMesaGLU/l,libMesaGL/l,$(XLIBS)
-.endif
-
-LIB_DEP = [--.lib]$(GL_LIB) [--.lib]$(GLU_LIB) [--.lib]$(GLUT_LIB)
-
-PROGS =glthreads.exe,\
- glxdemo.exe,\
- glxgears.exe,\
- glxheads.exe,\
- glxinfo.exe,\
- glxpixmap.exe,\
- manywin.exe,\
- offset.exe,\
- pbinfo.exe,\
- pbdemo.exe,\
- wincopy.exe,\
- xdemo.exe,\
- xfont.exe
-
-##### RULES #####
-.obj.exe :
- cxxlink $(MMS$TARGET_NAME),$(GL_LIBS)
-
-##### TARGETS #####
-default :
- $(MMS)$(MMSQUALIFIERS) $(PROGS)
-
-clean :
- delete *.obj;*
-
-realclean :
- delete $(PROGS)
- delete *.obj;*
-
-
-glthreads.exe : glthreads.obj $(LIB_DEP)
-glxdemo.exe : glxdemo.obj $(LIB_DEP)
-glxgears.exe : glxgears.obj $(LIB_DEP)
-glxheads.exe : glxheads.obj $(LIB_DEP)
-glxinfo.exe : glxinfo.obj $(LIB_DEP)
-glxpixmap.exe : glxpixmap.obj $(LIB_DEP)
-manywin.exe : manywin.obj $(LIB_DEP)
-offset.exe : offset.obj $(LIB_DEP)
-pbinfo.exe : pbinfo.obj pbutil.obj $(LIB_DEP)
- cxxlink pbinfo.obj,pbutil.obj,$(GL_LIBS)
-pbdemo.exe : pbdemo.obj pbutil.obj $(LIB_DEP)
- cxxlink pbdemo.obj,pbutil.obj,$(GL_LIBS)
-wincopy.exe : wincopy.obj $(LIB_DEP)
-xdemo.exe : xdemo.obj $(LIB_DEP)
-xfont.exe :xfont.obj $(LIB_DEP)
-
-
-glthreads.obj : glthreads.c
-glxdemo.obj : glxdemo.c
-glxgears.obj : glxgears.c
-glxheads.obj : glxheads.c
-glxinfo.obj : glxinfo.c
-glxpixmap.obj : glxpixmap.c
-manywin.obj : manywin.c
-offset.obj : offset.c
-pbinfo.obj : pbinfo.c
-pbutil.obj : pbutil.c
-pbdemo.obj : pbdemo.c
-wincopy.obj : wincopy.c
-xdemo.obj : xdemo.c
-xfont.obj :xfont.c
diff --git a/src/SConscript b/src/SConscript
index 5b09943894..8e914af4f0 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,7 +1,8 @@
Import('*')
-SConscript([
- 'gallium/SConscript',
- 'mesa/SConscript',
- 'gallium/winsys/SConscript',
-])
+SConscript('gallium/SConscript')
+
+if 'mesa' in env['statetrackers']:
+ SConscript('mesa/SConscript')
+
+SConscript('gallium/winsys/SConscript')
diff --git a/src/descrip.mms b/src/descrip.mms
deleted file mode 100644
index 79c7d98d25..0000000000
--- a/src/descrip.mms
+++ /dev/null
@@ -1,43 +0,0 @@
-# Makefile for Mesa for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-
-.include [-]mms.config
-
-all :
- set default [.mesa]
- $(MMS)$(MMSQUALIFIERS)
- set default [-]
-.ifdef SHARE
- $(MMS)$(MMSQUALIFIERS) [-.lib]$(GL_SHAR)
-.endif
- set default [.glu]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.glut.glx]
- $(MMS)$(MMSQUALIFIERS)
- set default [--]
-
-[-.lib]$(GL_SHAR) : [-.lib]$(GL_LIB)
- @ WRITE_ SYS$OUTPUT " generating libmesa.opt"
- @ library/extract=* [-.lib]$(GL_LIB)
- @ OPEN_/WRITE FILE libmesa.opt
- @ WRITE_ FILE "!"
- @ WRITE_ FILE "! libmesa.opt generated by DESCRIP.$(MMS_EXT)"
- @ WRITE_ FILE "!"
- @ WRITE_ FILE "IDENTIFICATION=""mesa5.1"""
- @ WRITE_ FILE "GSMATCH=LEQUAL,5,1
- @ WRITE_ FILE "libmesagl.obj"
- @ write_ file "sys$share:decw$xextlibshr/share"
- @ write_ file "sys$share:decw$xlibshr/share"
- @ write_ file "sys$share:pthread$rtl/share"
- @ CLOSE_ FILE
- @ $(MMS)$(MMSQUALIFIERS)/ignore=warning mesa_vms
- @ WRITE_ SYS$OUTPUT " linking ..."
- @ LINK_/NODEB/SHARE=[-.lib]$(GL_SHAR)/MAP=libmesa.map/FULL libmesa.opt/opt,\
- mesa_vms.opt/opt
- @ delete libmesagl.obj;*
-
-mesa_vms :
- @ WRITE_ SYS$OUTPUT " generating libmesa.map ..."
- @ LINK_/NODEB/NOSHARE/NOEXE/MAP=libmesa.map/FULL libmesa.opt/OPT
- @ WRITE_ SYS$OUTPUT " analyzing libmesa.map ..."
- @ @[-.vms]analyze_map.com libmesa.map mesa_vms.opt
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index a08b4b830e..fa4833cbcf 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,3 +1,5 @@
+import os
+
Import('*')
env = env.Clone()
@@ -20,10 +22,5 @@ SConscript([
if llvm:
SConscript(['auxiliary/gallivm/SConscript'])
-SConscript([
- 'drivers/softpipe/SConscript',
- 'drivers/i915simple/SConscript',
- 'drivers/i965simple/SConscript',
- 'drivers/failover/SConscript',
- #'drivers/cell/SConscript',
-])
+for driver in env['drivers']:
+ SConscript(os.path.join('drivers', driver, 'SConscript'))
diff --git a/src/gallium/auxiliary/cso_cache/cso_cache.c b/src/gallium/auxiliary/cso_cache/cso_cache.c
index 9e77e0774d..b427b509f8 100644
--- a/src/gallium/auxiliary/cso_cache/cso_cache.c
+++ b/src/gallium/auxiliary/cso_cache/cso_cache.c
@@ -28,9 +28,22 @@
/* Authors: Zack Rusin <zack@tungstengraphics.com>
*/
+#include "pipe/p_util.h"
+
#include "cso_cache.h"
#include "cso_hash.h"
+
+struct cso_cache {
+ struct cso_hash *blend_hash;
+ struct cso_hash *depth_stencil_hash;
+ struct cso_hash *fs_hash;
+ struct cso_hash *vs_hash;
+ struct cso_hash *rasterizer_hash;
+ struct cso_hash *sampler_hash;
+ int max_size;
+};
+
#if 1
static unsigned hash_key(const void *key, unsigned key_size)
{
@@ -114,12 +127,106 @@ static int _cso_size_for_type(enum cso_cache_type type)
return 0;
}
+
+static void delete_blend_state(void *state, void *data)
+{
+ struct cso_blend *cso = (struct cso_blend *)state;
+ if (cso->delete_state && cso->data != &cso->state)
+ cso->delete_state(cso->context, cso->data);
+}
+
+static void delete_depth_stencil_state(void *state, void *data)
+{
+ struct cso_depth_stencil_alpha *cso = (struct cso_depth_stencil_alpha *)state;
+ if (cso->delete_state && cso->data != &cso->state)
+ cso->delete_state(cso->context, cso->data);
+}
+
+static void delete_sampler_state(void *state, void *data)
+{
+ struct cso_sampler *cso = (struct cso_sampler *)state;
+ if (cso->delete_state && cso->data != &cso->state)
+ cso->delete_state(cso->context, cso->data);
+}
+
+static void delete_rasterizer_state(void *state, void *data)
+{
+ struct cso_rasterizer *cso = (struct cso_rasterizer *)state;
+ if (cso->delete_state && cso->data != &cso->state)
+ cso->delete_state(cso->context, cso->data);
+}
+
+static void delete_fs_state(void *state, void *data)
+{
+ struct cso_fragment_shader *cso = (struct cso_fragment_shader *)state;
+ if (cso->delete_state && cso->data != &cso->state)
+ cso->delete_state(cso->context, cso->data);
+}
+
+static void delete_vs_state(void *state, void *data)
+{
+ struct cso_vertex_shader *cso = (struct cso_vertex_shader *)state;
+ if (cso->delete_state && cso->data != &cso->state)
+ cso->delete_state(cso->context, cso->data);
+}
+
+
+static INLINE void delete_cso(void *state, enum cso_cache_type type)
+{
+ switch (type) {
+ case CSO_BLEND: {
+ delete_blend_state(state, 0);
+ }
+ break;
+ case CSO_SAMPLER: {
+ delete_sampler_state(state, 0);
+ }
+ break;
+ case CSO_DEPTH_STENCIL_ALPHA: {
+ delete_depth_stencil_state(state, 0);
+ }
+ break;
+ case CSO_RASTERIZER: {
+ delete_rasterizer_state(state, 0);
+ }
+ break;
+ case CSO_FRAGMENT_SHADER: {
+ delete_fs_state(state, 0);
+ }
+ break;
+ case CSO_VERTEX_SHADER: {
+ delete_vs_state(state, 0);
+ }
+ break;
+ }
+ FREE(state);
+}
+
+static INLINE void sanitize_hash(struct cso_hash *hash, enum cso_cache_type type,
+ int max_size)
+{
+ /* if we're approach the maximum size, remove fourth of the entries
+ * otherwise every subsequent call will go through the same */
+ int max_entries = (max_size > cso_hash_size(hash)) ? max_size : cso_hash_size(hash);
+ int to_remove = (max_size < max_entries) * max_entries/4;
+ while (to_remove) {
+ /*remove elements until we're good */
+ /*fixme: currently we pick the nodes to remove at random*/
+ struct cso_hash_iter iter = cso_hash_first_node(hash);
+ void *cso = cso_hash_take(hash, cso_hash_iter_key(iter));
+ delete_cso(cso, type);
+ --to_remove;
+ }
+}
+
struct cso_hash_iter
cso_insert_state(struct cso_cache *sc,
unsigned hash_key, enum cso_cache_type type,
void *state)
{
struct cso_hash *hash = _cso_hash_for_type(sc, type);
+ sanitize_hash(hash, type, sc->max_size);
+
return cso_hash_insert(hash, hash_key, state);
}
@@ -132,6 +239,26 @@ cso_find_state(struct cso_cache *sc,
return cso_hash_find(hash, hash_key);
}
+
+void *cso_hash_find_data_from_template( struct cso_hash *hash,
+ unsigned hash_key,
+ void *templ,
+ int size )
+{
+ struct cso_hash_iter iter = cso_hash_find(hash, hash_key);
+ while (!cso_hash_iter_is_null(iter)) {
+ void *iter_data = cso_hash_iter_data(iter);
+ if (!memcmp(iter_data, templ, size)) {
+ /* Return the payload:
+ */
+ return (unsigned char *)iter_data + size;
+ }
+ iter = cso_hash_iter_next(iter);
+ }
+ return NULL;
+}
+
+
struct cso_hash_iter cso_find_state_template(struct cso_cache *sc,
unsigned hash_key, enum cso_cache_type type,
void *templ)
@@ -156,8 +283,9 @@ void * cso_take_state(struct cso_cache *sc,
struct cso_cache *cso_cache_create(void)
{
- struct cso_cache *sc = malloc(sizeof(struct cso_cache));
+ struct cso_cache *sc = MALLOC_STRUCT(cso_cache);
+ sc->max_size = 4096;
sc->blend_hash = cso_hash_create();
sc->sampler_hash = cso_hash_create();
sc->depth_stencil_hash = cso_hash_create();
@@ -168,14 +296,78 @@ struct cso_cache *cso_cache_create(void)
return sc;
}
+void cso_for_each_state(struct cso_cache *sc, enum cso_cache_type type,
+ cso_state_callback func, void *user_data)
+{
+ struct cso_hash *hash = 0;
+ struct cso_hash_iter iter;
+
+ switch (type) {
+ case CSO_BLEND:
+ hash = sc->blend_hash;
+ break;
+ case CSO_SAMPLER:
+ hash = sc->sampler_hash;
+ break;
+ case CSO_DEPTH_STENCIL_ALPHA:
+ hash = sc->depth_stencil_hash;
+ break;
+ case CSO_RASTERIZER:
+ hash = sc->rasterizer_hash;
+ break;
+ case CSO_FRAGMENT_SHADER:
+ hash = sc->fs_hash;
+ break;
+ case CSO_VERTEX_SHADER:
+ hash = sc->vs_hash;
+ break;
+ }
+
+ iter = cso_hash_first_node(hash);
+ while (!cso_hash_iter_is_null(iter)) {
+ void *state = cso_hash_iter_data(iter);
+ if (state) {
+ func(state, user_data);
+ }
+ iter = cso_hash_iter_next(iter);
+ }
+}
+
void cso_cache_delete(struct cso_cache *sc)
{
assert(sc);
+ /* delete driver data */
+ cso_for_each_state(sc, CSO_BLEND, delete_blend_state, 0);
+ cso_for_each_state(sc, CSO_DEPTH_STENCIL_ALPHA, delete_depth_stencil_state, 0);
+ cso_for_each_state(sc, CSO_FRAGMENT_SHADER, delete_fs_state, 0);
+ cso_for_each_state(sc, CSO_VERTEX_SHADER, delete_vs_state, 0);
+ cso_for_each_state(sc, CSO_RASTERIZER, delete_rasterizer_state, 0);
+ cso_for_each_state(sc, CSO_SAMPLER, delete_sampler_state, 0);
+
cso_hash_delete(sc->blend_hash);
cso_hash_delete(sc->sampler_hash);
cso_hash_delete(sc->depth_stencil_hash);
cso_hash_delete(sc->rasterizer_hash);
cso_hash_delete(sc->fs_hash);
cso_hash_delete(sc->vs_hash);
- free(sc);
+ FREE(sc);
}
+
+void cso_set_maximum_cache_size(struct cso_cache *sc, int number)
+{
+ sc->max_size = number;
+
+ sanitize_hash(sc->blend_hash, CSO_BLEND, sc->max_size);
+ sanitize_hash(sc->depth_stencil_hash, CSO_DEPTH_STENCIL_ALPHA,
+ sc->max_size);
+ sanitize_hash(sc->fs_hash, CSO_FRAGMENT_SHADER, sc->max_size);
+ sanitize_hash(sc->vs_hash, CSO_VERTEX_SHADER, sc->max_size);
+ sanitize_hash(sc->rasterizer_hash, CSO_RASTERIZER, sc->max_size);
+ sanitize_hash(sc->sampler_hash, CSO_SAMPLER, sc->max_size);
+}
+
+int cso_maximum_cache_size(const struct cso_cache *sc)
+{
+ return sc->max_size;
+}
+
diff --git a/src/gallium/auxiliary/cso_cache/cso_cache.h b/src/gallium/auxiliary/cso_cache/cso_cache.h
index 116e2eaa2c..3b0fe100b8 100644
--- a/src/gallium/auxiliary/cso_cache/cso_cache.h
+++ b/src/gallium/auxiliary/cso_cache/cso_cache.h
@@ -1,6 +1,6 @@
/**************************************************************************
*
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007-2008 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -25,9 +25,48 @@
*
**************************************************************************/
- /*
- * Authors:
- * Zack Rusin <zack@tungstengraphics.com>
+ /**
+ * @file
+ * Constant State Object (CSO) cache.
+ *
+ * The basic idea is that the states are created via the
+ * create_state/bind_state/delete_state semantics. The driver is expected to
+ * perform as much of the Gallium state translation to whatever its internal
+ * representation is during the create call. Gallium then has a caching
+ * mechanism where it stores the created states. When the pipeline needs an
+ * actual state change, a bind call is issued. In the bind call the driver
+ * gets its already translated representation.
+ *
+ * Those semantics mean that the driver doesn't do the repeated translations
+ * of states on every frame, but only once, when a new state is actually
+ * created.
+ *
+ * Even on hardware that doesn't do any kind of state cache, it makes the
+ * driver look a lot neater, plus it avoids all the redundant state
+ * translations on every frame.
+ *
+ * Currently our constant state objects are:
+ * - alpha test
+ * - blend
+ * - depth stencil
+ * - fragment shader
+ * - rasterizer (old setup)
+ * - sampler
+ * - vertex shader
+ *
+ * Things that are not constant state objects include:
+ * - blend_color
+ * - clip_state
+ * - clear_color_state
+ * - constant_buffer
+ * - feedback_state
+ * - framebuffer_state
+ * - polygon_stipple
+ * - scissor_state
+ * - texture_state
+ * - viewport_state
+ *
+ * @author Zack Rusin <zack@tungstengraphics.com>
*/
#ifndef CSO_CACHE_H
@@ -36,46 +75,57 @@
#include "pipe/p_context.h"
#include "pipe/p_state.h"
+/* cso_hash.h is necessary for cso_hash_iter, as MSVC requires structures
+ * returned by value to be fully defined */
+#include "cso_hash.h"
-struct cso_hash;
-struct cso_cache {
- struct cso_hash *blend_hash;
- struct cso_hash *depth_stencil_hash;
- struct cso_hash *fs_hash;
- struct cso_hash *vs_hash;
- struct cso_hash *rasterizer_hash;
- struct cso_hash *sampler_hash;
-};
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct cso_cache;
struct cso_blend {
struct pipe_blend_state state;
void *data;
+ void (*delete_state)(void *, void *);
+ void *context;
};
struct cso_depth_stencil_alpha {
struct pipe_depth_stencil_alpha_state state;
void *data;
+ void (*delete_state)(void *, void *);
+ void *context;
};
struct cso_rasterizer {
struct pipe_rasterizer_state state;
void *data;
+ void (*delete_state)(void *, void *);
+ void *context;
};
struct cso_fragment_shader {
struct pipe_shader_state state;
void *data;
+ void (*delete_state)(void *, void *);
+ void *context;
};
struct cso_vertex_shader {
struct pipe_shader_state state;
void *data;
+ void (*delete_state)(void *, void *);
+ void *context;
};
struct cso_sampler {
struct pipe_sampler_state state;
void *data;
+ void (*delete_state)(void *, void *);
+ void *context;
};
@@ -88,6 +138,8 @@ enum cso_cache_type {
CSO_VERTEX_SHADER
};
+typedef void (*cso_state_callback)(void *, void *);
+
unsigned cso_construct_key(void *item, int item_size);
struct cso_cache *cso_cache_create(void);
@@ -101,7 +153,16 @@ struct cso_hash_iter cso_find_state(struct cso_cache *sc,
struct cso_hash_iter cso_find_state_template(struct cso_cache *sc,
unsigned hash_key, enum cso_cache_type type,
void *templ);
+void cso_for_each_state(struct cso_cache *sc, enum cso_cache_type type,
+ cso_state_callback func, void *user_data);
void * cso_take_state(struct cso_cache *sc, unsigned hash_key,
enum cso_cache_type type);
+void cso_set_maximum_cache_size(struct cso_cache *sc, int number);
+int cso_maximum_cache_size(const struct cso_cache *sc);
+
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/gallium/auxiliary/cso_cache/cso_hash.c b/src/gallium/auxiliary/cso_cache/cso_hash.c
index b40217c524..b3b4d667d2 100644
--- a/src/gallium/auxiliary/cso_cache/cso_hash.c
+++ b/src/gallium/auxiliary/cso_cache/cso_hash.c
@@ -30,12 +30,10 @@
* Zack Rusin <zack@tungstengraphics.com>
*/
-#include "cso_hash.h"
+#include "pipe/p_debug.h"
+#include "pipe/p_util.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
+#include "cso_hash.h"
#define MAX(a, b) ((a > b) ? (a) : (b))
@@ -98,7 +96,7 @@ struct cso_hash {
static void *cso_data_allocate_node(struct cso_hash_data *hash)
{
- return malloc(hash->nodeSize);
+ return MALLOC(hash->nodeSize);
}
static void cso_data_free_node(struct cso_node *node)
@@ -107,10 +105,10 @@ static void cso_data_free_node(struct cso_node *node)
* Need to cast value ptr to original cso type, then free the
* driver-specific data hanging off of it. For example:
struct cso_sampler *csamp = (struct cso_sampler *) node->value;
- free(csamp->data);
+ FREE(csamp->data);
*/
- free(node->value);
- free(node);
+ FREE(node->value);
+ FREE(node);
}
static struct cso_node *
@@ -134,7 +132,7 @@ static void cso_data_rehash(struct cso_hash_data *hash, int hint)
hint = countBits(-hint);
if (hint < MinNumBits)
hint = MinNumBits;
- hash->userNumBits = hint;
+ hash->userNumBits = (short)hint;
while (primeForNumBits(hint) < (hash->size >> 1))
++hint;
} else if (hint < MinNumBits) {
@@ -147,9 +145,9 @@ static void cso_data_rehash(struct cso_hash_data *hash, int hint)
int oldNumBuckets = hash->numBuckets;
int i = 0;
- hash->numBits = hint;
+ hash->numBits = (short)hint;
hash->numBuckets = primeForNumBits(hint);
- hash->buckets = malloc(sizeof(struct cso_node*) * hash->numBuckets);
+ hash->buckets = MALLOC(sizeof(struct cso_node*) * hash->numBuckets);
for (i = 0; i < hash->numBuckets; ++i)
hash->buckets[i] = e;
@@ -173,7 +171,7 @@ static void cso_data_rehash(struct cso_hash_data *hash, int hint)
firstNode = afterLastNode;
}
}
- free(oldBuckets);
+ FREE(oldBuckets);
}
}
@@ -235,13 +233,13 @@ struct cso_hash_iter cso_hash_insert(struct cso_hash *hash,
struct cso_hash * cso_hash_create(void)
{
- struct cso_hash *hash = malloc(sizeof(struct cso_hash));
- hash->data.d = malloc(sizeof(struct cso_hash_data));
+ struct cso_hash *hash = MALLOC_STRUCT(cso_hash);
+ hash->data.d = MALLOC_STRUCT(cso_hash_data);
hash->data.d->fakeNext = 0;
hash->data.d->buckets = 0;
hash->data.d->size = 0;
hash->data.d->nodeSize = sizeof(struct cso_node);
- hash->data.d->userNumBits = MinNumBits;
+ hash->data.d->userNumBits = (short)MinNumBits;
hash->data.d->numBits = 0;
hash->data.d->numBuckets = 0;
@@ -261,9 +259,9 @@ void cso_hash_delete(struct cso_hash *hash)
cur = next;
}
}
- free(hash->data.d->buckets);
- free(hash->data.d);
- free(hash);
+ FREE(hash->data.d->buckets);
+ FREE(hash->data.d);
+ FREE(hash);
}
struct cso_hash_iter cso_hash_find(struct cso_hash *hash,
@@ -301,7 +299,7 @@ static struct cso_node *cso_hash_data_next(struct cso_node *node)
a.next = node->next;
if (!a.next) {
- fprintf(stderr, "iterating beyond the last element\n");
+ debug_printf("iterating beyond the last element\n");
return 0;
}
if (a.next->next)
@@ -352,7 +350,7 @@ static struct cso_node *cso_hash_data_prev(struct cso_node *node)
--bucket;
--start;
}
- fprintf(stderr, "iterating backward beyond first element\n");
+ debug_printf("iterating backward beyond first element\n");
return a.e;
}
@@ -397,3 +395,8 @@ struct cso_hash_iter cso_hash_first_node(struct cso_hash *hash)
struct cso_hash_iter iter = {hash, cso_data_first_node(hash->data.d)};
return iter;
}
+
+int cso_hash_size(struct cso_hash *hash)
+{
+ return hash->data.d->size;
+}
diff --git a/src/gallium/auxiliary/cso_cache/cso_hash.h b/src/gallium/auxiliary/cso_cache/cso_hash.h
index b4aa111860..d5bca9d591 100644
--- a/src/gallium/auxiliary/cso_cache/cso_hash.h
+++ b/src/gallium/auxiliary/cso_cache/cso_hash.h
@@ -33,6 +33,11 @@
#ifndef CSO_HASH_H
#define CSO_HASH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct cso_hash;
struct cso_node;
@@ -42,7 +47,9 @@ struct cso_hash_iter {
};
struct cso_hash *cso_hash_create(void);
-void cso_hash_delete(struct cso_hash *hash);
+void cso_hash_delete(struct cso_hash *hash);
+
+int cso_hash_size(struct cso_hash *hash);
struct cso_hash_iter cso_hash_insert(struct cso_hash *hash, unsigned key,
void *data);
@@ -59,4 +66,17 @@ void *cso_hash_iter_data(struct cso_hash_iter iter);
struct cso_hash_iter cso_hash_iter_next(struct cso_hash_iter iter);
struct cso_hash_iter cso_hash_iter_prev(struct cso_hash_iter iter);
+
+/* KW: a convenience routine:
+ */
+void *cso_hash_find_data_from_template( struct cso_hash *hash,
+ unsigned hash_key,
+ void *templ,
+ int size );
+
+
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/gallium/auxiliary/draw/SConscript b/src/gallium/auxiliary/draw/SConscript
index 8e3a8caa74..3302dc44f7 100644
--- a/src/gallium/auxiliary/draw/SConscript
+++ b/src/gallium/auxiliary/draw/SConscript
@@ -3,6 +3,8 @@ Import('*')
draw = env.ConvenienceLibrary(
target = 'draw',
source = [
+ 'draw_aaline.c',
+ 'draw_aapoint.c',
'draw_clip.c',
'draw_vs_exec.c',
'draw_vs_sse.c',
@@ -13,6 +15,7 @@ draw = env.ConvenienceLibrary(
'draw_flatshade.c',
'draw_offset.c',
'draw_prim.c',
+ 'draw_pstipple.c',
'draw_stipple.c',
'draw_twoside.c',
'draw_unfilled.c',
diff --git a/src/gallium/auxiliary/draw/draw_aapoint.c b/src/gallium/auxiliary/draw/draw_aapoint.c
index 43119cc70b..cae6fcd4d2 100644
--- a/src/gallium/auxiliary/draw/draw_aapoint.c
+++ b/src/gallium/auxiliary/draw/draw_aapoint.c
@@ -222,7 +222,7 @@ aa_transform_inst(struct tgsi_transform_context *ctx,
*
* Temp reg0 usage:
* t0.x = distance of fragment from center point
- * t0.y = boolean, is t0.x > 1 ?
+ * t0.y = boolean, is t0.x > 1.0, also misc temp usage
* t0.z = temporary for computing 1/(1-k) value
* t0.w = final coverage value
*/
@@ -313,9 +313,73 @@ aa_transform_inst(struct tgsi_transform_context *ctx,
newInst.FullSrcRegisters[0].SrcRegister.Negate = 1;
ctx->emit_instruction(ctx, &newInst);
- /* SGT t0.y, t0.x, tex.z; # bool b = distance > k */
+
+ /* compute coverage factor = (1-d)/(1-k) */
+
+ /* SUB t0.z, tex.w, tex.z; # m = 1 - k */
newInst = tgsi_default_full_instruction();
- newInst.Instruction.Opcode = TGSI_OPCODE_SGT;
+ newInst.Instruction.Opcode = TGSI_OPCODE_SUB;
+ newInst.Instruction.NumDstRegs = 1;
+ newInst.FullDstRegisters[0].DstRegister.File = TGSI_FILE_TEMPORARY;
+ newInst.FullDstRegisters[0].DstRegister.Index = tmp0;
+ newInst.FullDstRegisters[0].DstRegister.WriteMask = TGSI_WRITEMASK_Z;
+ newInst.Instruction.NumSrcRegs = 2;
+ newInst.FullSrcRegisters[0].SrcRegister.File = TGSI_FILE_INPUT;
+ newInst.FullSrcRegisters[0].SrcRegister.Index = texInput;
+ newInst.FullSrcRegisters[0].SrcRegister.SwizzleZ = TGSI_SWIZZLE_W;
+ newInst.FullSrcRegisters[1].SrcRegister.File = TGSI_FILE_INPUT;
+ newInst.FullSrcRegisters[1].SrcRegister.Index = texInput;
+ newInst.FullSrcRegisters[1].SrcRegister.SwizzleZ = TGSI_SWIZZLE_Z;
+ ctx->emit_instruction(ctx, &newInst);
+
+ /* RCP t0.z, t0.z; # t0.z = 1 / m */
+ newInst = tgsi_default_full_instruction();
+ newInst.Instruction.Opcode = TGSI_OPCODE_RCP;
+ newInst.Instruction.NumDstRegs = 1;
+ newInst.FullDstRegisters[0].DstRegister.File = TGSI_FILE_TEMPORARY;
+ newInst.FullDstRegisters[0].DstRegister.Index = tmp0;
+ newInst.FullDstRegisters[0].DstRegister.WriteMask = TGSI_WRITEMASK_Z;
+ newInst.Instruction.NumSrcRegs = 1;
+ newInst.FullSrcRegisters[0].SrcRegister.File = TGSI_FILE_TEMPORARY;
+ newInst.FullSrcRegisters[0].SrcRegister.Index = tmp0;
+ newInst.FullSrcRegisters[0].SrcRegister.SwizzleX = TGSI_SWIZZLE_Z;
+ ctx->emit_instruction(ctx, &newInst);
+
+ /* SUB t0.y, 1, t0.x; # d = 1 - d */
+ newInst = tgsi_default_full_instruction();
+ newInst.Instruction.Opcode = TGSI_OPCODE_SUB;
+ newInst.Instruction.NumDstRegs = 1;
+ newInst.FullDstRegisters[0].DstRegister.File = TGSI_FILE_TEMPORARY;
+ newInst.FullDstRegisters[0].DstRegister.Index = tmp0;
+ newInst.FullDstRegisters[0].DstRegister.WriteMask = TGSI_WRITEMASK_Y;
+ newInst.Instruction.NumSrcRegs = 2;
+ newInst.FullSrcRegisters[0].SrcRegister.File = TGSI_FILE_INPUT;
+ newInst.FullSrcRegisters[0].SrcRegister.Index = texInput;
+ newInst.FullSrcRegisters[0].SrcRegister.SwizzleY = TGSI_SWIZZLE_W;
+ newInst.FullSrcRegisters[1].SrcRegister.File = TGSI_FILE_TEMPORARY;
+ newInst.FullSrcRegisters[1].SrcRegister.Index = tmp0;
+ newInst.FullSrcRegisters[1].SrcRegister.SwizzleY = TGSI_SWIZZLE_X;
+ ctx->emit_instruction(ctx, &newInst);
+
+ /* MUL t0.w, t0.y, t0.z; # coverage = d * m */
+ newInst = tgsi_default_full_instruction();
+ newInst.Instruction.Opcode = TGSI_OPCODE_MUL;
+ newInst.Instruction.NumDstRegs = 1;
+ newInst.FullDstRegisters[0].DstRegister.File = TGSI_FILE_TEMPORARY;
+ newInst.FullDstRegisters[0].DstRegister.Index = tmp0;
+ newInst.FullDstRegisters[0].DstRegister.WriteMask = TGSI_WRITEMASK_W;
+ newInst.Instruction.NumSrcRegs = 2;
+ newInst.FullSrcRegisters[0].SrcRegister.File = TGSI_FILE_TEMPORARY;
+ newInst.FullSrcRegisters[0].SrcRegister.Index = tmp0;
+ newInst.FullSrcRegisters[0].SrcRegister.SwizzleW = TGSI_SWIZZLE_Y;
+ newInst.FullSrcRegisters[1].SrcRegister.File = TGSI_FILE_TEMPORARY;
+ newInst.FullSrcRegisters[1].SrcRegister.Index = tmp0;
+ newInst.FullSrcRegisters[1].SrcRegister.SwizzleW = TGSI_SWIZZLE_Z;
+ ctx->emit_instruction(ctx, &newInst);
+
+ /* SLE t0.y, t0.x, tex.z; # bool b = distance <= k */
+ newInst = tgsi_default_full_instruction();
+ newInst.Instruction.Opcode = TGSI_OPCODE_SLE;
newInst.Instruction.NumDstRegs = 1;
newInst.FullDstRegisters[0].DstRegister.File = TGSI_FILE_TEMPORARY;
newInst.FullDstRegisters[0].DstRegister.Index = tmp0;
@@ -329,111 +393,40 @@ aa_transform_inst(struct tgsi_transform_context *ctx,
newInst.FullSrcRegisters[1].SrcRegister.SwizzleY = TGSI_SWIZZLE_Z;
ctx->emit_instruction(ctx, &newInst);
- /* IF t0.y # if b then */
+ /* CMP t0.w, -t0.y, tex.w, t0.w;
+ * # if -t0.y < 0 then
+ * t0.w = 1
+ * else
+ * t0.w = t0.w
+ */
newInst = tgsi_default_full_instruction();
- newInst.Instruction.Opcode = TGSI_OPCODE_IF;
- newInst.Instruction.NumDstRegs = 0;
- newInst.Instruction.NumSrcRegs = 1;
+ newInst.Instruction.Opcode = TGSI_OPCODE_CMP;
+ newInst.Instruction.NumDstRegs = 1;
+ newInst.FullDstRegisters[0].DstRegister.File = TGSI_FILE_TEMPORARY;
+ newInst.FullDstRegisters[0].DstRegister.Index = tmp0;
+ newInst.FullDstRegisters[0].DstRegister.WriteMask = TGSI_WRITEMASK_W;
+ newInst.Instruction.NumSrcRegs = 3;
newInst.FullSrcRegisters[0].SrcRegister.File = TGSI_FILE_TEMPORARY;
newInst.FullSrcRegisters[0].SrcRegister.Index = tmp0;
newInst.FullSrcRegisters[0].SrcRegister.SwizzleX = TGSI_SWIZZLE_Y;
newInst.FullSrcRegisters[0].SrcRegister.SwizzleY = TGSI_SWIZZLE_Y;
newInst.FullSrcRegisters[0].SrcRegister.SwizzleZ = TGSI_SWIZZLE_Y;
newInst.FullSrcRegisters[0].SrcRegister.SwizzleW = TGSI_SWIZZLE_Y;
+ newInst.FullSrcRegisters[0].SrcRegister.Negate = 1;
+ newInst.FullSrcRegisters[1].SrcRegister.File = TGSI_FILE_INPUT;
+ newInst.FullSrcRegisters[1].SrcRegister.Index = texInput;
+ newInst.FullSrcRegisters[1].SrcRegister.SwizzleX = TGSI_SWIZZLE_W;
+ newInst.FullSrcRegisters[1].SrcRegister.SwizzleY = TGSI_SWIZZLE_W;
+ newInst.FullSrcRegisters[1].SrcRegister.SwizzleZ = TGSI_SWIZZLE_W;
+ newInst.FullSrcRegisters[1].SrcRegister.SwizzleW = TGSI_SWIZZLE_W;
+ newInst.FullSrcRegisters[2].SrcRegister.File = TGSI_FILE_TEMPORARY;
+ newInst.FullSrcRegisters[2].SrcRegister.Index = tmp0;
+ newInst.FullSrcRegisters[2].SrcRegister.SwizzleX = TGSI_SWIZZLE_W;
+ newInst.FullSrcRegisters[2].SrcRegister.SwizzleY = TGSI_SWIZZLE_W;
+ newInst.FullSrcRegisters[2].SrcRegister.SwizzleZ = TGSI_SWIZZLE_W;
+ newInst.FullSrcRegisters[2].SrcRegister.SwizzleW = TGSI_SWIZZLE_W;
ctx->emit_instruction(ctx, &newInst);
- {
- /* compute coverage factor = (1-d)/(1-k) */
-
- /* SUB t0.z, tex.w, tex.z; # m = 1 - k */
- newInst = tgsi_default_full_instruction();
- newInst.Instruction.Opcode = TGSI_OPCODE_SUB;
- newInst.Instruction.NumDstRegs = 1;
- newInst.FullDstRegisters[0].DstRegister.File = TGSI_FILE_TEMPORARY;
- newInst.FullDstRegisters[0].DstRegister.Index = tmp0;
- newInst.FullDstRegisters[0].DstRegister.WriteMask = TGSI_WRITEMASK_Z;
- newInst.Instruction.NumSrcRegs = 2;
- newInst.FullSrcRegisters[0].SrcRegister.File = TGSI_FILE_INPUT;
- newInst.FullSrcRegisters[0].SrcRegister.Index = texInput;
- newInst.FullSrcRegisters[0].SrcRegister.SwizzleZ = TGSI_SWIZZLE_W;
- newInst.FullSrcRegisters[1].SrcRegister.File = TGSI_FILE_INPUT;
- newInst.FullSrcRegisters[1].SrcRegister.Index = texInput;
- newInst.FullSrcRegisters[1].SrcRegister.SwizzleZ = TGSI_SWIZZLE_Z;
- ctx->emit_instruction(ctx, &newInst);
-
- /* RCP t0.z, t0.z; # t0.z = 1 / m */
- newInst = tgsi_default_full_instruction();
- newInst.Instruction.Opcode = TGSI_OPCODE_RCP;
- newInst.Instruction.NumDstRegs = 1;
- newInst.FullDstRegisters[0].DstRegister.File = TGSI_FILE_TEMPORARY;
- newInst.FullDstRegisters[0].DstRegister.Index = tmp0;
- newInst.FullDstRegisters[0].DstRegister.WriteMask = TGSI_WRITEMASK_Z;
- newInst.Instruction.NumSrcRegs = 1;
- newInst.FullSrcRegisters[0].SrcRegister.File = TGSI_FILE_TEMPORARY;
- newInst.FullSrcRegisters[0].SrcRegister.Index = tmp0;
- newInst.FullSrcRegisters[0].SrcRegister.SwizzleX = TGSI_SWIZZLE_Z;
- ctx->emit_instruction(ctx, &newInst);
-
- /* SUB t0.x, 1, t0.x; # d = 1 - d */
- newInst = tgsi_default_full_instruction();
- newInst.Instruction.Opcode = TGSI_OPCODE_SUB;
- newInst.Instruction.NumDstRegs = 1;
- newInst.FullDstRegisters[0].DstRegister.File = TGSI_FILE_TEMPORARY;
- newInst.FullDstRegisters[0].DstRegister.Index = tmp0;
- newInst.FullDstRegisters[0].DstRegister.WriteMask = TGSI_WRITEMASK_X;
- newInst.Instruction.NumSrcRegs = 2;
- newInst.FullSrcRegisters[0].SrcRegister.File = TGSI_FILE_INPUT;
- newInst.FullSrcRegisters[0].SrcRegister.Index = texInput;
- newInst.FullSrcRegisters[0].SrcRegister.SwizzleX = TGSI_SWIZZLE_W;
- newInst.FullSrcRegisters[1].SrcRegister.File = TGSI_FILE_TEMPORARY;
- newInst.FullSrcRegisters[1].SrcRegister.Index = tmp0;
- newInst.FullSrcRegisters[1].SrcRegister.SwizzleX = TGSI_SWIZZLE_X;
- ctx->emit_instruction(ctx, &newInst);
-
- /* MUL t0.w, t0.x, t0.z; # coverage = d * m */
- newInst = tgsi_default_full_instruction();
- newInst.Instruction.Opcode = TGSI_OPCODE_MUL;
- newInst.Instruction.NumDstRegs = 1;
- newInst.FullDstRegisters[0].DstRegister.File = TGSI_FILE_TEMPORARY;
- newInst.FullDstRegisters[0].DstRegister.Index = tmp0;
- newInst.FullDstRegisters[0].DstRegister.WriteMask = TGSI_WRITEMASK_W;
- newInst.Instruction.NumSrcRegs = 2;
- newInst.FullSrcRegisters[0].SrcRegister.File = TGSI_FILE_TEMPORARY;
- newInst.FullSrcRegisters[0].SrcRegister.Index = tmp0;
- newInst.FullSrcRegisters[0].SrcRegister.SwizzleW = TGSI_SWIZZLE_X;
- newInst.FullSrcRegisters[1].SrcRegister.File = TGSI_FILE_TEMPORARY;
- newInst.FullSrcRegisters[1].SrcRegister.Index = tmp0;
- newInst.FullSrcRegisters[1].SrcRegister.SwizzleW = TGSI_SWIZZLE_Z;
- ctx->emit_instruction(ctx, &newInst);
- }
-
- /* ELSE */
- newInst = tgsi_default_full_instruction();
- newInst.Instruction.Opcode = TGSI_OPCODE_ELSE;
- newInst.Instruction.NumDstRegs = 0;
- newInst.Instruction.NumSrcRegs = 0;
- ctx->emit_instruction(ctx, &newInst);
-
- {
- /* MOV t0.w, tex.w; # coverage = 1.0 */
- newInst = tgsi_default_full_instruction();
- newInst.Instruction.Opcode = TGSI_OPCODE_MOV;
- newInst.Instruction.NumDstRegs = 1;
- newInst.FullDstRegisters[0].DstRegister.File = TGSI_FILE_TEMPORARY;
- newInst.FullDstRegisters[0].DstRegister.Index = tmp0;
- newInst.FullDstRegisters[0].DstRegister.WriteMask = TGSI_WRITEMASK_W;
- newInst.Instruction.NumSrcRegs = 1;
- newInst.FullSrcRegisters[0].SrcRegister.File = TGSI_FILE_INPUT;
- newInst.FullSrcRegisters[0].SrcRegister.Index = texInput;
- ctx->emit_instruction(ctx, &newInst);
- }
-
- /* ENDIF */
- newInst = tgsi_default_full_instruction();
- newInst.Instruction.Opcode = TGSI_OPCODE_ENDIF;
- newInst.Instruction.NumDstRegs = 0;
- newInst.Instruction.NumSrcRegs = 0;
- ctx->emit_instruction(ctx, &newInst);
}
if (inst->Instruction.Opcode == TGSI_OPCODE_END) {
@@ -516,7 +509,7 @@ generate_aapoint_fs(struct aapoint_stage *aapoint)
(struct tgsi_token *) aapoint_fs.tokens,
MAX, &transform.base);
-#if 0 /* DEBUG */
+#if 1 /* DEBUG */
tgsi_dump(orig_fs->tokens, 0);
tgsi_dump(aapoint_fs.tokens, 0);
#endif
@@ -613,13 +606,16 @@ aapoint_point(struct draw_stage *stage, struct prim_header *header)
* ELSE
* coverage = 1.0; // full coverage
* ENDIF
+ *
+ * Note: the ELSEIF and ELSE clauses are actually implemented with CMP to
+ * avoid using IF/ELSE/ENDIF TGSI opcodes.
*/
#if !NORMALIZE
- k = 1.0 / radius;
- k = 1.0 - 2.0 * k + k * k;
+ k = 1.0f / radius;
+ k = 1.0f - 2.0f * k + k * k;
#else
- k = 1.0 - 1.0 / radius;
+ k = 1.0f - 1.0f / radius;
#endif
/* allocate/dup new verts */
diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c
index c28e78d33a..7dd1c6f6fa 100644
--- a/src/gallium/auxiliary/draw/draw_context.c
+++ b/src/gallium/auxiliary/draw/draw_context.c
@@ -244,14 +244,32 @@ draw_convert_wide_lines(struct draw_context *draw, boolean enable)
/**
- * The draw module may sometimes generate vertices with extra attributes
- * (such as texcoords for AA lines). The driver can call this function
- * to find those attributes.
+ * Ask the draw module for the location/slot of the given vertex attribute in
+ * a post-transformed vertex.
+ *
+ * With this function, drivers that use the draw module should have no reason
+ * to track the current vertex shader.
+ *
+ * Note that the draw module may sometimes generate vertices with extra
+ * attributes (such as texcoords for AA lines). The driver can call this
+ * function to find those attributes.
+ *
+ * Zero is returned if the attribute is not found since this is
+ * a don't care / undefined situtation. Returning -1 would be a bit more
+ * work for the drivers.
*/
int
draw_find_vs_output(struct draw_context *draw,
uint semantic_name, uint semantic_index)
{
+ const struct pipe_shader_state *vs = draw->vertex_shader->state;
+ uint i;
+ for (i = 0; i < vs->num_outputs; i++) {
+ if (vs->output_semantic_name[i] == semantic_name &&
+ vs->output_semantic_index[i] == semantic_index)
+ return i;
+ }
+
/* XXX there may be more than one extra vertex attrib.
* For example, simulated gl_FragCoord and gl_PointCoord.
*/
diff --git a/src/gallium/auxiliary/draw/draw_pstipple.c b/src/gallium/auxiliary/draw/draw_pstipple.c
index 4048abf856..1ab04cd959 100644
--- a/src/gallium/auxiliary/draw/draw_pstipple.c
+++ b/src/gallium/auxiliary/draw/draw_pstipple.c
@@ -133,7 +133,7 @@ pstip_transform_decl(struct tgsi_transform_context *ctx,
pctx->maxSampler = (int) decl->u.DeclarationRange.Last;
}
else if (decl->Declaration.File == TGSI_FILE_INPUT) {
- pctx->maxInput = MAX2(pctx->maxInput, decl->u.DeclarationRange.Last);
+ pctx->maxInput = MAX2(pctx->maxInput, (int) decl->u.DeclarationRange.Last);
if (decl->Semantic.SemanticName == TGSI_SEMANTIC_POSITION)
pctx->wincoordInput = (int) decl->u.DeclarationRange.First;
}
@@ -332,7 +332,7 @@ generate_pstip_fs(struct pstip_stage *pstip)
if (transform.wincoordInput < 0) {
pstip_fs.input_semantic_name[pstip_fs.num_inputs] = TGSI_SEMANTIC_POSITION;
- pstip_fs.input_semantic_index[pstip_fs.num_inputs] = transform.maxInput;
+ pstip_fs.input_semantic_index[pstip_fs.num_inputs] = (ubyte)transform.maxInput;
pstip_fs.num_inputs++;
}
diff --git a/src/gallium/auxiliary/draw/draw_validate.c b/src/gallium/auxiliary/draw/draw_validate.c
index efd6793f2b..3a19dd4cd7 100644
--- a/src/gallium/auxiliary/draw/draw_validate.c
+++ b/src/gallium/auxiliary/draw/draw_validate.c
@@ -45,6 +45,7 @@ static struct draw_stage *validate_pipeline( struct draw_stage *stage )
struct draw_stage *next = draw->pipeline.rasterize;
int need_det = 0;
int precalc_flat = 0;
+ boolean wide_lines, wide_points;
/* Set the validate's next stage to the rasterize stage, so that it
* can be found later if needed for flushing.
@@ -68,9 +69,18 @@ static struct draw_stage *validate_pipeline( struct draw_stage *stage )
next = draw->pipeline.aapoint;
}
- if ((draw->rasterizer->line_width != 1.0 && draw->convert_wide_lines
- && !draw->rasterizer->line_smooth) ||
- (draw->rasterizer->point_size != 1.0 && draw->convert_wide_points) ||
+ /* drawing wide lines? */
+ wide_lines = (draw->rasterizer->line_width != 1.0
+ && draw->convert_wide_lines
+ && !draw->rasterizer->line_smooth);
+
+ /* drawing large points? */
+ wide_points = (draw->rasterizer->point_size != 1.0
+ && draw->convert_wide_points
+ && !draw->pipeline.aapoint);
+
+ if (wide_lines ||
+ wide_points ||
draw->rasterizer->point_sprite) {
draw->pipeline.wide->next = next;
next = draw->pipeline.wide;
diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer.h b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
index 97beb5f72a..f5b5f4052f 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
@@ -166,6 +166,7 @@ static INLINE void
pb_destroy(struct pb_buffer *buf)
{
assert(buf);
+ assert(buf->vtbl);
buf->vtbl->destroy(buf);
}
diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index e2ee72ed1f..6e217eb2e0 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
@@ -285,7 +285,9 @@ fenced_buffer_list_destroy(struct fenced_buffer_list *fenced_list)
/* Wait on outstanding fences */
while (fenced_list->numDelayed) {
_glthread_UNLOCK_MUTEX(fenced_list->mutex);
+#ifndef __MSC__
sched_yield();
+#endif
_fenced_buffer_list_check_free(fenced_list, 1);
_glthread_LOCK_MUTEX(fenced_list->mutex);
}
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
index ff4fd123f3..66256f3fa7 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
@@ -192,8 +192,8 @@ mm_bufmgr_create_buffer(struct pb_manager *mgr,
}
/* Some sanity checks */
- assert(0 <= mm_buf->block->ofs && mm_buf->block->ofs < mm->size);
- assert(size <= mm_buf->block->size && mm_buf->block->ofs + mm_buf->block->size <= mm->size);
+ assert(0 <= (unsigned)mm_buf->block->ofs && (unsigned)mm_buf->block->ofs < mm->size);
+ assert(size <= (unsigned)mm_buf->block->size && (unsigned)mm_buf->block->ofs + (unsigned)mm_buf->block->size <= mm->size);
_glthread_UNLOCK_MUTEX(mm->mutex);
return SUPER(mm_buf);
diff --git a/src/gallium/auxiliary/rtasm/rtasm_x86sse.c b/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
index dcbf76f600..4d33950e99 100644
--- a/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
+++ b/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
@@ -25,6 +25,7 @@
#include "pipe/p_compiler.h"
#include "pipe/p_debug.h"
+#include "pipe/p_pointer.h"
#include "rtasm_execmem.h"
#include "rtasm_x86sse.h"
@@ -34,7 +35,7 @@
static unsigned char *cptr( void (*label)() )
{
- return (unsigned char *)(unsigned long)label;
+ return (unsigned char *) label;
}
@@ -46,7 +47,7 @@ static void do_realloc( struct x86_function *p )
p->csr = p->store;
}
else {
- unsigned used = p->csr - p->store;
+ uintptr_t used = pointer_to_uintptr( p->csr ) - pointer_to_uintptr( p->store );
unsigned char *tmp = p->store;
p->size *= 2;
p->store = rtasm_exec_malloc(p->size);
@@ -60,7 +61,7 @@ static void do_realloc( struct x86_function *p )
*/
static unsigned char *reserve( struct x86_function *p, int bytes )
{
- if (p->csr + bytes - p->store > p->size)
+ if (p->csr + bytes - p->store > (int) p->size)
do_realloc(p);
{
@@ -135,7 +136,7 @@ static void emit_modrm( struct x86_function *p,
case mod_INDIRECT:
break;
case mod_DISP8:
- emit_1b(p, regmem.disp);
+ emit_1b(p, (char) regmem.disp);
break;
case mod_DISP32:
emit_1i(p, regmem.disp);
@@ -251,14 +252,14 @@ void x86_jcc( struct x86_function *p,
enum x86_cc cc,
unsigned char *label )
{
- int offset = label - (x86_get_label(p) + 2);
+ intptr_t offset = pointer_to_intptr( label ) - (pointer_to_intptr( x86_get_label(p) ) + 2);
if (offset <= 127 && offset >= -128) {
emit_1ub(p, 0x70 + cc);
emit_1b(p, (char) offset);
}
else {
- offset = label - (x86_get_label(p) + 6);
+ offset = pointer_to_intptr( label ) - (pointer_to_intptr( x86_get_label(p) ) + 6);
emit_2ub(p, 0x0f, 0x80 + cc);
emit_1i(p, offset);
}
@@ -293,13 +294,13 @@ unsigned char *x86_call_forward( struct x86_function *p)
void x86_fixup_fwd_jump( struct x86_function *p,
unsigned char *fixup )
{
- *(int *)(fixup - 4) = x86_get_label(p) - fixup;
+ *(int *)(fixup - 4) = pointer_to_intptr( x86_get_label(p) ) - pointer_to_intptr( fixup );
}
void x86_jmp( struct x86_function *p, unsigned char *label)
{
emit_1ub(p, 0xe9);
- emit_1i(p, label - x86_get_label(p) - 4);
+ emit_1i(p, pointer_to_intptr( label ) - pointer_to_intptr( x86_get_label(p) ) - 4);
}
#if 0
@@ -1207,7 +1208,7 @@ void (*x86_get_func( struct x86_function *p ))(void)
{
if (DISASSEM && p->store)
debug_printf("disassemble %p %p\n", p->store, p->csr);
- return (void (*)(void)) (unsigned long) p->store;
+ return (void (*)(void)) p->store;
}
#else
diff --git a/src/gallium/auxiliary/tgsi/Makefile b/src/gallium/auxiliary/tgsi/Makefile
index 71f64b747c..5555639b70 100644
--- a/src/gallium/auxiliary/tgsi/Makefile
+++ b/src/gallium/auxiliary/tgsi/Makefile
@@ -9,6 +9,7 @@ C_SOURCES = \
util/tgsi_build.c \
util/tgsi_dump.c \
util/tgsi_parse.c \
+ util/tgsi_scan.c \
util/tgsi_transform.c \
util/tgsi_util.c
diff --git a/src/gallium/auxiliary/tgsi/SConscript b/src/gallium/auxiliary/tgsi/SConscript
index 8464bfe944..4632dcc072 100644
--- a/src/gallium/auxiliary/tgsi/SConscript
+++ b/src/gallium/auxiliary/tgsi/SConscript
@@ -8,6 +8,8 @@ tgsi = env.ConvenienceLibrary(
'util/tgsi_build.c',
'util/tgsi_dump.c',
'util/tgsi_parse.c',
+ 'util/tgsi_scan.c',
+ 'util/tgsi_transform.c',
'util/tgsi_util.c',
])
diff --git a/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
index d7b18dc9c5..ac52441400 100644
--- a/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c
@@ -2455,7 +2455,7 @@ tgsi_exec_machine_run( struct tgsi_exec_machine *mach )
/* execute instructions, until pc is set to -1 */
while (pc != -1) {
- assert(pc < mach->NumInstructions);
+ assert(pc < (int) mach->NumInstructions);
exec_instruction( mach, mach->Instructions + pc, &pc );
}
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_dump.c b/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
index b5c54847e0..ff74e6117c 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
@@ -299,7 +299,8 @@ static const char *TGSI_SEMANTICS[] =
"SEMANTIC_BCOLOR",
"SEMANTIC_FOG",
"SEMANTIC_PSIZE",
- "SEMANTIC_GENERIC,"
+ "SEMANTIC_GENERIC",
+ "SEMANTIC_NORMAL"
};
static const char *TGSI_SEMANTICS_SHORT[] =
@@ -310,6 +311,7 @@ static const char *TGSI_SEMANTICS_SHORT[] =
"FOG",
"PSIZE",
"GENERIC",
+ "NORMAL"
};
static const char *TGSI_IMMS[] =
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_scan.c b/src/gallium/auxiliary/tgsi/util/tgsi_scan.c
new file mode 100644
index 0000000000..4b99ac37cc
--- /dev/null
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_scan.c
@@ -0,0 +1,117 @@
+/**************************************************************************
+ *
+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+/**
+ * TGSI program scan utility.
+ * Used to determine which registers and instructions are used by a shader.
+ *
+ * Authors: Brian Paul
+ */
+
+
+#include "tgsi_scan.h"
+#include "tgsi/util/tgsi_parse.h"
+#include "tgsi/util/tgsi_build.h"
+
+
+
+
+/**
+ */
+void
+tgsi_scan_shader(const struct tgsi_token *tokens,
+ struct tgsi_shader_info *info)
+{
+ uint procType;
+ struct tgsi_parse_context parse;
+
+ memset(info, 0, sizeof(*info));
+
+ /**
+ ** Setup to begin parsing input shader
+ **/
+ if (tgsi_parse_init( &parse, tokens ) != TGSI_PARSE_OK) {
+ debug_printf("tgsi_parse_init() failed in tgsi_scan_shader()!\n");
+ return;
+ }
+ procType = parse.FullHeader.Processor.Processor;
+ assert(procType == TGSI_PROCESSOR_FRAGMENT ||
+ procType == TGSI_PROCESSOR_VERTEX ||
+ procType == TGSI_PROCESSOR_GEOMETRY);
+
+
+ /**
+ ** Loop over incoming program tokens/instructions
+ */
+ while( !tgsi_parse_end_of_tokens( &parse ) ) {
+
+ tgsi_parse_token( &parse );
+
+ switch( parse.FullToken.Token.Type ) {
+ case TGSI_TOKEN_TYPE_INSTRUCTION:
+ {
+ struct tgsi_full_instruction *fullinst
+ = &parse.FullToken.FullInstruction;
+
+ assert(fullinst->Instruction.Opcode < TGSI_OPCODE_LAST);
+ info->opcode_count[fullinst->Instruction.Opcode]++;
+ }
+ break;
+
+ case TGSI_TOKEN_TYPE_DECLARATION:
+ {
+ struct tgsi_full_declaration *fulldecl
+ = &parse.FullToken.FullDeclaration;
+ uint file = fulldecl->Declaration.File;
+ uint i;
+ for (i = fulldecl->u.DeclarationRange.First;
+ i <= fulldecl->u.DeclarationRange.Last;
+ i++) {
+ info->file_mask[file] |= (1 << i);
+ info->file_count[file]++;
+
+ /* special case */
+ if (procType == TGSI_PROCESSOR_FRAGMENT &&
+ file == TGSI_FILE_OUTPUT &&
+ fulldecl->Semantic.SemanticName == TGSI_SEMANTIC_POSITION) {
+ info->writes_z = TRUE;
+ }
+ }
+ }
+ break;
+
+ case TGSI_TOKEN_TYPE_IMMEDIATE:
+ info->immediate_count++;
+ break;
+
+ default:
+ assert( 0 );
+ }
+ }
+
+ tgsi_parse_free (&parse);
+}
diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_scan.h b/src/gallium/auxiliary/tgsi/util/tgsi_scan.h
new file mode 100644
index 0000000000..757446437c
--- /dev/null
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_scan.h
@@ -0,0 +1,57 @@
+/**************************************************************************
+ *
+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+#ifndef TGSI_SCAN_H
+#define TGSI_SCAN_H
+
+
+#include "pipe/p_util.h"
+#include "pipe/p_shader_tokens.h"
+
+
+/**
+ * Shader summary info
+ */
+struct tgsi_shader_info
+{
+ uint file_mask[TGSI_FILE_COUNT]; /**< bitmask of declared registers */
+ uint file_count[TGSI_FILE_COUNT]; /**< number of declared registers */
+
+ uint immediate_count; /**< number of immediates declared */
+
+ uint opcode_count[TGSI_OPCODE_LAST]; /**< opcode histogram */
+
+ boolean writes_z; /**< does fragment shader write Z value? */
+};
+
+
+extern void
+tgsi_scan_shader(const struct tgsi_token *tokens,
+ struct tgsi_shader_info *info);
+
+
+#endif /* TGSI_SCAN_H */
diff --git a/src/gallium/drivers/cell/ppu/cell_context.h b/src/gallium/drivers/cell/ppu/cell_context.h
index 3b687bb868..1433a4925f 100644
--- a/src/gallium/drivers/cell/ppu/cell_context.h
+++ b/src/gallium/drivers/cell/ppu/cell_context.h
@@ -134,6 +134,8 @@ extern void
cell_vertex_shader_queue_flush(struct draw_context *draw);
+/* XXX find a better home for this */
+extern void cell_update_vertex_fetch(struct draw_context *draw);
#endif /* CELL_CONTEXT_H */
diff --git a/src/gallium/drivers/cell/ppu/cell_draw_arrays.c b/src/gallium/drivers/cell/ppu/cell_draw_arrays.c
index cbd387f014..c839fb4d12 100644
--- a/src/gallium/drivers/cell/ppu/cell_draw_arrays.c
+++ b/src/gallium/drivers/cell/ppu/cell_draw_arrays.c
@@ -38,6 +38,7 @@
#include "cell_context.h"
#include "cell_draw_arrays.h"
#include "cell_state.h"
+#include "cell_flush.h"
#include "draw/draw_context.h"
diff --git a/src/gallium/drivers/cell/ppu/cell_flush.h b/src/gallium/drivers/cell/ppu/cell_flush.h
index eda351b1cb..7f940ae76b 100644
--- a/src/gallium/drivers/cell/ppu/cell_flush.h
+++ b/src/gallium/drivers/cell/ppu/cell_flush.h
@@ -35,4 +35,8 @@ cell_flush(struct pipe_context *pipe, unsigned flags);
extern void
cell_flush_int(struct pipe_context *pipe, unsigned flags);
+extern void
+cell_flush_buffer_range(struct cell_context *cell, void *ptr,
+ unsigned size);
+
#endif
diff --git a/src/gallium/drivers/cell/ppu/cell_vertex_shader.c b/src/gallium/drivers/cell/ppu/cell_vertex_shader.c
index f7ef72e5a2..f5c27852c1 100644
--- a/src/gallium/drivers/cell/ppu/cell_vertex_shader.c
+++ b/src/gallium/drivers/cell/ppu/cell_vertex_shader.c
@@ -55,7 +55,6 @@ cell_vertex_shader_queue_flush(struct draw_context *draw)
struct cell_command_vs *const vs = &cell_global.command[0].vs;
uint64_t *batch;
struct cell_array_info *array_info;
- struct cell_shader_info *shader_info;
unsigned i, j;
struct cell_attribute_fetch_code *cf;
@@ -123,12 +122,12 @@ cell_vertex_shader_queue_flush(struct draw_context *draw)
for (j = 0; j < n; j++) {
vs->elts[j] = draw->vs.queue[i + j].elt;
- vs->vOut[j] = (uintptr_t) draw->vs.queue[i + j].dest;
+ vs->vOut[j] = (uintptr_t) draw->vs.queue[i + j].vertex;
}
for (/* empty */; j < SPU_VERTS_PER_BATCH; j++) {
vs->elts[j] = vs->elts[0];
- vs->vOut[j] = vs->vOut[0];
+ vs->vOut[j] = (uintptr_t) draw->vs.queue[i + j].vertex;
}
vs->num_elts = n;
@@ -137,5 +136,6 @@ cell_vertex_shader_queue_flush(struct draw_context *draw)
cell_flush_int(& cell->pipe, PIPE_FLUSH_WAIT);
}
+ draw->vs.post_nr = draw->vs.queue_nr;
draw->vs.queue_nr = 0;
}
diff --git a/src/gallium/drivers/cell/spu/spu_dcache.c b/src/gallium/drivers/cell/spu/spu_dcache.c
index 698a5790bb..a1701d80d1 100644
--- a/src/gallium/drivers/cell/spu/spu_dcache.c
+++ b/src/gallium/drivers/cell/spu/spu_dcache.c
@@ -33,7 +33,7 @@
#define CACHE_NAME data
#define CACHED_TYPE qword
#define CACHE_TYPE CACHE_TYPE_RO
-#define CACHE_SET_TAGID(set) TAG_VERTEX_BUFFER
+#define CACHE_SET_TAGID(set) (((set) & 0x03) + TAG_DCACHE0)
#define CACHE_LOG2NNWAY 2
#define CACHE_LOG2NSETS 6
#include <cache-api.h>
@@ -49,43 +49,57 @@
/**
* Fetch between arbitrary number of bytes from an unaligned address
+ *
+ * \param dst Destination data buffer
+ * \param ea Main memory effective address of source data
+ * \param size Number of bytes to read
+ *
+ * \warning
+ * As is hinted by the type of the \c dst pointer, this function writes
+ * multiples of 16-bytes.
*/
void
spu_dcache_fetch_unaligned(qword *dst, unsigned ea, unsigned size)
{
const int shift = ea & 0x0f;
- const unsigned aligned_start_ea = ea & ~0x0f;
- const unsigned aligned_end_ea = ROUNDUP16(ea + size);
- const unsigned num_entries = (aligned_end_ea - aligned_start_ea) / 16;
+ const unsigned read_size = ROUNDUP16(size + shift);
+ const unsigned last_read = ROUNDUP16(ea + size);
+ const qword *const last_write = dst + (ROUNDUP16(size) / 16);
unsigned i;
if (shift == 0) {
/* Data is already aligned. Fetch directly into the destination buffer.
*/
- for (i = 0; i < num_entries; i++) {
- dst[i] = cache_rd(data, ea + (i * 16));
+ for (i = 0; i < size; i += 16) {
+ *(dst++) = cache_rd(data, ea + i);
}
} else {
- qword tmp[2] ALIGN16_ATTRIB;
-
+ qword hi;
- tmp[0] = cache_rd(data, (ea & ~0x0f));
- for (i = 0; i < (num_entries & ~1); i++) {
- const unsigned curr = i & 1;
- const unsigned next = curr ^ 1;
- tmp[next] = cache_rd(data, (ea & ~0x0f) + (next * 16));
-
- dst[i] = si_or((qword) spu_slqwbyte(tmp[curr], shift),
- (qword) spu_rlmaskqwbyte(tmp[next], shift - 16));
+ /* Please exercise extreme caution when modifying this code. This code
+ * must not read past the end of the page containing the source data,
+ * and it must not write more than ((size + 15) / 16) qwords to the
+ * destination buffer.
+ */
+ ea &= ~0x0f;
+ hi = cache_rd(data, ea);
+ for (i = 16; i < read_size; i += 16) {
+ qword lo = cache_rd(data, ea + i);
+
+ *(dst++) = si_or((qword) spu_slqwbyte(hi, shift),
+ (qword) spu_rlmaskqwbyte(lo, shift - 16));
+ hi = lo;
}
- if (i < num_entries) {
- dst[i] = si_or((qword) spu_slqwbyte(tmp[(i & 1)], shift),
- si_il(0));
+ if (dst != last_write) {
+ *(dst++) = si_or((qword) spu_slqwbyte(hi, shift), si_il(0));
}
}
+
+ ASSERT((ea + i) == last_read);
+ ASSERT(dst == last_write);
}
diff --git a/src/gallium/drivers/cell/spu/spu_exec.c b/src/gallium/drivers/cell/spu/spu_exec.c
index cf81bee8fd..1560c0f157 100644
--- a/src/gallium/drivers/cell/spu/spu_exec.c
+++ b/src/gallium/drivers/cell/spu/spu_exec.c
@@ -50,8 +50,6 @@
* Brian Paul
*/
-#include <libmisc.h>
-#include <spu_mfcio.h>
#include <transpose_matrix4x4.h>
#include <simdmath/ceilf4.h>
#include <simdmath/cosf4.h>
@@ -151,6 +149,7 @@ spu_exec_machine_init(struct spu_exec_machine *mach,
const qword zero = si_il(0);
const qword not_zero = si_il(~0);
+ (void) numSamplers;
mach->Samplers = samplers;
mach->Processor = processor;
mach->Addrs = &mach->Temps[TGSI_EXEC_NUM_TEMPS];
@@ -659,9 +658,10 @@ fetch_texel( struct spu_sampler *sampler,
qword rgba[4];
qword out[4];
- sampler->get_samples(sampler, s->f, t->f, p->f, lodbias, (float *) rgba);
+ sampler->get_samples(sampler, s->f, t->f, p->f, lodbias,
+ (float (*)[4]) rgba);
- _transpose_matrix4x4(out, rgba);
+ _transpose_matrix4x4((vec_float4 *) out, (vec_float4 *) rgba);
r->q = out[0];
g->q = out[1];
b->q = out[2];
diff --git a/src/gallium/drivers/cell/spu/spu_main.c b/src/gallium/drivers/cell/spu/spu_main.c
index 1136dba62d..cc4bafdb3a 100644
--- a/src/gallium/drivers/cell/spu/spu_main.c
+++ b/src/gallium/drivers/cell/spu/spu_main.c
@@ -38,6 +38,7 @@
#include "spu_tile.h"
//#include "spu_test.h"
#include "spu_vertex_shader.h"
+#include "spu_dcache.h"
#include "cell/common.h"
#include "pipe/p_defines.h"
@@ -434,7 +435,7 @@ cmd_batch(uint opcode)
pos += (1 + ROUNDUP8(sizeof(struct pipe_viewport_state)) / 8);
break;
case CELL_CMD_STATE_UNIFORMS:
- draw.constants = (float (*)[4]) (uintptr_t) buffer[pos + 1];
+ draw.constants = (const float (*)[4]) (uintptr_t) buffer[pos + 1];
pos += 2;
break;
case CELL_CMD_STATE_VS_ARRAY_INFO:
@@ -583,7 +584,7 @@ main(main_param_t speid, main_param_t argp)
one_time_init();
if (Debug)
- printf("SPU: main() speid=%lu\n", speid);
+ printf("SPU: main() speid=%lu\n", (unsigned long) speid);
mfc_get(&spu.init, /* dest */
(unsigned int) argp, /* src */
diff --git a/src/gallium/drivers/cell/spu/spu_main.h b/src/gallium/drivers/cell/spu/spu_main.h
index 5c95d112ac..d14f1abbe7 100644
--- a/src/gallium/drivers/cell/spu/spu_main.h
+++ b/src/gallium/drivers/cell/spu/spu_main.h
@@ -131,7 +131,10 @@ extern boolean Debug;
#define TAG_BATCH_BUFFER 17
#define TAG_MISC 18
#define TAG_TEXTURE_TILE 19
-#define TAG_INSTRUCTION_FETCH 20
+#define TAG_DCACHE0 20
+#define TAG_DCACHE1 21
+#define TAG_DCACHE2 22
+#define TAG_DCACHE3 23
diff --git a/src/gallium/drivers/cell/spu/spu_vertex_fetch.c b/src/gallium/drivers/cell/spu/spu_vertex_fetch.c
index f7e4e653e3..219fd90cc0 100644
--- a/src/gallium/drivers/cell/spu/spu_vertex_fetch.c
+++ b/src/gallium/drivers/cell/spu/spu_vertex_fetch.c
@@ -32,8 +32,6 @@
* Ian Romanick <idr@us.ibm.com>
*/
-#include <spu_mfcio.h>
-
#include "pipe/p_util.h"
#include "pipe/p_state.h"
#include "pipe/p_shader_tokens.h"
diff --git a/src/gallium/drivers/i915simple/i915_context.c b/src/gallium/drivers/i915simple/i915_context.c
index acfa349439..c3955bbd2d 100644
--- a/src/gallium/drivers/i915simple/i915_context.c
+++ b/src/gallium/drivers/i915simple/i915_context.c
@@ -298,10 +298,12 @@ struct pipe_context *i915_create( struct pipe_winsys *pipe_winsys,
i915_init_string_functions(i915);
i915_init_texture_functions(i915);
+ draw_install_aaline_stage(i915->draw, &i915->pipe);
+ draw_install_aapoint_stage(i915->draw, &i915->pipe);
+
i915->pci_id = pci_id;
i915->flags.is_i945 = is_i945;
-
i915->dirty = ~0;
i915->hardware_dirty = ~0;
diff --git a/src/gallium/drivers/i915simple/i915_context.h b/src/gallium/drivers/i915simple/i915_context.h
index 2d876925b2..d32dded6bd 100644
--- a/src/gallium/drivers/i915simple/i915_context.h
+++ b/src/gallium/drivers/i915simple/i915_context.h
@@ -79,6 +79,40 @@
#define I915_MAX_CONSTANT 32
+/** See constant_flags[] below */
+#define I915_CONSTFLAG_USER 0x1f
+
+
+/**
+ * Subclass of pipe_shader_state
+ */
+struct i915_fragment_shader
+{
+ struct pipe_shader_state state;
+ uint *program;
+ uint program_len;
+
+ /**
+ * constants introduced during translation.
+ * These are placed at the end of the constant buffer and grow toward
+ * the beginning (eg: slot 31, 30 29, ...)
+ * User-provided constants start at 0.
+ * This allows both types of constants to co-exist (until there's too many)
+ * and doesn't require regenerating/changing the fragment program to
+ * shuffle constants around.
+ */
+ uint num_constants;
+ float constants[I915_MAX_CONSTANT][4];
+
+ /**
+ * Status of each constant
+ * if I915_CONSTFLAG_PARAM, the value must be taken from the corresponding
+ * slot of the user's constant buffer. (set by pipe->set_constant_buffer())
+ * Else, the bitmask indicates which components are occupied by immediates.
+ */
+ ubyte constant_flags[I915_MAX_CONSTANT];
+};
+
struct i915_cache_context;
@@ -93,11 +127,6 @@ struct i915_state
float constants[PIPE_SHADER_TYPES][I915_MAX_CONSTANT][4];
/** number of constants passed in through a constant buffer */
uint num_user_constants[PIPE_SHADER_TYPES];
- /** user constants, plus extra constants from shader translation */
- uint num_constants[PIPE_SHADER_TYPES];
-
- uint *program;
- uint program_len;
/* texture sampler state */
unsigned sampler[I915_TEX_UNITS][3];
@@ -187,7 +216,8 @@ struct i915_context
const struct i915_sampler_state *sampler[PIPE_MAX_SAMPLERS];
const struct i915_depth_stencil_state *depth_stencil;
const struct i915_rasterizer_state *rasterizer;
- const struct pipe_shader_state *fs;
+
+ struct i915_fragment_shader *fs;
struct pipe_blend_color blend_color;
struct pipe_clip_state clip;
@@ -233,6 +263,7 @@ struct i915_context
#define I915_NEW_TEXTURE 0x800
#define I915_NEW_CONSTANTS 0x1000
#define I915_NEW_VBO 0x2000
+#define I915_NEW_VS 0x4000
/* Driver's internally generated state flags:
diff --git a/src/gallium/drivers/i915simple/i915_flush.c b/src/gallium/drivers/i915simple/i915_flush.c
index 3c2069b827..96a54281f1 100644
--- a/src/gallium/drivers/i915simple/i915_flush.c
+++ b/src/gallium/drivers/i915simple/i915_flush.c
@@ -31,6 +31,7 @@
#include "pipe/p_defines.h"
+#include "draw/draw_context.h"
#include "i915_context.h"
#include "i915_reg.h"
#include "i915_batch.h"
@@ -44,6 +45,8 @@ static void i915_flush( struct pipe_context *pipe,
{
struct i915_context *i915 = i915_context(pipe);
+ draw_flush(i915->draw);
+
/* Do we need to emit an MI_FLUSH command to flush the hardware
* caches?
*/
diff --git a/src/gallium/drivers/i915simple/i915_fpc.h b/src/gallium/drivers/i915simple/i915_fpc.h
index 8c7b68aefb..250dfe6dbf 100644
--- a/src/gallium/drivers/i915simple/i915_fpc.h
+++ b/src/gallium/drivers/i915simple/i915_fpc.h
@@ -44,9 +44,16 @@
* Program translation state
*/
struct i915_fp_compile {
- const struct pipe_shader_state *shader;
+ struct i915_fragment_shader *shader; /* the shader we're compiling */
- struct vertex_info *vertex_info;
+ boolean used_constants[I915_MAX_CONSTANT];
+
+ /** maps TGSI immediate index to constant slot */
+ uint num_immediates;
+ uint immediates_map[I915_MAX_CONSTANT];
+ float immediates[I915_MAX_CONSTANT][4];
+
+ boolean first_instruction;
uint declarations[I915_PROGRAM_SIZE];
uint program[I915_PROGRAM_SIZE];
@@ -57,11 +64,6 @@ struct i915_fp_compile {
uint output_semantic_name[PIPE_MAX_SHADER_OUTPUTS];
uint output_semantic_index[PIPE_MAX_SHADER_OUTPUTS];
- /** points into the i915->current.constants array: */
- float (*constants)[4];
- uint num_constants;
- uint constant_flags[I915_MAX_CONSTANT]; /**< status of each constant */
-
uint *csr; /**< Cursor, points into program. */
uint *decl; /**< Cursor, points into declarations. */
@@ -155,7 +157,9 @@ swizzle(int reg, uint x, uint y, uint z, uint w)
/***********************************************************************
* Public interface for the compiler
*/
-extern void i915_translate_fragment_program( struct i915_context *i915 );
+extern void
+i915_translate_fragment_program( struct i915_context *i915,
+ struct i915_fragment_shader *fs);
@@ -206,8 +210,5 @@ extern void i915_disassemble_program(const uint * program, uint sz);
extern void
i915_program_error(struct i915_fp_compile *p, const char *msg, ...);
-extern void
-i915_translate_fragment_program(struct i915_context *i915);
-
#endif
diff --git a/src/gallium/drivers/i915simple/i915_fpc_emit.c b/src/gallium/drivers/i915simple/i915_fpc_emit.c
index 74924ff0a1..4bdeefb449 100644
--- a/src/gallium/drivers/i915simple/i915_fpc_emit.c
+++ b/src/gallium/drivers/i915simple/i915_fpc_emit.c
@@ -61,8 +61,6 @@
(REG_NR_MASK << UREG_NR_SHIFT))
-#define I915_CONSTFLAG_PARAM 0x1f
-
uint
i915_get_temp(struct i915_fp_compile *p)
{
@@ -73,10 +71,21 @@ i915_get_temp(struct i915_fp_compile *p)
}
p->temp_flag |= 1 << (bit - 1);
- return UREG(REG_TYPE_R, (bit - 1));
+ return bit - 1;
+}
+
+
+static void
+i915_release_temp(struct i915_fp_compile *p, int reg)
+{
+ p->temp_flag &= ~(1 << reg);
}
+/**
+ * Get unpreserved temporary, a temp whose value is not preserved between
+ * PS program phases.
+ */
uint
i915_get_utemp(struct i915_fp_compile * p)
{
@@ -185,41 +194,62 @@ i915_emit_arith(struct i915_fp_compile * p,
return dest;
}
+
+/**
+ * Emit a texture load or texkill instruction.
+ * \param dest the dest i915 register
+ * \param destmask the dest register writemask
+ * \param sampler the i915 sampler register
+ * \param coord the i915 source texcoord operand
+ * \param opcode the instruction opcode
+ */
uint i915_emit_texld( struct i915_fp_compile *p,
uint dest,
uint destmask,
uint sampler,
uint coord,
- uint op )
+ uint opcode )
{
- uint k = UREG(GET_UREG_TYPE(coord), GET_UREG_NR(coord));
+ const uint k = UREG(GET_UREG_TYPE(coord), GET_UREG_NR(coord));
+ int temp = -1;
+
if (coord != k) {
- /* No real way to work around this in the general case - need to
- * allocate and declare a new temporary register (a utemp won't
- * do). Will fallback for now.
+ /* texcoord is swizzled or negated. Need to allocate a new temporary
+ * register (a utemp / unpreserved temp) won't do.
*/
- i915_program_error(p, "Can't (yet) swizzle TEX arguments");
- assert(0);
- return 0;
+ uint tempReg;
+
+ temp = i915_get_temp(p); /* get temp reg index */
+ tempReg = UREG(REG_TYPE_R, temp); /* make i915 register */
+
+ i915_emit_arith( p, A0_MOV,
+ tempReg, A0_DEST_CHANNEL_ALL, /* dest reg, writemask */
+ 0, /* saturate */
+ coord, 0, 0 ); /* src0, src1, src2 */
+
+ /* new src texcoord is tempReg */
+ coord = tempReg;
}
/* Don't worry about saturate as we only support
*/
if (destmask != A0_DEST_CHANNEL_ALL) {
+ /* if not writing to XYZW... */
uint tmp = i915_get_utemp(p);
- i915_emit_texld( p, tmp, A0_DEST_CHANNEL_ALL, sampler, coord, op );
+ i915_emit_texld( p, tmp, A0_DEST_CHANNEL_ALL, sampler, coord, opcode );
i915_emit_arith( p, A0_MOV, dest, destmask, 0, tmp, 0, 0 );
- return dest;
+ /* XXX release utemp here? */
}
else {
assert(GET_UREG_TYPE(dest) != REG_TYPE_CONST);
assert(dest = UREG(GET_UREG_TYPE(dest), GET_UREG_NR(dest)));
+ /* is the sampler coord a texcoord input reg? */
if (GET_UREG_TYPE(coord) != REG_TYPE_T) {
p->nr_tex_indirect++;
}
- *(p->csr++) = (op |
+ *(p->csr++) = (opcode |
T0_DEST( dest ) |
T0_SAMPLER( sampler ));
@@ -227,14 +257,19 @@ uint i915_emit_texld( struct i915_fp_compile *p,
*(p->csr++) = T2_MBZ;
p->nr_tex_insn++;
- return dest;
}
+
+ if (temp >= 0)
+ i915_release_temp(p, temp);
+
+ return dest;
}
uint
i915_emit_const1f(struct i915_fp_compile * p, float c0)
{
+ struct i915_fragment_shader *ifs = p->shader;
unsigned reg, idx;
if (c0 == 0.0)
@@ -243,15 +278,15 @@ i915_emit_const1f(struct i915_fp_compile * p, float c0)
return swizzle(UREG(REG_TYPE_R, 0), ONE, ONE, ONE, ONE);
for (reg = 0; reg < I915_MAX_CONSTANT; reg++) {
- if (p->constant_flags[reg] == I915_CONSTFLAG_PARAM)
+ if (ifs->constant_flags[reg] == I915_CONSTFLAG_USER)
continue;
for (idx = 0; idx < 4; idx++) {
- if (!(p->constant_flags[reg] & (1 << idx)) ||
- p->constants[reg][idx] == c0) {
- p->constants[reg][idx] = c0;
- p->constant_flags[reg] |= 1 << idx;
- if (reg + 1 > p->num_constants)
- p->num_constants = reg + 1;
+ if (!(ifs->constant_flags[reg] & (1 << idx)) ||
+ ifs->constants[reg][idx] == c0) {
+ ifs->constants[reg][idx] = c0;
+ ifs->constant_flags[reg] |= 1 << idx;
+ if (reg + 1 > ifs->num_constants)
+ ifs->num_constants = reg + 1;
return swizzle(UREG(REG_TYPE_CONST, reg), idx, ZERO, ZERO, ONE);
}
}
@@ -264,6 +299,7 @@ i915_emit_const1f(struct i915_fp_compile * p, float c0)
uint
i915_emit_const2f(struct i915_fp_compile * p, float c0, float c1)
{
+ struct i915_fragment_shader *ifs = p->shader;
unsigned reg, idx;
if (c0 == 0.0)
@@ -277,16 +313,16 @@ i915_emit_const2f(struct i915_fp_compile * p, float c0, float c1)
return swizzle(i915_emit_const1f(p, c0), X, ONE, Z, W);
for (reg = 0; reg < I915_MAX_CONSTANT; reg++) {
- if (p->constant_flags[reg] == 0xf ||
- p->constant_flags[reg] == I915_CONSTFLAG_PARAM)
+ if (ifs->constant_flags[reg] == 0xf ||
+ ifs->constant_flags[reg] == I915_CONSTFLAG_USER)
continue;
for (idx = 0; idx < 3; idx++) {
- if (!(p->constant_flags[reg] & (3 << idx))) {
- p->constants[reg][idx + 0] = c0;
- p->constants[reg][idx + 1] = c1;
- p->constant_flags[reg] |= 3 << idx;
- if (reg + 1 > p->num_constants)
- p->num_constants = reg + 1;
+ if (!(ifs->constant_flags[reg] & (3 << idx))) {
+ ifs->constants[reg][idx + 0] = c0;
+ ifs->constants[reg][idx + 1] = c1;
+ ifs->constant_flags[reg] |= 3 << idx;
+ if (reg + 1 > ifs->num_constants)
+ ifs->num_constants = reg + 1;
return swizzle(UREG(REG_TYPE_CONST, reg), idx, idx + 1, ZERO, ONE);
}
}
@@ -302,25 +338,26 @@ uint
i915_emit_const4f(struct i915_fp_compile * p,
float c0, float c1, float c2, float c3)
{
+ struct i915_fragment_shader *ifs = p->shader;
unsigned reg;
for (reg = 0; reg < I915_MAX_CONSTANT; reg++) {
- if (p->constant_flags[reg] == 0xf &&
- p->constants[reg][0] == c0 &&
- p->constants[reg][1] == c1 &&
- p->constants[reg][2] == c2 &&
- p->constants[reg][3] == c3) {
+ if (ifs->constant_flags[reg] == 0xf &&
+ ifs->constants[reg][0] == c0 &&
+ ifs->constants[reg][1] == c1 &&
+ ifs->constants[reg][2] == c2 &&
+ ifs->constants[reg][3] == c3) {
return UREG(REG_TYPE_CONST, reg);
}
- else if (p->constant_flags[reg] == 0) {
-
- p->constants[reg][0] = c0;
- p->constants[reg][1] = c1;
- p->constants[reg][2] = c2;
- p->constants[reg][3] = c3;
- p->constant_flags[reg] = 0xf;
- if (reg + 1 > p->num_constants)
- p->num_constants = reg + 1;
+ else if (ifs->constant_flags[reg] == 0) {
+
+ ifs->constants[reg][0] = c0;
+ ifs->constants[reg][1] = c1;
+ ifs->constants[reg][2] = c2;
+ ifs->constants[reg][3] = c3;
+ ifs->constant_flags[reg] = 0xf;
+ if (reg + 1 > ifs->num_constants)
+ ifs->num_constants = reg + 1;
return UREG(REG_TYPE_CONST, reg);
}
}
@@ -335,41 +372,3 @@ i915_emit_const4fv(struct i915_fp_compile * p, const float * c)
{
return i915_emit_const4f(p, c[0], c[1], c[2], c[3]);
}
-
-
-#if 00000/*UNUSED*/
-/* Reserve a slot in the constant file for a Mesa state parameter.
- * These will later need to be tracked on statechanges, but that is
- * done elsewhere.
- */
-uint
-i915_emit_param4fv(struct i915_fp_compile * p, const float * values)
-{
- struct i915_fragment_program *fp = p->fp;
- int i;
-
- for (i = 0; i < fp->nr_params; i++) {
- if (fp->param[i].values == values)
- return UREG(REG_TYPE_CONST, fp->param[i].reg);
- }
-
- if (p->constants->nr_constants == I915_MAX_CONSTANT ||
- fp->nr_params == I915_MAX_CONSTANT) {
- i915_program_error(p, "i915_emit_param4fv: out of constants\n");
- return 0;
- }
-
- {
- int reg = p->constants->nr_constants++;
- int i = fp->nr_params++;
-
- assert (p->constant_flags[reg] == 0);
- p->constant_flags[reg] = I915_CONSTFLAG_PARAM;
-
- fp->param[i].values = values;
- fp->param[i].reg = reg;
-
- return UREG(REG_TYPE_CONST, reg);
- }
-}
-#endif
diff --git a/src/gallium/drivers/i915simple/i915_fpc_translate.c b/src/gallium/drivers/i915simple/i915_fpc_translate.c
index 6c1524c768..76a2184e9a 100644
--- a/src/gallium/drivers/i915simple/i915_fpc_translate.c
+++ b/src/gallium/drivers/i915simple/i915_fpc_translate.c
@@ -34,6 +34,7 @@
#include "pipe/p_shader_tokens.h"
#include "tgsi/util/tgsi_parse.h"
+#include "tgsi/util/tgsi_dump.h"
#include "draw/draw_vertex.h"
@@ -97,19 +98,19 @@ negate(int reg, int x, int y, int z, int w)
}
+/**
+ * In the event of a translation failure, we'll generate a simple color
+ * pass-through program.
+ */
static void
-i915_use_passthrough_shader(struct i915_context *i915)
+i915_use_passthrough_shader(struct i915_fragment_shader *fs)
{
- debug_printf("**** Using i915 pass-through fragment shader\n");
-
- i915->current.program = (uint *) MALLOC(sizeof(passthrough));
- if (i915->current.program) {
- memcpy(i915->current.program, passthrough, sizeof(passthrough));
- i915->current.program_len = Elements(passthrough);
+ fs->program = (uint *) MALLOC(sizeof(passthrough));
+ if (fs->program) {
+ memcpy(fs->program, passthrough, sizeof(passthrough));
+ fs->program_len = Elements(passthrough);
}
-
- i915->current.num_constants[PIPE_SHADER_FRAGMENT] = 0;
- i915->current.num_user_constants[PIPE_SHADER_FRAGMENT] = 0;
+ fs->num_constants = 0;
}
@@ -161,9 +162,6 @@ src_vector(struct i915_fp_compile *p,
* We also use a texture coordinate to pass wpos when possible.
*/
- /* use vertex format info to map a slot number to a VF attrib */
- assert(index < p->vertex_info->num_attribs);
-
sem_name = p->input_semantic_name[index];
sem_ind = p->input_semantic_index[index];
@@ -201,7 +199,8 @@ src_vector(struct i915_fp_compile *p,
break;
case TGSI_FILE_IMMEDIATE:
- /* XXX unfinished - need to append immediates onto const buffer */
+ assert(index < p->num_immediates);
+ index = p->immediates_map[index];
/* fall-through */
case TGSI_FILE_CONSTANT:
src = UREG(REG_TYPE_CONST, index);
@@ -386,6 +385,26 @@ emit_simple_arith(struct i915_fp_compile *p,
arg3 );
}
+
+/** As above, but swap the first two src regs */
+static void
+emit_simple_arith_swap2(struct i915_fp_compile *p,
+ const struct tgsi_full_instruction *inst,
+ uint opcode, uint numArgs)
+{
+ struct tgsi_full_instruction inst2;
+
+ assert(numArgs == 2);
+
+ /* transpose first two registers */
+ inst2 = *inst;
+ inst2.FullSrcRegisters[0] = inst->FullSrcRegisters[1];
+ inst2.FullSrcRegisters[1] = inst->FullSrcRegisters[0];
+
+ emit_simple_arith(p, &inst2, opcode, numArgs);
+}
+
+
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
@@ -556,8 +575,12 @@ i915_translate_instruction(struct i915_fp_compile *p,
src0 = src_vector(p, &inst->FullSrcRegisters[0]);
tmp = i915_get_utemp(p);
- i915_emit_texld(p, tmp, A0_DEST_CHANNEL_ALL, /* use a dummy dest reg */
- 0, src0, T0_TEXKILL);
+ i915_emit_texld(p,
+ tmp, /* dest reg: a dummy reg */
+ A0_DEST_CHANNEL_ALL, /* dest writemask */
+ 0, /* sampler */
+ src0, /* coord*/
+ T0_TEXKILL); /* opcode */
break;
case TGSI_OPCODE_LG2:
@@ -773,6 +796,11 @@ i915_translate_instruction(struct i915_fp_compile *p,
emit_simple_arith(p, inst, A0_SGE, 2);
break;
+ case TGSI_OPCODE_SLE:
+ /* like SGE, but swap reg0, reg1 */
+ emit_simple_arith_swap2(p, inst, A0_SGE, 2);
+ break;
+
case TGSI_OPCODE_SIN:
src0 = src_vector(p, &inst->FullSrcRegisters[0]);
tmp = i915_get_utemp(p);
@@ -827,6 +855,11 @@ i915_translate_instruction(struct i915_fp_compile *p,
emit_simple_arith(p, inst, A0_SLT, 2);
break;
+ case TGSI_OPCODE_SGT:
+ /* like SLT, but swap reg0, reg1 */
+ emit_simple_arith_swap2(p, inst, A0_SLT, 2);
+ break;
+
case TGSI_OPCODE_SUB:
src0 = src_vector(p, &inst->FullSrcRegisters[0]);
src1 = src_vector(p, &inst->FullSrcRegisters[1]);
@@ -880,6 +913,7 @@ i915_translate_instruction(struct i915_fp_compile *p,
default:
i915_program_error(p, "bad opcode %d", inst->Instruction.Opcode);
+ p->error = 1;
return;
}
@@ -896,6 +930,7 @@ static void
i915_translate_instructions(struct i915_fp_compile *p,
const struct tgsi_token *tokens)
{
+ struct i915_fragment_shader *ifs = p->shader;
struct tgsi_parse_context parse;
tgsi_parse_init( &parse, tokens );
@@ -928,13 +963,64 @@ i915_translate_instructions(struct i915_fp_compile *p,
p->output_semantic_name[ind] = sem;
p->output_semantic_index[ind] = semi;
}
+ else if (parse.FullToken.FullDeclaration.Declaration.File
+ == TGSI_FILE_CONSTANT) {
+ uint i;
+ for (i = parse.FullToken.FullDeclaration.u.DeclarationRange.First;
+ i <= parse.FullToken.FullDeclaration.u.DeclarationRange.Last;
+ i++) {
+ assert(ifs->constant_flags[i] == 0x0);
+ ifs->constant_flags[i] = I915_CONSTFLAG_USER;
+ ifs->num_constants = MAX2(ifs->num_constants, i + 1);
+ }
+ }
+ else if (parse.FullToken.FullDeclaration.Declaration.File
+ == TGSI_FILE_TEMPORARY) {
+ uint i;
+ for (i = parse.FullToken.FullDeclaration.u.DeclarationRange.First;
+ i <= parse.FullToken.FullDeclaration.u.DeclarationRange.Last;
+ i++) {
+ assert(i < I915_MAX_TEMPORARY);
+ p->temp_flag |= (1 << i); /* mark temp as used */
+ }
+ }
break;
case TGSI_TOKEN_TYPE_IMMEDIATE:
- /* XXX append the immediate to the const buffer... */
+ {
+ const struct tgsi_full_immediate *imm
+ = &parse.FullToken.FullImmediate;
+ const uint pos = p->num_immediates++;
+ uint j;
+ for (j = 0; j < imm->Immediate.Size; j++) {
+ p->immediates[pos][j] = imm->u.ImmediateFloat32[j].Float;
+ }
+ }
break;
case TGSI_TOKEN_TYPE_INSTRUCTION:
+ if (p->first_instruction) {
+ /* resolve location of immediates */
+ uint i, j;
+ for (i = 0; i < p->num_immediates; i++) {
+ /* find constant slot for this immediate */
+ for (j = 0; j < I915_MAX_CONSTANT; j++) {
+ if (ifs->constant_flags[j] == 0x0) {
+ memcpy(ifs->constants[j],
+ p->immediates[i],
+ 4 * sizeof(float));
+ /*printf("immediate %d maps to const %d\n", i, j);*/
+ ifs->constant_flags[j] = 0xf; /* all four comps used */
+ p->immediates_map[i] = j;
+ ifs->num_constants = MAX2(ifs->num_constants, j + 1);
+ break;
+ }
+ }
+ }
+
+ p->first_instruction = FALSE;
+ }
+
i915_translate_instruction(p, &parse.FullToken.FullInstruction);
break;
@@ -950,32 +1036,33 @@ i915_translate_instructions(struct i915_fp_compile *p,
static struct i915_fp_compile *
i915_init_compile(struct i915_context *i915,
- const struct pipe_shader_state *fs)
+ struct i915_fragment_shader *ifs)
{
struct i915_fp_compile *p = CALLOC_STRUCT(i915_fp_compile);
- p->shader = i915->fs;
+ p->shader = ifs;
- p->vertex_info = &i915->current.vertex_info;
-
- /* new constants found during translation get appended after the
- * user-provided constants.
+ /* Put new constants at end of const buffer, growing downward.
+ * The problem is we don't know how many user-defined constants might
+ * be specified with pipe->set_constant_buffer().
+ * Should pre-scan the user's program to determine the highest-numbered
+ * constant referenced.
*/
- p->constants = i915->current.constants[PIPE_SHADER_FRAGMENT];
- p->num_constants = i915->current.num_user_constants[PIPE_SHADER_FRAGMENT];
+ ifs->num_constants = 0;
+ memset(ifs->constant_flags, 0, sizeof(ifs->constant_flags));
+
+ p->first_instruction = TRUE;
p->nr_tex_indirect = 1; /* correct? */
p->nr_tex_insn = 0;
p->nr_alu_insn = 0;
p->nr_decl_insn = 0;
- memset(p->constant_flags, 0, sizeof(p->constant_flags));
-
p->csr = p->program;
p->decl = p->declarations;
p->decl_s = 0;
p->decl_t = 0;
- p->temp_flag = 0xffff000;
+ p->temp_flag = ~0x0 << I915_MAX_TEMPORARY;
p->utemp_flag = ~0x7;
p->wpos_tex = -1;
@@ -993,6 +1080,7 @@ i915_init_compile(struct i915_context *i915,
static void
i915_fini_compile(struct i915_context *i915, struct i915_fp_compile *p)
{
+ struct i915_fragment_shader *ifs = p->shader;
unsigned long program_size = (unsigned long) (p->csr - p->program);
unsigned long decl_size = (unsigned long) (p->decl - p->declarations);
@@ -1008,19 +1096,13 @@ i915_fini_compile(struct i915_context *i915, struct i915_fp_compile *p)
if (p->nr_decl_insn > I915_MAX_DECL_INSN)
i915_program_error(p, "Exceeded max DECL instructions");
- /* free old program, if present */
- if (i915->current.program) {
- FREE(i915->current.program);
- i915->current.program_len = 0;
- }
-
if (p->error) {
p->NumNativeInstructions = 0;
p->NumNativeAluInstructions = 0;
p->NumNativeTexInstructions = 0;
p->NumNativeTexIndirections = 0;
- i915_use_passthrough_shader(i915);
+ i915_use_passthrough_shader(ifs);
}
else {
p->NumNativeInstructions
@@ -1034,24 +1116,20 @@ i915_fini_compile(struct i915_context *i915, struct i915_fp_compile *p)
/* Copy compilation results to fragment program struct:
*/
- i915->current.program
+ assert(!ifs->program);
+ ifs->program
= (uint *) MALLOC((program_size + decl_size) * sizeof(uint));
- if (i915->current.program) {
- i915->current.program_len = program_size + decl_size;
+ if (ifs->program) {
+ ifs->program_len = program_size + decl_size;
- memcpy(i915->current.program,
+ memcpy(ifs->program,
p->declarations,
decl_size * sizeof(uint));
- memcpy(i915->current.program + decl_size,
+ memcpy(ifs->program + decl_size,
p->program,
program_size * sizeof(uint));
}
-
- /* update number of constants */
- i915->current.num_constants[PIPE_SHADER_FRAGMENT] = p->num_constants;
- assert(i915->current.num_constants[PIPE_SHADER_FRAGMENT]
- >= i915->current.num_user_constants[PIPE_SHADER_FRAGMENT]);
}
/* Release the compilation struct:
@@ -1085,7 +1163,7 @@ i915_find_wpos_space(struct i915_fp_compile *p)
i915_program_error(p, "No free texcoord for wpos value");
}
#else
- if (p->shader->input_semantic_name[0] == TGSI_SEMANTIC_POSITION) {
+ if (p->shader->state.input_semantic_name[0] == TGSI_SEMANTIC_POSITION) {
/* frag shader using the fragment position input */
#if 0
assert(0);
@@ -1106,7 +1184,7 @@ static void
i915_fixup_depth_write(struct i915_fp_compile *p)
{
/* XXX assuming pos/depth is always in output[0] */
- if (p->shader->output_semantic_name[0] == TGSI_SEMANTIC_POSITION) {
+ if (p->shader->state.output_semantic_name[0] == TGSI_SEMANTIC_POSITION) {
const uint depth = UREG(REG_TYPE_OD, 0);
i915_emit_arith(p,
@@ -1121,13 +1199,18 @@ i915_fixup_depth_write(struct i915_fp_compile *p)
void
-i915_translate_fragment_program( struct i915_context *i915 )
+i915_translate_fragment_program( struct i915_context *i915,
+ struct i915_fragment_shader *fs)
{
- struct i915_fp_compile *p = i915_init_compile(i915, i915->fs);
- const struct tgsi_token *tokens = i915->fs->tokens;
+ struct i915_fp_compile *p = i915_init_compile(i915, fs);
+ const struct tgsi_token *tokens = fs->state.tokens;
i915_find_wpos_space(p);
+#if 0
+ tgsi_dump(tokens, 0);
+#endif
+
i915_translate_instructions(p, tokens);
i915_fixup_depth_write(p);
diff --git a/src/gallium/drivers/i915simple/i915_prim_emit.c b/src/gallium/drivers/i915simple/i915_prim_emit.c
index 44c4325936..d8de5178f6 100644
--- a/src/gallium/drivers/i915simple/i915_prim_emit.c
+++ b/src/gallium/drivers/i915simple/i915_prim_emit.c
@@ -72,38 +72,42 @@ emit_hw_vertex( struct i915_context *i915,
uint i;
uint count = 0; /* for debug/sanity */
+ assert(!i915->dirty);
+
for (i = 0; i < vinfo->num_attribs; i++) {
+ const uint j = vinfo->src_index[i];
+ const float *attrib = vertex->data[j];
switch (vinfo->emit[i]) {
case EMIT_OMIT:
/* no-op */
break;
case EMIT_1F:
- OUT_BATCH( fui(vertex->data[i][0]) );
+ OUT_BATCH( fui(attrib[0]) );
count++;
break;
case EMIT_2F:
- OUT_BATCH( fui(vertex->data[i][0]) );
- OUT_BATCH( fui(vertex->data[i][1]) );
+ OUT_BATCH( fui(attrib[0]) );
+ OUT_BATCH( fui(attrib[1]) );
count += 2;
break;
case EMIT_3F:
- OUT_BATCH( fui(vertex->data[i][0]) );
- OUT_BATCH( fui(vertex->data[i][1]) );
- OUT_BATCH( fui(vertex->data[i][2]) );
+ OUT_BATCH( fui(attrib[0]) );
+ OUT_BATCH( fui(attrib[1]) );
+ OUT_BATCH( fui(attrib[2]) );
count += 3;
break;
case EMIT_4F:
- OUT_BATCH( fui(vertex->data[i][0]) );
- OUT_BATCH( fui(vertex->data[i][1]) );
- OUT_BATCH( fui(vertex->data[i][2]) );
- OUT_BATCH( fui(vertex->data[i][3]) );
+ OUT_BATCH( fui(attrib[0]) );
+ OUT_BATCH( fui(attrib[1]) );
+ OUT_BATCH( fui(attrib[2]) );
+ OUT_BATCH( fui(attrib[3]) );
count += 4;
break;
case EMIT_4UB:
- OUT_BATCH( pack_ub4(float_to_ubyte( vertex->data[i][2] ),
- float_to_ubyte( vertex->data[i][1] ),
- float_to_ubyte( vertex->data[i][0] ),
- float_to_ubyte( vertex->data[i][3] )) );
+ OUT_BATCH( pack_ub4(float_to_ubyte( attrib[2] ),
+ float_to_ubyte( attrib[1] ),
+ float_to_ubyte( attrib[0] ),
+ float_to_ubyte( attrib[3] )) );
count += 1;
break;
default:
@@ -122,17 +126,19 @@ emit_prim( struct draw_stage *stage,
unsigned nr )
{
struct i915_context *i915 = setup_stage(stage)->i915;
- unsigned vertex_size = i915->current.vertex_info.size * 4; /* in bytes */
+ unsigned vertex_size;
unsigned i;
- assert(vertex_size >= 12); /* never smaller than 12 bytes */
-
if (i915->dirty)
i915_update_derived( i915 );
if (i915->hardware_dirty)
i915_emit_hardware_state( i915 );
+ /* need to do this after validation! */
+ vertex_size = i915->current.vertex_info.size * 4; /* in bytes */
+ assert(vertex_size >= 12); /* never smaller than 12 bytes */
+
if (!BEGIN_BATCH( 1 + nr * vertex_size / 4, 0 )) {
FLUSH_BATCH();
diff --git a/src/gallium/drivers/i915simple/i915_prim_vbuf.c b/src/gallium/drivers/i915simple/i915_prim_vbuf.c
index c5bf6174f6..9d5f609220 100644
--- a/src/gallium/drivers/i915simple/i915_prim_vbuf.c
+++ b/src/gallium/drivers/i915simple/i915_prim_vbuf.c
@@ -83,6 +83,12 @@ i915_vbuf_render_get_vertex_info( struct vbuf_render *render )
{
struct i915_vbuf_render *i915_render = i915_vbuf_render(render);
struct i915_context *i915 = i915_render->i915;
+
+ if (i915->dirty) {
+ /* make sure we have up to date vertex layout */
+ i915_update_derived( i915 );
+ }
+
return &i915->current.vertex_info;
}
@@ -143,7 +149,8 @@ i915_vbuf_render_draw( struct vbuf_render *render,
assert(nr_indices);
- assert((i915->dirty & ~I915_NEW_VBO) == 0);
+ /* this seems to be bogus, since we validate state right after this */
+ /*assert((i915->dirty & ~I915_NEW_VBO) == 0);*/
if (i915->dirty)
i915_update_derived( i915 );
diff --git a/src/gallium/drivers/i915simple/i915_state.c b/src/gallium/drivers/i915simple/i915_state.c
index e055eed7e0..a35bdf941f 100644
--- a/src/gallium/drivers/i915simple/i915_state.c
+++ b/src/gallium/drivers/i915simple/i915_state.c
@@ -38,6 +38,7 @@
#include "i915_reg.h"
#include "i915_state.h"
#include "i915_state_inlines.h"
+#include "i915_fpc.h"
/* The i915 (and related graphics cores) do not support GL_CLAMP. The
@@ -416,26 +417,47 @@ static void i915_set_polygon_stipple( struct pipe_context *pipe,
}
-static void * i915_create_fs_state(struct pipe_context *pipe,
- const struct pipe_shader_state *templ)
+
+static void *
+i915_create_fs_state(struct pipe_context *pipe,
+ const struct pipe_shader_state *templ)
{
- return 0;
+ struct i915_context *i915 = i915_context(pipe);
+ struct i915_fragment_shader *ifs = CALLOC_STRUCT(i915_fragment_shader);
+ if (!ifs)
+ return NULL;
+
+ ifs->state = *templ;
+
+ /* The shader's compiled to i915 instructions here */
+ i915_translate_fragment_program(i915, ifs);
+
+ return ifs;
}
-static void i915_bind_fs_state(struct pipe_context *pipe, void *fs)
+static void
+i915_bind_fs_state(struct pipe_context *pipe, void *shader)
{
struct i915_context *i915 = i915_context(pipe);
- i915->fs = (struct pipe_shader_state *)fs;
+ i915->fs = (struct i915_fragment_shader*) shader;
i915->dirty |= I915_NEW_FS;
}
-static void i915_delete_fs_state(struct pipe_context *pipe, void *shader)
+static
+void i915_delete_fs_state(struct pipe_context *pipe, void *shader)
{
- /*do nothing*/
+ struct i915_fragment_shader *ifs = (struct i915_fragment_shader *) shader;
+
+ if (ifs->program)
+ FREE(ifs->program);
+ ifs->program_len = 0;
+
+ FREE(ifs);
}
+
static void *
i915_create_vs_state(struct pipe_context *pipe,
const struct pipe_shader_state *templ)
@@ -452,6 +474,8 @@ static void i915_bind_vs_state(struct pipe_context *pipe, void *shader)
/* just pass-through to draw module */
draw_bind_vertex_shader(i915->draw, (struct draw_vertex_shader *) shader);
+
+ i915->dirty |= I915_NEW_VS;
}
static void i915_delete_vs_state(struct pipe_context *pipe, void *shader)
diff --git a/src/gallium/drivers/i915simple/i915_state_derived.c b/src/gallium/drivers/i915simple/i915_state_derived.c
index 4767584fc6..5cf70acdf3 100644
--- a/src/gallium/drivers/i915simple/i915_state_derived.c
+++ b/src/gallium/drivers/i915simple/i915_state_derived.c
@@ -27,104 +27,111 @@
#include "pipe/p_util.h"
+#include "pipe/p_shader_tokens.h"
#include "draw/draw_context.h"
#include "draw/draw_vertex.h"
#include "i915_context.h"
#include "i915_state.h"
#include "i915_reg.h"
#include "i915_fpc.h"
-#include "pipe/p_shader_tokens.h"
+
/**
- * Determine which post-transform / pre-rasterization vertex attributes
- * we need.
- * Derived from: fs, setup states.
+ * Determine the hardware vertex layout.
+ * Depends on vertex/fragment shader state.
*/
static void calculate_vertex_layout( struct i915_context *i915 )
{
- const struct pipe_shader_state *fs = i915->fs;
+ const struct pipe_shader_state *fs = &i915->fs->state;
const enum interp_mode colorInterp = i915->rasterizer->color_interp;
struct vertex_info vinfo;
- uint front0 = 0, back0 = 0, front1 = 0, back1 = 0;
- boolean needW = 0;
+ boolean texCoords[8], colors[2], fog, needW;
uint i;
- boolean texCoords[8];
- uint src = 0;
+ int src;
memset(texCoords, 0, sizeof(texCoords));
+ colors[0] = colors[1] = fog = needW = FALSE;
memset(&vinfo, 0, sizeof(vinfo));
- /* pos */
- draw_emit_vertex_attr(&vinfo, EMIT_3F, INTERP_LINEAR, src++);
- /* Note: we'll set the S4_VFMT_XYZ[W] bits below */
-
+ /* Determine which fragment program inputs are needed. Setup HW vertex
+ * layout below, in the HW-specific attribute order.
+ */
for (i = 0; i < fs->num_inputs; i++) {
switch (fs->input_semantic_name[i]) {
case TGSI_SEMANTIC_POSITION:
break;
case TGSI_SEMANTIC_COLOR:
- if (fs->input_semantic_index[i] == 0) {
- front0 = draw_emit_vertex_attr(&vinfo, EMIT_4UB, colorInterp, src++);
- vinfo.hwfmt[0] |= S4_VFMT_COLOR;
- }
- else {
- assert(fs->input_semantic_index[i] == 1);
- front1 = draw_emit_vertex_attr(&vinfo, EMIT_4UB, colorInterp, src++);
- vinfo.hwfmt[0] |= S4_VFMT_SPEC_FOG;
- }
+ assert(fs->input_semantic_index[i] < 2);
+ colors[fs->input_semantic_index[i]] = TRUE;
break;
case TGSI_SEMANTIC_GENERIC:
/* usually a texcoord */
{
const uint unit = fs->input_semantic_index[i];
- uint hwtc;
+ assert(unit < 8);
texCoords[unit] = TRUE;
- draw_emit_vertex_attr(&vinfo, EMIT_4F, INTERP_PERSPECTIVE, src++);
- hwtc = TEXCOORDFMT_4D;
needW = TRUE;
- vinfo.hwfmt[1] |= hwtc << (unit * 4);
}
break;
case TGSI_SEMANTIC_FOG:
- debug_printf("i915 fogcoord not implemented yet\n");
- draw_emit_vertex_attr(&vinfo, EMIT_1F, INTERP_PERSPECTIVE, src++);
+ fog = TRUE;
break;
default:
assert(0);
}
-
}
- /* finish up texcoord fields */
- for (i = 0; i < 8; i++) {
- if (!texCoords[i]) {
- const uint hwtc = TEXCOORDFMT_NOT_PRESENT;
- vinfo.hwfmt[1] |= hwtc << (i* 4);
- }
- }
-
- /* go back and fill in the vertex position info now that we have needW */
+
+ /* pos */
+ src = draw_find_vs_output(i915->draw, TGSI_SEMANTIC_POSITION, 0);
if (needW) {
+ draw_emit_vertex_attr(&vinfo, EMIT_4F, INTERP_LINEAR, src);
vinfo.hwfmt[0] |= S4_VFMT_XYZW;
vinfo.emit[0] = EMIT_4F;
}
else {
+ draw_emit_vertex_attr(&vinfo, EMIT_3F, INTERP_LINEAR, src);
vinfo.hwfmt[0] |= S4_VFMT_XYZ;
vinfo.emit[0] = EMIT_3F;
}
- /* Additional attributes required for setup: Just twosided
- * lighting. Edgeflag is dealt with specially by setting bits in
- * the vertex header.
- */
- if (i915->rasterizer->light_twoside) {
- if (front0) {
- back0 = draw_emit_vertex_attr(&vinfo, EMIT_OMIT, colorInterp, src++);
+ /* hardware point size */
+ /* XXX todo */
+
+ /* primary color */
+ if (colors[0]) {
+ src = draw_find_vs_output(i915->draw, TGSI_SEMANTIC_COLOR, 0);
+ draw_emit_vertex_attr(&vinfo, EMIT_4UB, colorInterp, src);
+ vinfo.hwfmt[0] |= S4_VFMT_COLOR;
+ }
+
+ /* secondary color */
+ if (colors[1]) {
+ src = draw_find_vs_output(i915->draw, TGSI_SEMANTIC_COLOR, 1);
+ draw_emit_vertex_attr(&vinfo, EMIT_4UB, colorInterp, src);
+ vinfo.hwfmt[0] |= S4_VFMT_SPEC_FOG;
+ }
+
+ /* fog coord, not fog blend factor */
+ if (fog) {
+ src = draw_find_vs_output(i915->draw, TGSI_SEMANTIC_FOG, 0);
+ draw_emit_vertex_attr(&vinfo, EMIT_1F, INTERP_PERSPECTIVE, src);
+ vinfo.hwfmt[0] |= S4_VFMT_FOG_PARAM;
+ }
+
+ /* texcoords */
+ for (i = 0; i < 8; i++) {
+ uint hwtc;
+ if (texCoords[i]) {
+ hwtc = TEXCOORDFMT_4D;
+ src = draw_find_vs_output(i915->draw, TGSI_SEMANTIC_GENERIC, i);
+ draw_emit_vertex_attr(&vinfo, EMIT_4F, INTERP_PERSPECTIVE, src);
}
- if (back0) {
- back1 = draw_emit_vertex_attr(&vinfo, EMIT_OMIT, colorInterp, src++);
+ else {
+ hwtc = TEXCOORDFMT_NOT_PRESENT;
}
+ vinfo.hwfmt[1] |= hwtc << (i * 4);
}
draw_compute_vertex_size(&vinfo);
@@ -148,7 +155,7 @@ static void calculate_vertex_layout( struct i915_context *i915 )
*/
void i915_update_derived( struct i915_context *i915 )
{
- if (i915->dirty & (I915_NEW_RASTERIZER | I915_NEW_FS))
+ if (i915->dirty & (I915_NEW_RASTERIZER | I915_NEW_FS | I915_NEW_VS))
calculate_vertex_layout( i915 );
if (i915->dirty & (I915_NEW_SAMPLER | I915_NEW_TEXTURE))
@@ -164,7 +171,6 @@ void i915_update_derived( struct i915_context *i915 )
i915_update_dynamic( i915 );
if (i915->dirty & I915_NEW_FS) {
- i915_translate_fragment_program(i915);
i915->hardware_dirty |= I915_HW_PROGRAM; /* XXX right? */
}
diff --git a/src/gallium/drivers/i915simple/i915_state_emit.c b/src/gallium/drivers/i915simple/i915_state_emit.c
index 3339287f49..6bbaac4e34 100644
--- a/src/gallium/drivers/i915simple/i915_state_emit.c
+++ b/src/gallium/drivers/i915simple/i915_state_emit.c
@@ -99,7 +99,11 @@ i915_emit_hardware_state(struct i915_context *i915 )
2 + I915_TEX_UNITS*3 +
2 + I915_TEX_UNITS*3 +
2 + I915_MAX_CONSTANT*4 +
+#if 0
i915->current.program_len +
+#else
+ i915->fs->program_len +
+#endif
6
) * 3/2; /* plus 50% margin */
const unsigned relocs = ( I915_TEX_UNITS +
@@ -325,15 +329,34 @@ i915_emit_hardware_state(struct i915_context *i915 )
/* 2 + I915_MAX_CONSTANT*4 dwords, 0 relocs */
if (i915->hardware_dirty & I915_HW_PROGRAM)
{
- const uint nr = i915->current.num_constants[PIPE_SHADER_FRAGMENT];
- assert(nr <= I915_MAX_CONSTANT);
- if (nr > 0) {
- const uint *c
- = (const uint *) i915->current.constants[PIPE_SHADER_FRAGMENT];
+ /* Collate the user-defined constants with the fragment shader's
+ * immediates according to the constant_flags[] array.
+ */
+ const uint nr = i915->fs->num_constants;
+ if (nr) {
uint i;
+
OUT_BATCH( _3DSTATE_PIXEL_SHADER_CONSTANTS | (nr * 4) );
OUT_BATCH( (1 << (nr - 1)) | ((1 << (nr - 1)) - 1) );
+
for (i = 0; i < nr; i++) {
+ const uint *c;
+ if (i915->fs->constant_flags[i] == I915_CONSTFLAG_USER) {
+ /* grab user-defined constant */
+ c = (uint *) i915->current.constants[PIPE_SHADER_FRAGMENT][i];
+ }
+ else {
+ /* emit program constant */
+ c = (uint *) i915->fs->constants[i];
+ }
+#if 0 /* debug */
+ {
+ float *f = (float *) c;
+ printf("Const %2d: %f %f %f %f %s\n", i, f[0], f[1], f[2], f[3],
+ (i915->fs->constant_flags[i] == I915_CONSTFLAG_USER
+ ? "user" : "immediate"));
+ }
+#endif
OUT_BATCH(*c++);
OUT_BATCH(*c++);
OUT_BATCH(*c++);
@@ -348,9 +371,9 @@ i915_emit_hardware_state(struct i915_context *i915 )
{
uint i;
/* we should always have, at least, a pass-through program */
- assert(i915->current.program_len > 0);
- for (i = 0; i < i915->current.program_len; i++) {
- OUT_BATCH(i915->current.program[i]);
+ assert(i915->fs->program_len > 0);
+ for (i = 0; i < i915->fs->program_len; i++) {
+ OUT_BATCH(i915->fs->program[i]);
}
}
diff --git a/src/gallium/drivers/softpipe/SConscript b/src/gallium/drivers/softpipe/SConscript
index d581ee8d3c..4c1a6d5df0 100644
--- a/src/gallium/drivers/softpipe/SConscript
+++ b/src/gallium/drivers/softpipe/SConscript
@@ -5,6 +5,9 @@ env = env.Clone()
softpipe = env.ConvenienceLibrary(
target = 'softpipe',
source = [
+ 'sp_fs_exec.c',
+ 'sp_fs_sse.c',
+ 'sp_fs_llvm.c',
'sp_clear.c',
'sp_context.c',
'sp_draw_arrays.c',
diff --git a/src/gallium/drivers/softpipe/sp_fs_exec.c b/src/gallium/drivers/softpipe/sp_fs_exec.c
index 8cb0534342..d5bd7a702f 100644
--- a/src/gallium/drivers/softpipe/sp_fs_exec.c
+++ b/src/gallium/drivers/softpipe/sp_fs_exec.c
@@ -81,7 +81,7 @@ sp_setup_pos_vector(const struct tgsi_interp_coef *coef,
static void
-exec_prepare( struct sp_fragment_shader *base,
+exec_prepare( const struct sp_fragment_shader *base,
struct tgsi_exec_machine *machine,
struct tgsi_sampler *samplers )
{
@@ -98,7 +98,7 @@ exec_prepare( struct sp_fragment_shader *base,
* interface:
*/
static unsigned
-exec_run( struct sp_fragment_shader *base,
+exec_run( const struct sp_fragment_shader *base,
struct tgsi_exec_machine *machine,
struct quad_header *quad )
{
diff --git a/src/gallium/drivers/softpipe/sp_fs_llvm.c b/src/gallium/drivers/softpipe/sp_fs_llvm.c
index 22da471453..34b2b7d4e2 100644
--- a/src/gallium/drivers/softpipe/sp_fs_llvm.c
+++ b/src/gallium/drivers/softpipe/sp_fs_llvm.c
@@ -146,7 +146,7 @@ shade_quad_llvm(struct quad_stage *qs,
unsigned
-run_llvm_fs( struct sp_fragment_shader *base,
+run_llvm_fs( const struct sp_fragment_shader *base,
struct foo *machine )
{
}
diff --git a/src/gallium/drivers/softpipe/sp_prim_setup.c b/src/gallium/drivers/softpipe/sp_prim_setup.c
index 7b1e131ee1..b6a3fddb29 100644
--- a/src/gallium/drivers/softpipe/sp_prim_setup.c
+++ b/src/gallium/drivers/softpipe/sp_prim_setup.c
@@ -1165,6 +1165,10 @@ static void setup_begin( struct draw_stage *stage )
struct softpipe_context *sp = setup->softpipe;
const struct pipe_shader_state *fs = &setup->softpipe->fs->shader;
+ if (sp->dirty) {
+ softpipe_update_derived(sp);
+ }
+
setup->quad.nr_attrs = fs->num_inputs;
sp->quad.first->begin(sp->quad.first);
diff --git a/src/gallium/drivers/softpipe/sp_quad.c b/src/gallium/drivers/softpipe/sp_quad.c
index 15b5594547..142dbcc771 100644
--- a/src/gallium/drivers/softpipe/sp_quad.c
+++ b/src/gallium/drivers/softpipe/sp_quad.c
@@ -56,11 +56,12 @@ sp_build_depth_stencil(
void
sp_build_quad_pipeline(struct softpipe_context *sp)
{
- boolean early_depth_test =
+ boolean early_depth_test =
sp->depth_stencil->depth.enabled &&
sp->framebuffer.zsbuf &&
!sp->depth_stencil->alpha.enabled &&
- sp->fs->shader.output_semantic_name[0] != TGSI_SEMANTIC_POSITION;
+ !sp->fs->uses_kill &&
+ !sp->fs->writes_z;
/* build up the pipeline in reverse order... */
diff --git a/src/gallium/drivers/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
index ef8cf67d4c..5aaa9e346b 100644
--- a/src/gallium/drivers/softpipe/sp_state.h
+++ b/src/gallium/drivers/softpipe/sp_state.h
@@ -63,14 +63,17 @@ struct tgsi_exec_machine;
struct sp_fragment_shader {
struct pipe_shader_state shader;
- void (*prepare)( struct sp_fragment_shader *shader,
+ boolean uses_kill;
+ boolean writes_z;
+
+ void (*prepare)( const struct sp_fragment_shader *shader,
struct tgsi_exec_machine *machine,
struct tgsi_sampler *samplers);
/* Run the shader - this interface will get cleaned up in the
* future:
*/
- unsigned (*run)( struct sp_fragment_shader *shader,
+ unsigned (*run)( const struct sp_fragment_shader *shader,
struct tgsi_exec_machine *machine,
struct quad_header *quad );
diff --git a/src/gallium/drivers/softpipe/sp_state_derived.c b/src/gallium/drivers/softpipe/sp_state_derived.c
index f9f2c5eaa8..4c6313001f 100644
--- a/src/gallium/drivers/softpipe/sp_state_derived.c
+++ b/src/gallium/drivers/softpipe/sp_state_derived.c
@@ -35,33 +35,6 @@
/**
- * Search vertex program's outputs to find a match for the given
- * semantic name/index. Return the index of the output slot.
- *
- * Return 0 if not found. This will cause the fragment program to use
- * vertex attrib 0 (position) in the cases where the fragment program
- * attempts to use a missing vertex program output. This is an undefined
- * condition that users shouldn't hit anyway.
- */
-static int
-find_vs_output(struct softpipe_context *sp,
- const struct pipe_shader_state *vs,
- uint semantic_name,
- uint semantic_index)
-{
- uint i;
- for (i = 0; i < vs->num_outputs; i++) {
- if (vs->output_semantic_name[i] == semantic_name &&
- vs->output_semantic_index[i] == semantic_index)
- return i;
- }
-
- /* See if the draw module is introducing a new attribute... */
- return draw_find_vs_output(sp->draw, semantic_name, semantic_index);
-}
-
-
-/**
* Mark the current vertex layout as "invalid".
* We'll validate the vertex layout later, when we start to actually
* render a point or line or tri.
@@ -114,24 +87,25 @@ softpipe_get_vertex_info(struct softpipe_context *softpipe)
int src;
switch (fs->input_semantic_name[i]) {
case TGSI_SEMANTIC_POSITION:
- src = find_vs_output(softpipe, vs, TGSI_SEMANTIC_POSITION, 0);
+ src = draw_find_vs_output(softpipe->draw,
+ TGSI_SEMANTIC_POSITION, 0);
draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_POS, src);
break;
case TGSI_SEMANTIC_COLOR:
- src = find_vs_output(softpipe, vs, TGSI_SEMANTIC_COLOR,
+ src = draw_find_vs_output(softpipe->draw, TGSI_SEMANTIC_COLOR,
fs->input_semantic_index[i]);
draw_emit_vertex_attr(vinfo, EMIT_4F, colorInterp, src);
break;
case TGSI_SEMANTIC_FOG:
- src = find_vs_output(softpipe, vs, TGSI_SEMANTIC_FOG, 0);
+ src = draw_find_vs_output(softpipe->draw, TGSI_SEMANTIC_FOG, 0);
draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_PERSPECTIVE, src);
break;
case TGSI_SEMANTIC_GENERIC:
/* this includes texcoords and varying vars */
- src = find_vs_output(softpipe, vs, TGSI_SEMANTIC_GENERIC,
+ src = draw_find_vs_output(softpipe->draw, TGSI_SEMANTIC_GENERIC,
fs->input_semantic_index[i]);
draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_PERSPECTIVE, src);
break;
@@ -141,7 +115,8 @@ softpipe_get_vertex_info(struct softpipe_context *softpipe)
}
}
- softpipe->psize_slot = find_vs_output(softpipe, vs, TGSI_SEMANTIC_PSIZE, 0);
+ softpipe->psize_slot = draw_find_vs_output(softpipe->draw,
+ TGSI_SEMANTIC_PSIZE, 0);
if (softpipe->psize_slot > 0) {
draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_CONSTANT,
softpipe->psize_slot);
diff --git a/src/gallium/drivers/softpipe/sp_state_fs.c b/src/gallium/drivers/softpipe/sp_state_fs.c
index b0238f8173..b184ac61bb 100644
--- a/src/gallium/drivers/softpipe/sp_state_fs.c
+++ b/src/gallium/drivers/softpipe/sp_state_fs.c
@@ -36,6 +36,7 @@
#include "pipe/p_shader_tokens.h"
#include "draw/draw_context.h"
#include "tgsi/util/tgsi_dump.h"
+#include "tgsi/util/tgsi_scan.h"
void *
@@ -44,21 +45,24 @@ softpipe_create_fs_state(struct pipe_context *pipe,
{
struct softpipe_context *softpipe = softpipe_context(pipe);
struct sp_fragment_shader *state;
+ struct tgsi_shader_info info;
+
+ tgsi_scan_shader(templ->tokens, &info);
if (softpipe->dump_fs)
tgsi_dump(templ->tokens, 0);
state = softpipe_create_fs_llvm( softpipe, templ );
- if (state)
- return state;
-
- state = softpipe_create_fs_sse( softpipe, templ );
- if (state)
- return state;
-
- state = softpipe_create_fs_exec( softpipe, templ );
-
+ if (!state) {
+ state = softpipe_create_fs_sse( softpipe, templ );
+ if (!state) {
+ state = softpipe_create_fs_exec( softpipe, templ );
+ }
+ }
assert(state);
+ state->uses_kill = (info.opcode_count[TGSI_OPCODE_KIL] ||
+ info.opcode_count[TGSI_OPCODE_KILP]);
+ state->writes_z = info.writes_z;
return state;
}
diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c
index 43d5085895..0ced585c7f 100644
--- a/src/gallium/drivers/softpipe/sp_tex_sample.c
+++ b/src/gallium/drivers/softpipe/sp_tex_sample.c
@@ -343,7 +343,7 @@ nearest_texcoord_unnorm(unsigned wrapMode, float s, unsigned size)
switch (wrapMode) {
case PIPE_TEX_WRAP_CLAMP:
i = ifloor(s);
- return CLAMP(i, 0, size-1);
+ return CLAMP(i, 0, (int) size-1);
case PIPE_TEX_WRAP_CLAMP_TO_EDGE:
/* fall-through */
case PIPE_TEX_WRAP_CLAMP_TO_BORDER:
@@ -366,7 +366,7 @@ linear_texcoord_unnorm(unsigned wrapMode, float s, unsigned size,
switch (wrapMode) {
case PIPE_TEX_WRAP_CLAMP:
/* Not exactly what the spec says, but it matches NVIDIA output */
- s = CLAMP(s - 0.5F, 0.0, (float) size - 1.0);
+ s = CLAMP(s - 0.5F, 0.0f, (float) size - 1.0f);
*i0 = ifloor(s);
*i1 = *i0 + 1;
break;
@@ -377,7 +377,7 @@ linear_texcoord_unnorm(unsigned wrapMode, float s, unsigned size,
s -= 0.5F;
*i0 = ifloor(s);
*i1 = *i0 + 1;
- if (*i1 > size - 1)
+ if (*i1 > (int) size - 1)
*i1 = size - 1;
break;
default:
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index 30cd729c56..91f3d2ac2d 100644
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -1,6 +1,6 @@
/**************************************************************************
*
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007-2008 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -42,6 +42,14 @@
#endif
+#if defined(__MSC__)
+
+/* Avoid 'expression is always true' warning */
+#pragma warning(disable: 4296)
+
+#endif /* __MSC__ */
+
+
typedef unsigned int uint;
typedef unsigned char ubyte;
typedef unsigned char boolean;
@@ -61,8 +69,10 @@ typedef long long int64_t;
typedef unsigned long long uint64_t;
#if defined(_WIN64)
+typedef __int64 intptr_t;
typedef unsigned __int64 uintptr_t;
#else
+typedef int intptr_t;
typedef unsigned int uintptr_t;
#endif
diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index 036c4c8964..f69b52f5e3 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -31,6 +31,11 @@
#include "p_state.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
struct pipe_state_cache;
/* Opaque driver handles:
@@ -226,4 +231,9 @@ struct pipe_context {
unsigned flags );
};
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* PIPE_CONTEXT_H */
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 0bf53ecb79..d84ddbc27a 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -30,6 +30,10 @@
#include "p_format.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define PIPE_BLENDFACTOR_ONE 0x1
#define PIPE_BLENDFACTOR_SRC_COLOR 0x2
#define PIPE_BLENDFACTOR_SRC_ALPHA 0x3
@@ -267,4 +271,8 @@ enum pipe_texture_target {
#define PIPE_CAP_MAX_TEXTURE_LOD_BIAS 19
#define PIPE_CAP_BITMAP_TEXCOORD_BIAS 20
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
index c9ad324315..561d2e5921 100644
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@ -33,6 +33,10 @@
#include "p_compiler.h"
#include "p_debug.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
* The PIPE_FORMAT is a 32-bit wide bitfield that encodes all the information
* needed to uniquely describe a pixel format.
@@ -418,4 +422,8 @@ static INLINE uint pf_get_size( enum pipe_format format ) {
return pf_get_bits(format) / 8;
}
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/gallium/include/pipe/p_inlines.h b/src/gallium/include/pipe/p_inlines.h
index ebf6ed86bc..de3fa555c5 100644
--- a/src/gallium/include/pipe/p_inlines.h
+++ b/src/gallium/include/pipe/p_inlines.h
@@ -33,6 +33,11 @@
#include "p_winsys.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
static INLINE void *
pipe_surface_map(struct pipe_surface *surface)
{
@@ -109,4 +114,8 @@ pipe_texture_reference(struct pipe_context *pipe, struct pipe_texture **ptr,
}
+#ifdef __cplusplus
+}
+#endif
+
#endif /* P_INLINES_H */
diff --git a/src/gallium/include/pipe/p_pointer.h b/src/gallium/include/pipe/p_pointer.h
new file mode 100644
index 0000000000..3a1e6be88e
--- /dev/null
+++ b/src/gallium/include/pipe/p_pointer.h
@@ -0,0 +1,95 @@
+/**************************************************************************
+ *
+ * Copyright 2007-2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+#ifndef P_POINTER_H
+#define P_POINTER_H
+
+#include "p_compiler.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static INLINE intptr_t
+pointer_to_intptr( const void *p )
+{
+ union {
+ const void *p;
+ intptr_t i;
+ } pi;
+ pi.p = p;
+ return pi.i;
+}
+
+static INLINE void *
+intptr_to_pointer( intptr_t i )
+{
+ union {
+ void *p;
+ intptr_t i;
+ } pi;
+ pi.i = i;
+ return pi.p;
+}
+
+static INLINE uintptr_t
+pointer_to_uintptr( const void *ptr )
+{
+ union {
+ const void *p;
+ uintptr_t u;
+ } pu;
+ pu.p = ptr;
+ return pu.u;
+}
+
+static INLINE void *
+uintptr_to_pointer( uintptr_t u )
+{
+ union {
+ void *p;
+ uintptr_t u;
+ } pu;
+ pu.u = u;
+ return pu.p;
+}
+
+/**
+ * Return a pointer aligned to next multiple of N bytes.
+ */
+static INLINE void *
+align_pointer( const void *unaligned, uintptr_t alignment )
+{
+ uintptr_t aligned = (pointer_to_uintptr( unaligned ) + alignment - 1) & ~(alignment - 1);
+ return uintptr_to_pointer( aligned );
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* P_POINTER_H */
diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h
index 10c47e0ef0..1806877f6c 100644
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -50,6 +50,8 @@ struct tgsi_token
#define TGSI_FILE_SAMPLER 5
#define TGSI_FILE_ADDRESS 6
#define TGSI_FILE_IMMEDIATE 7
+#define TGSI_FILE_COUNT 8 /**< how many TGSI_FILE_ types */
+
#define TGSI_DECLARE_RANGE 0
#define TGSI_DECLARE_MASK 1
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 47fa78c31d..15c88881eb 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -42,6 +42,12 @@
#include "p_defines.h"
#include "p_format.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
/**
* Implementation limits
*/
@@ -326,4 +332,8 @@ struct pipe_vertex_element
};
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/gallium/include/pipe/p_util.h b/src/gallium/include/pipe/p_util.h
index d7da2801c9..3b32ba1d24 100644
--- a/src/gallium/include/pipe/p_util.h
+++ b/src/gallium/include/pipe/p_util.h
@@ -30,16 +30,17 @@
#include "p_compiler.h"
#include "p_debug.h"
+#include "p_pointer.h"
#include <math.h>
-#ifdef WIN32
-
#ifdef __cplusplus
-extern "C"
-{
+extern "C" {
#endif
+
+#ifdef WIN32
+
void * __stdcall
EngAllocMem(
unsigned long Flags,
@@ -50,10 +51,6 @@ void __stdcall
EngFreeMem(
void *Mem );
-#ifdef __cplusplus
-}
-#endif
-
static INLINE void *
MALLOC( unsigned size )
{
@@ -115,33 +112,6 @@ REALLOC( void *old_ptr, unsigned old_size, unsigned new_size )
/**
- * Return a pointer aligned to next multiple of N bytes.
- */
-static INLINE void *
-align_pointer( void *unaligned, uint alignment )
-{
- if (sizeof(void *) == 64) {
- union {
- void *p;
- uint64 u;
- } pu;
- pu.p = unaligned;
- pu.u = (pu.u + alignment - 1) & ~(uint64) (alignment - 1);
- return pu.p;
- }
- else {
- /* 32-bit pointers */
- union {
- void *p;
- uint u;
- } pu;
- pu.p = unaligned;
- pu.u = (pu.u + alignment - 1) & ~(alignment - 1);
- return pu.p;
- }
-}
-
-/**
* Return memory on given byte alignment
*/
static INLINE void *
@@ -405,4 +375,8 @@ extern void pipe_copy_rect(ubyte * dst, unsigned cpp, unsigned dst_pitch,
int src_pitch, unsigned src_x, int src_y);
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/gallium/include/pipe/p_winsys.h b/src/gallium/include/pipe/p_winsys.h
index 1e81eebd78..e784c92491 100644
--- a/src/gallium/include/pipe/p_winsys.h
+++ b/src/gallium/include/pipe/p_winsys.h
@@ -25,12 +25,6 @@
*
**************************************************************************/
-#ifndef P_WINSYS_H
-#define P_WINSYS_H
-
-
-#include "p_format.h"
-
/**
* \file
* This is the interface that Gallium3D requires any window system
@@ -38,6 +32,17 @@
* which is public.
*/
+#ifndef P_WINSYS_H
+#define P_WINSYS_H
+
+
+#include "p_format.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/** Opaque type */
struct pipe_fence_handle;
@@ -156,5 +161,8 @@ struct pipe_winsys
};
+#ifdef __cplusplus
+}
+#endif
#endif /* P_WINSYS_H */
diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
index 32215d8d58..635a68eea2 100644
--- a/src/gallium/winsys/SConscript
+++ b/src/gallium/winsys/SConscript
@@ -4,7 +4,8 @@ if dri:
SConscript([
'dri/SConscript',
])
-else:
+
+if 'xlib' in env['drivers'] and not dri:
SConscript([
'xlib/SConscript',
])
diff --git a/src/gallium/winsys/dri/intel/intel_batchbuffer.c b/src/gallium/winsys/dri/intel/intel_batchbuffer.c
index 49e04d81ec..5830b88b37 100644
--- a/src/gallium/winsys/dri/intel/intel_batchbuffer.c
+++ b/src/gallium/winsys/dri/intel/intel_batchbuffer.c
@@ -26,6 +26,7 @@
**************************************************************************/
#include <errno.h>
+#include <stdio.h>
#include "intel_batchbuffer.h"
#include "intel_context.h"
#include "intel_screen.h"
diff --git a/src/gallium/winsys/dri/intel/intel_batchbuffer.h b/src/gallium/winsys/dri/intel/intel_batchbuffer.h
index 82feafa21f..caf6870a3c 100644
--- a/src/gallium/winsys/dri/intel/intel_batchbuffer.h
+++ b/src/gallium/winsys/dri/intel/intel_batchbuffer.h
@@ -28,6 +28,7 @@
#ifndef INTEL_BATCHBUFFER_H
#define INTEL_BATCHBUFFER_H
+#include "pipe/p_debug.h"
#include "pipe/p_compiler.h"
#include "dri_bufmgr.h"
diff --git a/src/gallium/winsys/dri/intel/intel_context.c b/src/gallium/winsys/dri/intel/intel_context.c
index c033f2a592..79b320c6bf 100644
--- a/src/gallium/winsys/dri/intel/intel_context.c
+++ b/src/gallium/winsys/dri/intel/intel_context.c
@@ -188,7 +188,8 @@ intelCreateContext(const __GLcontextModes * visual,
/*
* Pipe-related setup
*/
- if (!getenv("INTEL_HW")) {
+ if (getenv("INTEL_SP")) {
+ /* use softpipe driver instead of hw */
pipe = intel_create_softpipe( intel, intelScreen->winsys );
}
else {
diff --git a/src/glu/descrip.mms b/src/glu/descrip.mms
deleted file mode 100644
index 6d5cd858da..0000000000
--- a/src/glu/descrip.mms
+++ /dev/null
@@ -1,9 +0,0 @@
-# Makefile for Mesa for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-
-all :
-# PIPE is avalailable on VMS7.0 and higher. For lower versions split the
-#command in two conditional command. JJ
- if f$search("SYS$SYSTEM:CXX$COMPILER.EXE") .nes. "" then pipe set default [.sgi] ; $(MMS)$(MMSQUALIFIERS)
- if f$search("SYS$SYSTEM:CXX$COMPILER.EXE") .eqs. "" then pipe set default [.mesa] ; $(MMS)$(MMSQUALIFIERS)
- set default [-]
diff --git a/src/glu/mesa/Makefile.DJ b/src/glu/mesa/Makefile.DJ
deleted file mode 100644
index 92bcdaae94..0000000000
--- a/src/glu/mesa/Makefile.DJ
+++ /dev/null
@@ -1,100 +0,0 @@
-# Mesa 3-D graphics library
-# Version: 4.0
-#
-# Copyright (C) 1999 Brian Paul All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# DOS/DJGPP glu makefile v1.5 for Mesa
-#
-# Copyright (C) 2002 - Daniel Borca
-# Email : dborca@users.sourceforge.net
-# Web : http://www.geocities.com/dborca
-
-
-#
-# Available options:
-#
-# Environment variables:
-# CFLAGS
-#
-# Targets:
-# all: build GLU
-# clean: remove object files
-#
-
-
-
-.PHONY: all clean
-
-TOP = ../../..
-LIBDIR = $(TOP)/lib
-GLU_LIB = libglu.a
-GLU_DXE = glu.dxe
-GLU_IMP = libiglu.a
-
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
-
-CC = gcc
-CFLAGS += -I$(TOP)/include
-
-AR = ar
-ARFLAGS = crus
-
-HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-CORE_SOURCES = \
- glu.c \
- mipmap.c \
- nurbs.c \
- nurbscrv.c \
- nurbssrf.c \
- nurbsutl.c \
- polytest.c \
- project.c \
- quadric.c \
- tess.c \
- tesselat.c
-
-SOURCES = $(CORE_SOURCES)
-
-OBJECTS = $(SOURCES:.c=.o)
-
-.c.o:
- $(CC) -o $@ $(CFLAGS) -c $<
-
-all: $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP)
-
-$(LIBDIR)/$(GLU_LIB): $(OBJECTS)
- $(AR) $(ARFLAGS) $@ $^
-
-$(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP): $(OBJECTS)
-ifeq ($(HAVEDXE3),)
- $(warning Missing DXE3 package... Skipping $(GLU_DXE))
-else
- -dxe3gen -o $(LIBDIR)/$(GLU_DXE) -Y $(LIBDIR)/$(GLU_IMP) -D "MesaGLU DJGPP" -E _glu -P gl.dxe -U $^
-endif
-
-clean:
- -$(call UNLINK,*.o)
diff --git a/src/glu/mesa/descrip.mms b/src/glu/mesa/descrip.mms
deleted file mode 100644
index 12eb6a437a..0000000000
--- a/src/glu/mesa/descrip.mms
+++ /dev/null
@@ -1,61 +0,0 @@
-# Makefile for GLU for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-
-.first
- define gl [-.include.gl]
-
-.include [-]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = $disk2:[-.include]
-LIBDIR = [-.lib]
-CFLAGS = /include=$(INCDIR)/define=(FBIND=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = glu.c mipmap.c nurbs.c nurbscrv.c nurbssrf.c nurbsutl.c \
- polytest.c project.c quadric.c tess.c tesselat.c
-
-OBJECTS =glu.obj,mipmap.obj,nurbs.obj,nurbscrv.obj,nurbssrf.obj,nurbsutl.obj,\
- polytest.obj,project.obj,quadric.obj,tess.obj,tesselat.obj
-
-
-##### RULES #####
-
-VERSION=MesaGlu V3.2
-
-##### TARGETS #####
-
-# Make the library:
-$(LIBDIR)$(GLU_LIB) : $(OBJECTS)
-.ifdef SHARE
- @ WRITE_ SYS$OUTPUT " generating mesagl1.opt"
- @ OPEN_/WRITE FILE mesagl1.opt
- @ WRITE_ FILE "!"
- @ WRITE_ FILE "! mesagl1.opt generated by DESCRIP.$(MMS_EXT)"
- @ WRITE_ FILE "!"
- @ WRITE_ FILE "IDENTIFICATION=""$(VERSION)"""
- @ WRITE_ FILE "GSMATCH=LEQUAL,3,2
- @ WRITE_ FILE "$(OBJECTS)"
- @ WRITE_ FILE "[-.lib]libmesagl.exe/SHARE"
- @ WRITE_ FILE "SYS$SHARE:DECW$XEXTLIBSHR/SHARE"
- @ WRITE_ FILE "SYS$SHARE:DECW$XLIBSHR/SHARE"
- @ CLOSE_ FILE
- @ WRITE_ SYS$OUTPUT " generating mesagl.map ..."
- @ LINK_/NODEB/NOSHARE/NOEXE/MAP=mesagl.map/FULL mesagl1.opt/OPT
- @ WRITE_ SYS$OUTPUT " analyzing mesagl.map ..."
- @ @[-.vms]ANALYZE_MAP.COM mesagl.map mesagl.opt
- @ WRITE_ SYS$OUTPUT " linking $(GLU_LIB) ..."
- @ LINK_/noinform/NODEB/SHARE=$(GLU_LIB)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesagl.opt/opt
-.else
- @ $(MAKELIB) $(GLU_LIB) $(OBJECTS)
-.endif
- @ rename $(GLU_LIB)* $(LIBDIR)
-
-clean :
- delete *.obj;*
- purge
-
-include mms_depend.
-
diff --git a/src/glu/mesa/mms_depend b/src/glu/mesa/mms_depend
deleted file mode 100644
index ed59ca9de8..0000000000
--- a/src/glu/mesa/mms_depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-glu.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h
-mipmap.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h
-nurbs.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h nurbs.h
-nurbscrv.obj : nurbs.h gluP.h [-.include.gl]gl.h [-.include.gl]glu.h
-nurbssrf.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h nurbs.h
-nurbsutl.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h nurbs.h
-project.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h
-quadric.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h
-tess.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h tess.h
-tess_fist.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h tess.h
-tess_hash.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h tess.h
-tess_heap.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h tess.h
-tess_clip.obj : gluP.h [-.include.gl]gl.h [-.include.gl]glu.h tess.h
diff --git a/src/glu/sgi/Makefile.DJ b/src/glu/sgi/Makefile.DJ
deleted file mode 100644
index b5df3e846a..0000000000
--- a/src/glu/sgi/Makefile.DJ
+++ /dev/null
@@ -1,188 +0,0 @@
-# Mesa 3-D graphics library
-# Version: 4.0
-#
-# Copyright (C) 1999 Brian Paul All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# DOS/DJGPP glu makefile v1.5 for Mesa
-#
-# Copyright (C) 2002 - Daniel Borca
-# Email : dborca@users.sourceforge.net
-# Web : http://www.geocities.com/dborca
-
-
-#
-# Available options:
-#
-# Environment variables:
-# CFLAGS
-#
-# Targets:
-# all: build GLU
-# clean: remove object files
-#
-
-
-
-.PHONY: all clean
-
-TOP = ../../..
-LIBDIR = $(TOP)/lib
-GLU_LIB = libglu.a
-GLU_DXE = glu.dxe
-GLU_IMP = libiglu.a
-
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
-
-CC = gcc
-CFLAGS += -DNDEBUG -DLIBRARYBUILD -I$(TOP)/include -Iinclude
-CXX = gpp
-CXXFLAGS = $(CFLAGS) -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
-
-AR = ar
-ARFLAGS = crus
-
-HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-C_SOURCES = \
- libutil/error.c \
- libutil/glue.c \
- libutil/mipmap.c \
- libutil/project.c \
- libutil/quad.c \
- libutil/registry.c \
- libtess/dict.c \
- libtess/geom.c \
- libtess/memalloc.c \
- libtess/mesh.c \
- libtess/normal.c \
- libtess/priorityq.c \
- libtess/render.c \
- libtess/sweep.c \
- libtess/tess.c \
- libtess/tessmono.c
-
-CC_SOURCES = \
- libnurbs/interface/bezierEval.cc \
- libnurbs/interface/bezierPatch.cc \
- libnurbs/interface/bezierPatchMesh.cc \
- libnurbs/interface/glcurveval.cc \
- libnurbs/interface/glinterface.cc \
- libnurbs/interface/glrenderer.cc \
- libnurbs/interface/glsurfeval.cc \
- libnurbs/interface/incurveeval.cc \
- libnurbs/interface/insurfeval.cc \
- libnurbs/internals/arc.cc \
- libnurbs/internals/arcsorter.cc \
- libnurbs/internals/arctess.cc \
- libnurbs/internals/backend.cc \
- libnurbs/internals/basiccrveval.cc \
- libnurbs/internals/basicsurfeval.cc \
- libnurbs/internals/bin.cc \
- libnurbs/internals/bufpool.cc \
- libnurbs/internals/cachingeval.cc \
- libnurbs/internals/ccw.cc \
- libnurbs/internals/coveandtiler.cc \
- libnurbs/internals/curve.cc \
- libnurbs/internals/curvelist.cc \
- libnurbs/internals/curvesub.cc \
- libnurbs/internals/dataTransform.cc \
- libnurbs/internals/displaylist.cc \
- libnurbs/internals/flist.cc \
- libnurbs/internals/flistsorter.cc \
- libnurbs/internals/hull.cc \
- libnurbs/internals/intersect.cc \
- libnurbs/internals/knotvector.cc \
- libnurbs/internals/mapdesc.cc \
- libnurbs/internals/mapdescv.cc \
- libnurbs/internals/maplist.cc \
- libnurbs/internals/mesher.cc \
- libnurbs/internals/monoTriangulationBackend.cc \
- libnurbs/internals/monotonizer.cc \
- libnurbs/internals/mycode.cc \
- libnurbs/internals/nurbsinterfac.cc \
- libnurbs/internals/nurbstess.cc \
- libnurbs/internals/patch.cc \
- libnurbs/internals/patchlist.cc \
- libnurbs/internals/quilt.cc \
- libnurbs/internals/reader.cc \
- libnurbs/internals/renderhints.cc \
- libnurbs/internals/slicer.cc \
- libnurbs/internals/sorter.cc \
- libnurbs/internals/splitarcs.cc \
- libnurbs/internals/subdivider.cc \
- libnurbs/internals/tobezier.cc \
- libnurbs/internals/trimline.cc \
- libnurbs/internals/trimregion.cc \
- libnurbs/internals/trimvertpool.cc \
- libnurbs/internals/uarray.cc \
- libnurbs/internals/varray.cc \
- libnurbs/nurbtess/directedLine.cc \
- libnurbs/nurbtess/gridWrap.cc \
- libnurbs/nurbtess/monoChain.cc \
- libnurbs/nurbtess/monoPolyPart.cc \
- libnurbs/nurbtess/monoTriangulation.cc \
- libnurbs/nurbtess/partitionX.cc \
- libnurbs/nurbtess/partitionY.cc \
- libnurbs/nurbtess/polyDBG.cc \
- libnurbs/nurbtess/polyUtil.cc \
- libnurbs/nurbtess/primitiveStream.cc \
- libnurbs/nurbtess/quicksort.cc \
- libnurbs/nurbtess/rectBlock.cc \
- libnurbs/nurbtess/sampleComp.cc \
- libnurbs/nurbtess/sampleCompBot.cc \
- libnurbs/nurbtess/sampleCompRight.cc \
- libnurbs/nurbtess/sampleCompTop.cc \
- libnurbs/nurbtess/sampleMonoPoly.cc \
- libnurbs/nurbtess/sampledLine.cc \
- libnurbs/nurbtess/searchTree.cc
-
-SOURCES = $(C_SOURCES) $(CC_SOURCES)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-.c.o:
- $(CC) -o $@ $(CFLAGS) -c $<
-.cc.o:
- $(CXX) -o $@ $(CXXFLAGS) -c $<
-
-all: $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP)
-
-$(LIBDIR)/$(GLU_LIB): $(OBJECTS)
- $(AR) $(ARFLAGS) $@ $^
-
-$(LIBDIR)/$(GLU_DXE) $(LIBDIR)/$(GLU_IMP): $(OBJECTS)
-ifeq ($(HAVEDXE3),)
- $(warning Missing DXE3 package... Skipping $(GLU_DXE))
-else
- -dxe3gen -o $(LIBDIR)/$(GLU_DXE) -Y $(LIBDIR)/$(GLU_IMP) -D "MesaGLU/SGI DJGPP" -E _glu -P gl.dxe -U $^
-endif
-
-clean:
- -$(call UNLINK,libutil/*.o)
- -$(call UNLINK,libtess/*.o)
- -$(call UNLINK,libnurbs/interface/*.o)
- -$(call UNLINK,libnurbs/internals/*.o)
- -$(call UNLINK,libnurbs/nurbtess/*.o)
diff --git a/src/glu/sgi/Makefile.mgw b/src/glu/sgi/Makefile.mgw
deleted file mode 100644
index 43b421e737..0000000000
--- a/src/glu/sgi/Makefile.mgw
+++ /dev/null
@@ -1,229 +0,0 @@
-# Mesa 3-D graphics library
-# Version: 5.1
-#
-# Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# MinGW core makefile v1.4 for Mesa
-#
-# Copyright (C) 2002 - Daniel Borca
-# Email : dborca@users.sourceforge.net
-# Web : http://www.geocities.com/dborca
-
-# MinGW core-glu makefile updated for Mesa 7.0
-#
-# Updated : by Heromyth, on 2007-7-21
-# Email : zxpmyth@yahoo.com.cn
-# Bugs : 1) All the default settings work fine. But the setting X86=1 can't work.
-# The others havn't been tested yet.
-# 2) The generated DLLs are *not* compatible with the ones built
-# with the other compilers like VC8, especially for GLUT.
-# 3) Although more tests are needed, it can be used individually!
-
-#
-# Available options:
-#
-# Environment variables:
-# CFLAGS
-#
-# GLIDE path to Glide3 SDK; used with FX.
-# default = $(TOP)/glide3
-# FX=1 build for 3dfx Glide3. Note that this disables
-# compilation of most WMesa code and requires fxMesa.
-# As a consequence, you'll need the Win32 Glide3
-# library to build any application.
-# default = no
-# ICD=1 build the installable client driver interface
-# (windows opengl driver interface)
-# default = no
-# X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow).
-# default = no
-#
-# Targets:
-# all: build GL
-# clean: remove object files
-#
-
-
-
-.PHONY: all clean
-.INTERMEDIATE: x86/gen_matypes.exe
-.SUFFIXES: .rc .res
-
-# Set this to the prefix of your build tools, i.e. mingw32-
-TOOLS_PREFIX = mingw32-
-
-TOP = ../../..
-
-LIBDIR = $(TOP)/lib
-
-GLU_DLL = glu32.dll
-GLU_IMP = libglu32.a
-GLU_DEF = glu.def
-
-include $(TOP)/configs/config.mgw
-GL_USING_STDCALL ?= 1
-
-LDLIBS = -L$(LIBDIR) -lopengl32
-LDFLAGS = -Wl,--out-implib=$(LIBDIR)/$(GLU_IMP) -Wl,--output-def=$(LIBDIR)/$(GLU_DEF)
-
-CFLAGS += -DBUILD_GLU32 -D_DLL
-
-ifeq ($(GL_USING_STDCALL),1)
- LDFLAGS += -Wl,--add-stdcall-alias
-else
- CFLAGS += -DGL_NO_STDCALL
-endif
-
-CC = gcc
-CFLAGS += -DNDEBUG -DLIBRARYBUILD -I$(TOP)/include -Iinclude
-CXX = g++
-CXXFLAGS = $(CFLAGS) -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
-
-AR = ar
-ARFLAGS = crus
-
-UNLINK = del $(subst /,\,$(1))
-ifneq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-ifneq ($(wildcard $(addsuffix /rm,$(subst :, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-
-C_SOURCES = \
- libutil/error.c \
- libutil/glue.c \
- libutil/mipmap.c \
- libutil/project.c \
- libutil/quad.c \
- libutil/registry.c \
- libtess/dict.c \
- libtess/geom.c \
- libtess/memalloc.c \
- libtess/mesh.c \
- libtess/normal.c \
- libtess/priorityq.c \
- libtess/render.c \
- libtess/sweep.c \
- libtess/tess.c \
- libtess/tessmono.c
-
-CC_SOURCES = \
- libnurbs/interface/bezierEval.cc \
- libnurbs/interface/bezierPatch.cc \
- libnurbs/interface/bezierPatchMesh.cc \
- libnurbs/interface/glcurveval.cc \
- libnurbs/interface/glinterface.cc \
- libnurbs/interface/glrenderer.cc \
- libnurbs/interface/glsurfeval.cc \
- libnurbs/interface/incurveeval.cc \
- libnurbs/interface/insurfeval.cc \
- libnurbs/internals/arc.cc \
- libnurbs/internals/arcsorter.cc \
- libnurbs/internals/arctess.cc \
- libnurbs/internals/backend.cc \
- libnurbs/internals/basiccrveval.cc \
- libnurbs/internals/basicsurfeval.cc \
- libnurbs/internals/bin.cc \
- libnurbs/internals/bufpool.cc \
- libnurbs/internals/cachingeval.cc \
- libnurbs/internals/ccw.cc \
- libnurbs/internals/coveandtiler.cc \
- libnurbs/internals/curve.cc \
- libnurbs/internals/curvelist.cc \
- libnurbs/internals/curvesub.cc \
- libnurbs/internals/dataTransform.cc \
- libnurbs/internals/displaylist.cc \
- libnurbs/internals/flist.cc \
- libnurbs/internals/flistsorter.cc \
- libnurbs/internals/hull.cc \
- libnurbs/internals/intersect.cc \
- libnurbs/internals/knotvector.cc \
- libnurbs/internals/mapdesc.cc \
- libnurbs/internals/mapdescv.cc \
- libnurbs/internals/maplist.cc \
- libnurbs/internals/mesher.cc \
- libnurbs/internals/monoTriangulationBackend.cc \
- libnurbs/internals/monotonizer.cc \
- libnurbs/internals/mycode.cc \
- libnurbs/internals/nurbsinterfac.cc \
- libnurbs/internals/nurbstess.cc \
- libnurbs/internals/patch.cc \
- libnurbs/internals/patchlist.cc \
- libnurbs/internals/quilt.cc \
- libnurbs/internals/reader.cc \
- libnurbs/internals/renderhints.cc \
- libnurbs/internals/slicer.cc \
- libnurbs/internals/sorter.cc \
- libnurbs/internals/splitarcs.cc \
- libnurbs/internals/subdivider.cc \
- libnurbs/internals/tobezier.cc \
- libnurbs/internals/trimline.cc \
- libnurbs/internals/trimregion.cc \
- libnurbs/internals/trimvertpool.cc \
- libnurbs/internals/uarray.cc \
- libnurbs/internals/varray.cc \
- libnurbs/nurbtess/directedLine.cc \
- libnurbs/nurbtess/gridWrap.cc \
- libnurbs/nurbtess/monoChain.cc \
- libnurbs/nurbtess/monoPolyPart.cc \
- libnurbs/nurbtess/monoTriangulation.cc \
- libnurbs/nurbtess/partitionX.cc \
- libnurbs/nurbtess/partitionY.cc \
- libnurbs/nurbtess/polyDBG.cc \
- libnurbs/nurbtess/polyUtil.cc \
- libnurbs/nurbtess/primitiveStream.cc \
- libnurbs/nurbtess/quicksort.cc \
- libnurbs/nurbtess/rectBlock.cc \
- libnurbs/nurbtess/sampleComp.cc \
- libnurbs/nurbtess/sampleCompBot.cc \
- libnurbs/nurbtess/sampleCompRight.cc \
- libnurbs/nurbtess/sampleCompTop.cc \
- libnurbs/nurbtess/sampleMonoPoly.cc \
- libnurbs/nurbtess/sampledLine.cc \
- libnurbs/nurbtess/searchTree.cc
-
-SOURCES = $(C_SOURCES) $(CC_SOURCES)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-.c.o:
- $(CC) -o $@ $(CFLAGS) -c $<
-.cc.o:
- $(CXX) -o $@ $(CXXFLAGS) -c $<
-
-
-all: $(LIBDIR) $(LIBDIR)/$(GLU_DLL) $(LIBDIR)/$(GLU_IMP)
-
-$(LIBDIR):
- mkdir -p $(LIBDIR)
-
-$(LIBDIR)/$(GLU_DLL) $(LIBDIR)/$(GLU_IMP): $(OBJECTS)
- g++ -shared -fPIC -o $(LIBDIR)/$(GLU_DLL) $(LDFLAGS) \
- $^ $(LDLIBS)
-
-
-
-clean:
- -$(call UNLINK,libutil/*.o)
- -$(call UNLINK,libtess/*.o)
- -$(call UNLINK,libnurbs/interface/*.o)
- -$(call UNLINK,libnurbs/internals/*.o)
- -$(call UNLINK,libnurbs/nurbtess/*.o)
diff --git a/src/glu/sgi/descrip.mms b/src/glu/sgi/descrip.mms
deleted file mode 100644
index 49d618e6c9..0000000000
--- a/src/glu/sgi/descrip.mms
+++ /dev/null
@@ -1,451 +0,0 @@
-# Makefile for GLU for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-
-.first
- define gl [---.include.gl]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR =([-.include],[.include],[.internals],[.libnurbs.internals],\
- [.libnurbs.interface],[.libnurbs.nurbtess])
-LIBDIR = [---.lib]
-CFLAGS = /include=$(INCDIR)/name=(as_is,short)/float=ieee/ieee=denorm
-
-LU_OBJECTS=\
- [.libutil]error.obj, \
- [.libutil]glue.obj, \
- [.libutil]mipmap.obj,\
- [.libutil]project.obj,\
- [.libutil]quad.obj, \
- [.libutil]registry.obj
-
-LT_OBJECTS=[.libtess]dict.obj, \
- [.libtess]geom.obj, \
- [.libtess]memalloc.obj,\
- [.libtess]mesh.obj, \
- [.libtess]normal.obj,\
- [.libtess]priorityq.obj,\
- [.libtess]render.obj,\
- [.libtess]sweep.obj, \
- [.libtess]tess.obj, \
- [.libtess]tessmono.obj
-
-LI_OBJECTS=[.libnurbs.interface]bezierEval.obj, \
- [.libnurbs.interface]bezierPatch.obj, \
- [.libnurbs.interface]bezierPatchMesh.obj, \
- [.libnurbs.interface]glcurveval.obj, \
- [.libnurbs.interface]glinterface.obj
-
-LI_OBJECTS1=[.libnurbs.interface]glrenderer.obj, \
- [.libnurbs.interface]glsurfeval.obj, \
- [.libnurbs.interface]incurveeval.obj, \
- [.libnurbs.interface]insurfeval.obj
-
-LI2_OBJECTS=[.libnurbs.internals]arc.obj, \
- [.libnurbs.internals]arcsorter.obj, \
- [.libnurbs.internals]arctess.obj, \
- [.libnurbs.internals]backend.obj, \
- [.libnurbs.internals]basiccrveval.obj, \
- [.libnurbs.internals]basicsurfeval.obj
-
-LI2_OBJECTS1=[.libnurbs.internals]bin.obj, \
- [.libnurbs.internals]bufpool.obj, \
- [.libnurbs.internals]cachingeval.obj, \
- [.libnurbs.internals]ccw.obj, \
- [.libnurbs.internals]coveandtiler.obj, \
- [.libnurbs.internals]curve.obj, \
- [.libnurbs.internals]curvelist.obj
-
-LI2_OBJECTS2=[.libnurbs.internals]curvesub.obj, \
- [.libnurbs.internals]dataTransform.obj, \
- [.libnurbs.internals]displaylist.obj, \
- [.libnurbs.internals]flist.obj, \
- [.libnurbs.internals]flistsorter.obj
-
-LI2_OBJECTS3=[.libnurbs.internals]hull.obj, \
- [.libnurbs.internals]intersect.obj, \
- [.libnurbs.internals]knotvector.obj, \
- [.libnurbs.internals]mapdesc.obj
-
-LI2_OBJECTS4=[.libnurbs.internals]mapdescv.obj, \
- [.libnurbs.internals]maplist.obj, \
- [.libnurbs.internals]mesher.obj, \
- [.libnurbs.internals]monoTriangulationBackend.obj,\
- [.libnurbs.internals]monotonizer.obj
-
-LI2_OBJECTS5=[.libnurbs.internals]mycode.obj, \
- [.libnurbs.internals]nurbsinterfac.obj, \
- [.libnurbs.internals]nurbstess.obj, \
- [.libnurbs.internals]patch.obj
-
-LI2_OBJECTS6=[.libnurbs.internals]patchlist.obj, \
- [.libnurbs.internals]quilt.obj, \
- [.libnurbs.internals]reader.obj, \
- [.libnurbs.internals]renderhints.obj, \
- [.libnurbs.internals]slicer.obj
-
-LI2_OBJECTS7=[.libnurbs.internals]sorter.obj, \
- [.libnurbs.internals]splitarcs.obj, \
- [.libnurbs.internals]subdivider.obj, \
- [.libnurbs.internals]tobezier.obj
-
-LI2_OBJECTS8=[.libnurbs.internals]trimline.obj, \
- [.libnurbs.internals]trimregion.obj, \
- [.libnurbs.internals]trimvertpool.obj, \
- [.libnurbs.internals]uarray.obj, \
- [.libnurbs.internals]varray.obj
-
-LN_OBJECTS=[.libnurbs.nurbtess]directedLine.obj, \
- [.libnurbs.nurbtess]gridWrap.obj, \
- [.libnurbs.nurbtess]monoChain.obj, \
- [.libnurbs.nurbtess]monoPolyPart.obj, \
- [.libnurbs.nurbtess]monoTriangulation.obj
-
-LN_OBJECTS1=[.libnurbs.nurbtess]partitionX.obj, \
- [.libnurbs.nurbtess]partitionY.obj, \
- [.libnurbs.nurbtess]polyDBG.obj
-
-LN_OBJECTS2=[.libnurbs.nurbtess]polyUtil.obj, \
- [.libnurbs.nurbtess]primitiveStream.obj, \
- [.libnurbs.nurbtess]quicksort.obj, \
- [.libnurbs.nurbtess]rectBlock.obj
-
-LN_OBJECTS3=[.libnurbs.nurbtess]sampleComp.obj, \
- [.libnurbs.nurbtess]sampleCompBot.obj, \
- [.libnurbs.nurbtess]sampleCompRight.obj
-
-LN_OBJECTS4=[.libnurbs.nurbtess]sampleCompTop.obj, \
- [.libnurbs.nurbtess]sampleMonoPoly.obj,\
- [.libnurbs.nurbtess]sampledLine.obj, \
- [.libnurbs.nurbtess]searchTree.obj
-
-##### RULES #####
-
-VERSION=MesaGlu V3.5
-
-##### TARGETS #####
-
-# Make the library:
-$(LIBDIR)$(GLU_LIB) : $(LU_OBJECTS) $(LT_OBJECTS) $(LI_OBJECTS) $(LI_OBJECTS1)\
- $(LI2_OBJECTS) $(LI2_OBJECTS1) $(LI2_OBJECTS2)\
- $(LI2_OBJECTS3) $(LI2_OBJECTS4) $(LI2_OBJECTS5)\
- $(LI2_OBJECTS6) $(LI2_OBJECTS7) $(LI2_OBJECTS8)\
- $(LN_OBJECTS) $(LN_OBJECTS1) $(LN_OBJECTS2)\
- $(LN_OBJECTS3) $(LN_OBJECTS4)
- @ $(MAKELIB) $(GLU_LIB) $(LU_OBJECTS),$(LT_OBJECTS),$(LI_OBJECTS),\
- $(LI2_OBJECTS),$(LN_OBJECTS)
- @ rename $(GLU_LIB)* $(LIBDIR)
-.ifdef SHARE
- @ WRITE_ SYS$OUTPUT " generating mesagl1.opt"
- @ OPEN_/WRITE FILE mesagl1.opt
- @ WRITE_ FILE "!"
- @ WRITE_ FILE "! mesagl1.opt generated by DESCRIP.$(MMS_EXT)"
- @ WRITE_ FILE "!"
- @ WRITE_ FILE "IDENTIFICATION=""$(VERSION)"""
- @ WRITE_ FILE "GSMATCH=LEQUAL,3,5
- @ WRITE_ FILE "$(LU_OBJECTS)"
- @ WRITE_ FILE "$(LT_OBJECTS)"
- @ WRITE_ FILE "$(LI_OBJECTS)"
- @ WRITE_ FILE "$(LI_OBJECTS1)"
- @ WRITE_ FILE "$(LI2_OBJECTS)"
- @ WRITE_ FILE "$(LI2_OBJECTS1)"
- @ WRITE_ FILE "$(LI2_OBJECTS2)"
- @ WRITE_ FILE "$(LI2_OBJECTS3)"
- @ WRITE_ FILE "$(LI2_OBJECTS4)"
- @ WRITE_ FILE "$(LI2_OBJECTS5)"
- @ WRITE_ FILE "$(LI2_OBJECTS6)"
- @ WRITE_ FILE "$(LI2_OBJECTS7)"
- @ WRITE_ FILE "$(LI2_OBJECTS8)"
- @ WRITE_ FILE "$(LN_OBJECTS)"
- @ WRITE_ FILE "$(LN_OBJECTS1)"
- @ WRITE_ FILE "$(LN_OBJECTS2)"
- @ WRITE_ FILE "$(LN_OBJECTS3)"
- @ WRITE_ FILE "$(LN_OBJECTS4)"
- @ WRITE_ FILE "[---.lib]libmesagl.exe/SHARE"
- @ WRITE_ FILE "SYS$SHARE:DECW$XEXTLIBSHR/SHARE"
- @ WRITE_ FILE "SYS$SHARE:DECW$XLIBSHR/SHARE"
- @ CLOSE_ FILE
-# @ WRITE_ SYS$OUTPUT " generating mesagl.map ..."
-# @ CXXLINK_/NODEB/NOSHARE/NOEXE/MAP=mesagl.map/FULL mesagl1.opt/OPT
-# @ WRITE_ SYS$OUTPUT " analyzing mesagl.map ..."
-# @ @[-.vms]ANALYZE_MAP.COM mesagl.map mesagl.opt
- @ WRITE_ SYS$OUTPUT " linking $(GLU_SHAR) ..."
-# @ CXXLINK_/noinform/NODEB/SHARE=$(GLU_SHAR)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesagl.opt/opt
- @ CXXLINK_/noinform/NODEB/SHARE=$(GLU_SHAR)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesaglu.opt/opt
- @ rename $(GLU_SHAR)* $(LIBDIR)
-.endif
-
-clean :
- delete [...]*.obj;*
- purge
-
-[.libutil]error.obj : [.libutil]error.c
- $(CC) $(CFLAGS) /obj=[.libutil]error.obj [.libutil]error.c
-
-[.libutil]glue.obj : [.libutil]glue.c
- $(CC) $(CFLAGS) /obj=[.libutil]glue.obj [.libutil]glue.c
-
-[.libutil]mipmap.obj : [.libutil]mipmap.c
- $(CC) $(CFLAGS) /obj=[.libutil]mipmap.obj [.libutil]mipmap.c
-
-[.libutil]project.obj : [.libutil]project.c
- $(CC) $(CFLAGS) /obj=[.libutil]project.obj [.libutil]project.c
-
-[.libutil]quad.obj : [.libutil]quad.c
- $(CC) $(CFLAGS) /obj=[.libutil]quad.obj [.libutil]quad.c
-
-[.libutil]registry.obj : [.libutil]registry.c
- $(CC) $(CFLAGS) /obj=[.libutil]registry.obj [.libutil]registry.c
-
-[.libtess]dict.obj : [.libtess]dict.c
- $(CC) $(CFLAGS) /obj=[.libtess]dict.obj [.libtess]dict.c
-
-[.libtess]geom.obj : [.libtess]geom.c
- $(CC) $(CFLAGS) /obj=[.libtess]geom.obj [.libtess]geom.c
-
-[.libtess]memalloc.obj : [.libtess]memalloc.c
- $(CC) $(CFLAGS) /obj=[.libtess]memalloc.obj [.libtess]memalloc.c
-
-[.libtess]mesh.obj : [.libtess]mesh.c
- $(CC) $(CFLAGS) /obj=[.libtess]mesh.obj [.libtess]mesh.c
-
-[.libtess]normal.obj : [.libtess]normal.c
- $(CC) $(CFLAGS) /obj=[.libtess]normal.obj [.libtess]normal.c
-
-[.libtess]priorityq.obj : [.libtess]priorityq.c
- $(CC) $(CFLAGS) /obj=[.libtess]priorityq.obj [.libtess]priorityq.c
-
-[.libtess]render.obj : [.libtess]render.c
- $(CC) $(CFLAGS) /obj=[.libtess]render.obj [.libtess]render.c
-
-[.libtess]sweep.obj : [.libtess]sweep.c
- $(CC) $(CFLAGS) /obj=[.libtess]sweep.obj [.libtess]sweep.c
-
-[.libtess]tess.obj : [.libtess]tess.c
- $(CC) $(CFLAGS) /obj=[.libtess]tess.obj [.libtess]tess.c
-
-[.libtess]tessmono.obj : [.libtess]tessmono.c
- $(CC) $(CFLAGS) /obj=[.libtess]tessmono.obj [.libtess]tessmono.c
-
-[.libnurbs.interface]bezierEval.obj : [.libnurbs.interface]bezierEval.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.interface]bezierEval.obj [.libnurbs.interface]bezierEval.cc
-
-[.libnurbs.interface]bezierPatch.obj : [.libnurbs.interface]bezierPatch.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.interface]bezierPatch.obj [.libnurbs.interface]bezierPatch.cc
-
-[.libnurbs.interface]bezierPatchMesh.obj : [.libnurbs.interface]bezierPatchMesh.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.interface]bezierPatchMesh.obj [.libnurbs.interface]bezierPatchMesh.cc
-
-[.libnurbs.interface]glcurveval.obj : [.libnurbs.interface]glcurveval.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.interface]glcurveval.obj [.libnurbs.interface]glcurveval.cc
-
-[.libnurbs.interface]glinterface.obj : [.libnurbs.interface]glinterface.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.interface]glinterface.obj [.libnurbs.interface]glinterface.cc
-
-[.libnurbs.interface]glrenderer.obj : [.libnurbs.interface]glrenderer.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.interface]glrenderer.obj [.libnurbs.interface]glrenderer.cc
-
-[.libnurbs.interface]glsurfeval.obj : [.libnurbs.interface]glsurfeval.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.interface]glsurfeval.obj [.libnurbs.interface]glsurfeval.cc
-
-[.libnurbs.interface]incurveeval.obj : [.libnurbs.interface]incurveeval.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.interface]incurveeval.obj [.libnurbs.interface]incurveeval.cc
-
-[.libnurbs.interface]insurfeval.obj : [.libnurbs.interface]insurfeval.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.interface]insurfeval.obj [.libnurbs.interface]insurfeval.cc
-
-[.libnurbs.internals]arc.obj : [.libnurbs.internals]arc.cc
- $(CXX) $(CFLAGS)/list/show=all /obj=[.libnurbs.internals]arc.obj [.libnurbs.internals]arc.cc
-
-[.libnurbs.internals]arcsorter.obj : [.libnurbs.internals]arcsorter.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]arcsorter.obj [.libnurbs.internals]arcsorter.cc
-
-[.libnurbs.internals]arctess.obj : [.libnurbs.internals]arctess.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]arctess.obj [.libnurbs.internals]arctess.cc
-
-[.libnurbs.internals]backend.obj : [.libnurbs.internals]backend.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]backend.obj [.libnurbs.internals]backend.cc
-
-[.libnurbs.internals]basiccrveval.obj : [.libnurbs.internals]basiccrveval.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]basiccrveval.obj [.libnurbs.internals]basiccrveval.cc
-
-[.libnurbs.internals]basicsurfeval.obj : [.libnurbs.internals]basicsurfeval.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]basicsurfeval.obj [.libnurbs.internals]basicsurfeval.cc
-
-[.libnurbs.internals]bin.obj : [.libnurbs.internals]bin.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]bin.obj [.libnurbs.internals]bin.cc
-
-[.libnurbs.internals]bufpool.obj : [.libnurbs.internals]bufpool.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]bufpool.obj [.libnurbs.internals]bufpool.cc
-
-[.libnurbs.internals]cachingeval.obj : [.libnurbs.internals]cachingeval.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]cachingeval.obj [.libnurbs.internals]cachingeval.cc
-
-[.libnurbs.internals]ccw.obj : [.libnurbs.internals]ccw.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]ccw.obj [.libnurbs.internals]ccw.cc
-
-[.libnurbs.internals]coveandtiler.obj : [.libnurbs.internals]coveandtiler.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]coveandtiler.obj [.libnurbs.internals]coveandtiler.cc
-
-[.libnurbs.internals]curve.obj : [.libnurbs.internals]curve.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]curve.obj [.libnurbs.internals]curve.cc
-
-[.libnurbs.internals]curvelist.obj : [.libnurbs.internals]curvelist.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]curvelist.obj [.libnurbs.internals]curvelist.cc
-
-[.libnurbs.internals]curvesub.obj : [.libnurbs.internals]curvesub.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]curvesub.obj [.libnurbs.internals]curvesub.cc
-
-[.libnurbs.internals]dataTransform.obj : [.libnurbs.internals]dataTransform.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]dataTransform.obj [.libnurbs.internals]dataTransform.cc
-
-[.libnurbs.internals]displaylist.obj : [.libnurbs.internals]displaylist.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]displaylist.obj [.libnurbs.internals]displaylist.cc
-
-[.libnurbs.internals]flist.obj : [.libnurbs.internals]flist.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]flist.obj [.libnurbs.internals]flist.cc
-
-[.libnurbs.internals]flistsorter.obj : [.libnurbs.internals]flistsorter.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]flistsorter.obj [.libnurbs.internals]flistsorter.cc
-
-[.libnurbs.internals]hull.obj : [.libnurbs.internals]hull.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]hull.obj [.libnurbs.internals]hull.cc
-
-[.libnurbs.internals]intersect.obj : [.libnurbs.internals]intersect.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]intersect.obj [.libnurbs.internals]intersect.cc
-
-[.libnurbs.internals]knotvector.obj : [.libnurbs.internals]knotvector.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]knotvector.obj [.libnurbs.internals]knotvector.cc
-
-[.libnurbs.internals]mapdesc.obj : [.libnurbs.internals]mapdesc.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]mapdesc.obj [.libnurbs.internals]mapdesc.cc
-
-[.libnurbs.internals]mapdescv.obj : [.libnurbs.internals]mapdescv.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]mapdescv.obj [.libnurbs.internals]mapdescv.cc
-
-[.libnurbs.internals]maplist.obj : [.libnurbs.internals]maplist.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]maplist.obj [.libnurbs.internals]maplist.cc
-
-[.libnurbs.internals]mesher.obj : [.libnurbs.internals]mesher.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]mesher.obj [.libnurbs.internals]mesher.cc
-
-[.libnurbs.internals]monoTriangulationBackend.obj : [.libnurbs.internals]monoTriangulationBackend.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]monoTriangulationBackend.obj [.libnurbs.internals]monoTriangulationBackend.cc
-
-[.libnurbs.internals]monotonizer.obj : [.libnurbs.internals]monotonizer.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]monotonizer.obj [.libnurbs.internals]monotonizer.cc
-
-[.libnurbs.internals]mycode.obj : [.libnurbs.internals]mycode.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]mycode.obj [.libnurbs.internals]mycode.cc
-
-[.libnurbs.internals]nurbsinterfac.obj : [.libnurbs.internals]nurbsinterfac.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]nurbsinterfac.obj [.libnurbs.internals]nurbsinterfac.cc
-
-[.libnurbs.internals]nurbstess.obj : [.libnurbs.internals]nurbstess.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]nurbstess.obj [.libnurbs.internals]nurbstess.cc
-
-[.libnurbs.internals]patch.obj : [.libnurbs.internals]patch.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]patch.obj [.libnurbs.internals]patch.cc
-
-[.libnurbs.internals]patchlist.obj : [.libnurbs.internals]patchlist.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]patchlist.obj [.libnurbs.internals]patchlist.cc
-
-[.libnurbs.internals]quilt.obj : [.libnurbs.internals]quilt.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]quilt.obj [.libnurbs.internals]quilt.cc
-
-[.libnurbs.internals]reader.obj : [.libnurbs.internals]reader.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]reader.obj [.libnurbs.internals]reader.cc
-
-[.libnurbs.internals]renderhints.obj : [.libnurbs.internals]renderhints.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]renderhints.obj [.libnurbs.internals]renderhints.cc
-
-[.libnurbs.internals]slicer.obj : [.libnurbs.internals]slicer.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]slicer.obj [.libnurbs.internals]slicer.cc
-
-[.libnurbs.internals]sorter.obj : [.libnurbs.internals]sorter.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]sorter.obj [.libnurbs.internals]sorter.cc
-
-[.libnurbs.internals]splitarcs.obj : [.libnurbs.internals]splitarcs.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]splitarcs.obj [.libnurbs.internals]splitarcs.cc
-
-[.libnurbs.internals]subdivider.obj : [.libnurbs.internals]subdivider.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]subdivider.obj [.libnurbs.internals]subdivider.cc
-
-[.libnurbs.internals]tobezier.obj : [.libnurbs.internals]tobezier.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]tobezier.obj [.libnurbs.internals]tobezier.cc
-
-[.libnurbs.internals]trimline.obj : [.libnurbs.internals]trimline.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]trimline.obj [.libnurbs.internals]trimline.cc
-
-[.libnurbs.internals]trimregion.obj : [.libnurbs.internals]trimregion.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]trimregion.obj [.libnurbs.internals]trimregion.cc
-
-[.libnurbs.internals]trimvertpool.obj : [.libnurbs.internals]trimvertpool.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]trimvertpool.obj [.libnurbs.internals]trimvertpool.cc
-
-[.libnurbs.internals]uarray.obj : [.libnurbs.internals]uarray.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]uarray.obj [.libnurbs.internals]uarray.cc
-
-[.libnurbs.internals]varray.obj : [.libnurbs.internals]varray.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.internals]varray.obj [.libnurbs.internals]varray.cc
-
-[.libnurbs.nurbtess]directedLine.obj : [.libnurbs.nurbtess]directedLine.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]directedLine.obj [.libnurbs.nurbtess]directedLine.cc
-
-[.libnurbs.nurbtess]gridWrap.obj : [.libnurbs.nurbtess]gridWrap.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]gridWrap.obj [.libnurbs.nurbtess]gridWrap.cc
-
-[.libnurbs.nurbtess]monoChain.obj : [.libnurbs.nurbtess]monoChain.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]monoChain.obj [.libnurbs.nurbtess]monoChain.cc
-
-[.libnurbs.nurbtess]monoPolyPart.obj : [.libnurbs.nurbtess]monoPolyPart.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]monoPolyPart.obj [.libnurbs.nurbtess]monoPolyPart.cc
-
-[.libnurbs.nurbtess]monoTriangulation.obj : [.libnurbs.nurbtess]monoTriangulation.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]monoTriangulation.obj [.libnurbs.nurbtess]monoTriangulation.cc
-
-[.libnurbs.nurbtess]partitionX.obj : [.libnurbs.nurbtess]partitionX.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]partitionX.obj [.libnurbs.nurbtess]partitionX.cc
-
-[.libnurbs.nurbtess]partitionY.obj : [.libnurbs.nurbtess]partitionY.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]partitionY.obj [.libnurbs.nurbtess]partitionY.cc
-
-[.libnurbs.nurbtess]polyDBG.obj : [.libnurbs.nurbtess]polyDBG.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]polyDBG.obj [.libnurbs.nurbtess]polyDBG.cc
-
-[.libnurbs.nurbtess]polyUtil.obj : [.libnurbs.nurbtess]polyUtil.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]polyUtil.obj [.libnurbs.nurbtess]polyUtil.cc
-
-[.libnurbs.nurbtess]primitiveStream.obj : [.libnurbs.nurbtess]primitiveStream.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]primitiveStream.obj [.libnurbs.nurbtess]primitiveStream.cc
-
-[.libnurbs.nurbtess]quicksort.obj : [.libnurbs.nurbtess]quicksort.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]quicksort.obj [.libnurbs.nurbtess]quicksort.cc
-
-[.libnurbs.nurbtess]rectBlock.obj : [.libnurbs.nurbtess]rectBlock.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]rectBlock.obj [.libnurbs.nurbtess]rectBlock.cc
-
-[.libnurbs.nurbtess]sampleComp.obj : [.libnurbs.nurbtess]sampleComp.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]sampleComp.obj [.libnurbs.nurbtess]sampleComp.cc
-
-[.libnurbs.nurbtess]sampleCompBot.obj : [.libnurbs.nurbtess]sampleCompBot.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]sampleCompBot.obj [.libnurbs.nurbtess]sampleCompBot.cc
-
-[.libnurbs.nurbtess]sampleCompRight.obj : [.libnurbs.nurbtess]sampleCompRight.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]sampleCompRight.obj [.libnurbs.nurbtess]sampleCompRight.cc
-
-[.libnurbs.nurbtess]sampleCompTop.obj : [.libnurbs.nurbtess]sampleCompTop.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]sampleCompTop.obj [.libnurbs.nurbtess]sampleCompTop.cc
-
-[.libnurbs.nurbtess]sampleMonoPoly.obj : [.libnurbs.nurbtess]sampleMonoPoly.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]sampleMonoPoly.obj [.libnurbs.nurbtess]sampleMonoPoly.cc
-
-[.libnurbs.nurbtess]sampledLine.obj : [.libnurbs.nurbtess]sampledLine.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]sampledLine.obj [.libnurbs.nurbtess]sampledLine.cc
-
-[.libnurbs.nurbtess]searchTree.obj : [.libnurbs.nurbtess]searchTree.cc
- $(CXX) $(CFLAGS) /obj=[.libnurbs.nurbtess]searchTree.obj [.libnurbs.nurbtess]searchTree.cc
diff --git a/src/glut/dos/Makefile.DJ b/src/glut/dos/Makefile.DJ
deleted file mode 100644
index 7e4e0b8576..0000000000
--- a/src/glut/dos/Makefile.DJ
+++ /dev/null
@@ -1,126 +0,0 @@
-# DOS/DJGPP Mesa Utility Toolkit
-# Version: 1.0
-#
-# Copyright (C) 2005 Daniel Borca All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# DANIEL BORCA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-#
-# Available options:
-#
-# Environment variables:
-# CFLAGS
-#
-# GLIDE path to Glide3 SDK; used to resolve DXEs.
-# default = $(TOP)/glide3
-#
-# Targets:
-# all: build GLUT
-# clean: remove object files
-#
-
-
-
-.PHONY: all clean
-
-TOP = ../../..
-GLIDE ?= $(TOP)/glide3
-LIBDIR = $(TOP)/lib
-GLUT_LIB = libglut.a
-GLUT_DXE = glut.dxe
-GLUT_IMP = libiglut.a
-
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
-
-CC = gcc
-CFLAGS += -I$(TOP)/include -I. -IPC_HW
-CFLAGS += -DGLUT_IMPORT_LIB
-
-AR = ar
-ARFLAGS = crus
-
-HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-CORE_SOURCES = \
- loop.c \
- callback.c \
- color.c \
- extens.c \
- init.c \
- menu.c \
- mouse.c \
- overlay.c \
- state.c \
- util.c \
- window.c \
- f8x13.c \
- f9x15.c \
- hel10.c \
- hel12.c \
- hel18.c \
- tr10.c \
- tr24.c \
- mroman.c \
- roman.c \
- bitmap.c \
- stroke.c \
- teapot.c \
- shapes.c
-
-PC_HW_SOURCES = \
- PC_HW/pc_hw.c \
- PC_HW/pc_keyb.c \
- PC_HW/pc_mouse.c \
- PC_HW/pc_timer.c \
- PC_HW/pc_irq.S
-
-SOURCES = $(CORE_SOURCES) $(PC_HW_SOURCES)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-.c.o:
- $(CC) -o $@ $(CFLAGS) -c $<
-.S.o:
- $(CC) -o $@ $(CFLAGS) -c $<
-.s.o:
- $(CC) -o $@ $(CFLAGS) -x assembler-with-cpp -c $<
-
-all: $(LIBDIR)/$(GLUT_LIB) $(LIBDIR)/$(GLUT_DXE) $(LIBDIR)/$(GLUT_IMP)
-
-$(LIBDIR)/$(GLUT_LIB): $(OBJECTS)
- $(AR) $(ARFLAGS) $@ $^
-
-$(LIBDIR)/$(GLUT_DXE) $(LIBDIR)/$(GLUT_IMP): $(OBJECTS)
-ifeq ($(HAVEDXE3),)
- $(warning Missing DXE3 package... Skipping $(GLUT_DXE))
-else
- -dxe3gen -o $(LIBDIR)/$(GLUT_DXE) -Y $(LIBDIR)/$(GLUT_IMP) -D "MesaGLUT DJGPP" -E _glut -P gl.dxe -U $^
-endif
-
-clean:
- -$(call UNLINK,*.o)
- -$(call UNLINK,PC_HW/*.o)
-
--include depend
diff --git a/src/glut/glx/Makefile.mgw b/src/glut/glx/Makefile.mgw
deleted file mode 100644
index ae4eb6addc..0000000000
--- a/src/glut/glx/Makefile.mgw
+++ /dev/null
@@ -1,198 +0,0 @@
-# Mesa 3-D graphics library
-# Version: 5.1
-#
-# Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# MinGW core makefile v1.4 for Mesa
-#
-# Copyright (C) 2002 - Daniel Borca
-# Email : dborca@users.sourceforge.net
-# Web : http://www.geocities.com/dborca
-
-# MinGW core-glut makefile updated for Mesa 7.0
-#
-# Updated : by Heromyth, on 2007-7-21
-# Email : zxpmyth@yahoo.com.cn
-# Bugs : 1) All the default settings work fine. But the setting X86=1 can't work.
-# The others havn't been tested yet.
-# 2) The generated DLLs are *not* compatible with the ones built
-# with the other compilers like VC8, especially for GLUT.
-# 3) Although more tests are needed, it can be used individually!
-
-
-#
-# Available options:
-#
-# Environment variables:
-# CFLAGS
-#
-# GLIDE path to Glide3 SDK; used with FX.
-# default = $(TOP)/glide3
-# FX=1 build for 3dfx Glide3. Note that this disables
-# compilation of most WMesa code and requires fxMesa.
-# As a consequence, you'll need the Win32 Glide3
-# library to build any application.
-# default = no
-# ICD=1 build the installable client driver interface
-# (windows opengl driver interface)
-# default = no
-# X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow).
-# default = no
-#
-# Targets:
-# all: build GL
-# clean: remove object files
-#
-
-
-
-.PHONY: all clean
-.INTERMEDIATE: x86/gen_matypes.exe
-.SUFFIXES: .rc .res
-
-# Set this to the prefix of your build tools, i.e. mingw32-
-TOOLS_PREFIX = mingw32-
-
-TOP = ../../..
-
-LIBDIR = $(TOP)/lib
-
-GLUT_DLL = glut32.dll
-GLUT_IMP = libglut32.a
-GLUT_DEF = glut.def
-
-include $(TOP)/configs/config.mgw
-GLUT_USING_STDCALL ?= 1
-
-
-
-LDLIBS = -L$(LIBDIR) -lwinmm -lgdi32 -luser32 -lopengl32 -lglu32
-LDFLAGS = -Wl,--out-implib=$(LIBDIR)/$(GLUT_IMP) -Wl,--output-def=$(LIBDIR)/$(GLUT_DEF)
-
-CFLAGS += -DBUILD_GLUT32 -DGLUT_BUILDING_LIB -DMESA -D_DLL
-
-ifeq ($(GL_USING_STDCALL),0)
- CFLAGS += -DGL_NO_STDCALL
-endif
-
-ifeq ($(GLUT_USING_STDCALL),1)
- CFLAGS += -D_STDCALL_SUPPORTED
- LDFLAGS += -Wl,--add-stdcall-alias
-else
- CFLAGS += -DGLUT_NO_STDCALL
-endif
-
-CFLAGS += -DNDEBUG -DLIBRARYBUILD -I$(TOP)/include
-
-CC = gcc
-CXX = g++
-CXXFLAGS = $(CFLAGS)
-
-AR = ar
-ARFLAGS = crus
-
-UNLINK = del $(subst /,\,$(1))
-ifneq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-ifneq ($(wildcard $(addsuffix /rm,$(subst :, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-
-HDRS = glutint.h glutstroke.h glutbitmap.h glutwin32.h stroke.h win32_glx.h win32_x11.h
-
-SRCS = \
- glut_bitmap.c \
- glut_bwidth.c \
- glut_cindex.c \
- glut_cmap.c \
- glut_cursor.c \
- glut_dials.c \
- glut_dstr.c \
- glut_event.c \
- glut_ext.c \
- glut_fbc.c \
- glut_fullscrn.c \
- glut_gamemode.c \
- glut_get.c \
- glut_init.c \
- glut_input.c \
- glut_joy.c \
- glut_key.c \
- glut_keyctrl.c \
- glut_keyup.c \
- glut_mesa.c \
- glut_modifier.c \
- glut_overlay.c \
- glut_shapes.c \
- glut_space.c \
- glut_stroke.c \
- glut_swap.c \
- glut_swidth.c \
- glut_tablet.c \
- glut_teapot.c \
- glut_util.c \
- glut_vidresize.c \
- glut_warp.c \
- glut_win.c \
- glut_winmisc.c \
- win32_glx.c \
- win32_menu.c \
- win32_util.c \
- win32_winproc.c \
- win32_x11.c
-
-
-SRCSSEMIGENS = \
- glut_8x13.c \
- glut_9x15.c \
- glut_hel10.c \
- glut_hel12.c \
- glut_hel18.c \
- glut_mroman.c \
- glut_roman.c \
- glut_tr10.c \
- glut_tr24.c
-
-
-
-SOURCES = $(SRCS) $(SRCSSEMIGENS)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-.c.o:
- $(CC) -o $@ $(CFLAGS) -c $<
-.cc.o:
- $(CXX) -o $@ $(CXXFLAGS) -c $<
-
-
-all: $(LIBDIR) $(LIBDIR)/$(GLUT_DLL) $(LIBDIR)/$(GLUT_IMP)
-
-$(LIBDIR):
- mkdir -p $(LIBDIR)
-
-$(LIBDIR)/$(GLUT_DLL) $(LIBDIR)/$(GLUT_IMP): $(OBJECTS)
- $(CXX) -shared -fPIC -o $(LIBDIR)/$(GLUT_DLL) $(LDFLAGS) \
- $^ $(LDLIBS)
-
-
-
-clean:
- -$(call UNLINK,*.o) \ No newline at end of file
diff --git a/src/glut/glx/descrip.mms b/src/glut/glx/descrip.mms
deleted file mode 100644
index 358b417511..0000000000
--- a/src/glut/glx/descrip.mms
+++ /dev/null
@@ -1,208 +0,0 @@
-# Makefile for GLUT for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-
-.first
- define gl [---.include.gl]
-
-.include [---]mms.config
-
-##### MACROS #####
-GLUT_MAJOR = 3
-GLUT_MINOR = 7
-
-VPATH = RCS
-
-INCDIR = [---.include]
-LIBDIR = [---.lib]
-CFLAGS = /nowarn/include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = \
-glut_8x13.c \
-glut_9x15.c \
-glut_bitmap.c \
-glut_bwidth.c \
-glut_cindex.c \
-glut_cmap.c \
-glut_cursor.c \
-glut_dials.c \
-glut_dstr.c \
-glut_event.c \
-glut_ext.c \
-glut_fullscrn.c \
-glut_gamemode.c \
-glut_get.c \
-glut_glxext.c \
-glut_hel10.c \
-glut_hel12.c \
-glut_hel18.c \
-glut_init.c \
-glut_input.c \
-glut_joy.c \
-glut_key.c \
-glut_keyctrl.c \
-glut_keyup.c \
-glut_menu.c \
-glut_menu2.c \
-glut_mesa.c \
-glut_modifier.c \
-glut_mroman.c \
-glut_overlay.c \
-glut_roman.c \
-glut_shapes.c \
-glut_space.c \
-glut_stroke.c \
-glut_swap.c \
-glut_swidth.c \
-glut_tablet.c \
-glut_teapot.c \
-glut_tr10.c \
-glut_tr24.c \
-glut_util.c \
-glut_vidresize.c \
-glut_warp.c \
-glut_win.c \
-glut_winmisc.c \
-layerutil.c
-
-OBJECTS0=glut_8x13.obj,\
-glut_9x15.obj,\
-glut_bitmap.obj,\
-glut_bwidth.obj,\
-glut_cindex.obj,\
-glut_cmap.obj,\
-glut_cursor.obj,\
-glut_dials.obj,\
-glut_dstr.obj,\
-glut_event.obj,\
-glut_ext.obj,\
-glut_fullscrn.obj,\
-glut_gamemode.obj
-
-OBJECTS1=glut_get.obj,\
-glut_glxext.obj,\
-glut_hel10.obj,\
-glut_hel12.obj,\
-glut_hel18.obj,\
-glut_init.obj,\
-glut_input.obj,\
-glut_joy.obj,\
-glut_key.obj,\
-glut_keyctrl.obj,\
-glut_keyup.obj,\
-glut_menu.obj,\
-glut_menu2.obj,\
-glut_mesa.obj,\
-glut_modifier.obj
-
-OBJECTS2=glut_mroman.obj,\
-glut_overlay.obj,\
-glut_roman.obj,\
-glut_shapes.obj,\
-glut_space.obj,\
-glut_stroke.obj,\
-glut_swap.obj,\
-glut_swidth.obj,\
-glut_tablet.obj,\
-glut_teapot.obj,\
-glut_tr10.obj,\
-glut_tr24.obj,\
-glut_util.obj,\
-glut_vidresize.obj
-
-OBJECTS3=glut_warp.obj,\
-glut_win.obj,\
-glut_winmisc.obj,\
-layerutil.obj
-
-##### RULES #####
-
-VERSION=Glut V3.7
-
-##### TARGETS #####
-
-# Make the library
-$(LIBDIR)$(GLUT_LIB) : $(OBJECTS0) $(OBJECTS1) $(OBJECTS2) $(OBJECTS3)
- @ $(MAKELIB) $(GLUT_LIB) $(OBJECTS0)
- @ library $(GLUT_LIB) $(OBJECTS1)
- @ library $(GLUT_LIB) $(OBJECTS2)
- @ library $(GLUT_LIB) $(OBJECTS3)
- @ rename $(GLUT_LIB)* $(LIBDIR)
-.ifdef SHARE
- @ WRITE_ SYS$OUTPUT " generating mesagl1.opt"
- @ OPEN_/WRITE FILE mesagl1.opt
- @ WRITE_ FILE "!"
- @ WRITE_ FILE "! mesagl1.opt generated by DESCRIP.$(MMS_EXT)"
- @ WRITE_ FILE "!"
- @ WRITE_ FILE "IDENTIFICATION=""$(VERSION)"""
- @ WRITE_ FILE "GSMATCH=LEQUAL,3,7
- @ WRITE_ FILE "$(OBJECTS0)"
- @ WRITE_ FILE "$(OBJECTS1)"
- @ WRITE_ FILE "$(OBJECTS2)"
- @ WRITE_ FILE "$(OBJECTS3)"
- @ WRITE_ FILE "[---.lib]libmesaglu.exe/SHARE"
- @ WRITE_ FILE "[---.lib]libmesagl.exe/SHARE"
- @ write file "sys$library:decw$xmulibshr.exe/share"
- @ WRITE_ FILE "SYS$SHARE:DECW$XEXTLIBSHR/SHARE"
- @ WRITE_ FILE "SYS$SHARE:DECW$XLIBSHR/SHARE"
- @ CLOSE_ FILE
- @ WRITE_ SYS$OUTPUT " generating mesagl.map ..."
- @ CXXLINK_/NODEB/NOSHARE/NOEXE/MAP=mesagl.map/FULL mesagl1.opt/OPT
- @ WRITE_ SYS$OUTPUT " analyzing mesagl.map ..."
- @ @[---.vms]ANALYZE_MAP.COM mesagl.map mesagl.opt
- @ WRITE_ SYS$OUTPUT " linking $(GLUT_SHAR) ..."
- @ CXXLINK_/NODEB/SHARE=$(GLUT_SHAR)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesagl.opt/opt
- @ rename $(GLUT_SHAR)* $(LIBDIR)
-.endif
-
-clean :
- delete *.obj;*
- purge
-
-include mms_depend.
-
-glut_8x13.obj : glut_8x13.c
-glut_9x15.obj : glut_9x15.c
-glut_bitmap.obj : glut_bitmap.c
-glut_bwidth.obj : glut_bwidth.c
-glut_cindex.obj : glut_cindex.c
-glut_cmap.obj : glut_cmap.c
-glut_cursor.obj : glut_cursor.c
-glut_dials.obj : glut_dials.c
-glut_dstr.obj : glut_dstr.c
-glut_event.obj : glut_event.c
-glut_ext.obj : glut_ext.c
-glut_fullscrn.obj : glut_fullscrn.c
-glut_gamemode.obj : glut_gamemode.c
-glut_get.obj : glut_get.c
-glut_glxext.obj : glut_glxext.c
-glut_hel10.obj : glut_hel10.c
-glut_hel12.obj : glut_hel12.c
-glut_hel18.obj : glut_hel18.c
-glut_init.obj : glut_init.c
-glut_input.obj : glut_input.c
-glut_joy.obj : glut_joy.c
-glut_key.obj : glut_key.c
-glut_keyctrl.obj : glut_keyctrl.c
-glut_keyup.obj : glut_keyup.c
-glut_menu.obj : glut_menu.c
-glut_menu2.obj : glut_menu2.c
-glut_mesa.obj : glut_mesa.c
-glut_modifier.obj : glut_modifier.c
-glut_mroman.obj : glut_mroman.c
-glut_overlay.obj : glut_overlay.c
-glut_roman.obj : glut_roman.c
-glut_shapes.obj : glut_shapes.c
-glut_space.obj : glut_space.c
-glut_stroke.obj : glut_stroke.c
-glut_swap.obj : glut_swap.c
-glut_swidth.obj : glut_swidth.c
-glut_tablet.obj : glut_tablet.c
-glut_teapot.obj : glut_teapot.c
-glut_tr10.obj : glut_tr10.c
-glut_tr24.obj : glut_tr24.c
-glut_util.obj : glut_util.c
-glut_vidresize.obj : glut_vidresize.c
-glut_warp.obj : glut_warp.c
-glut_win.obj : glut_win.c
-glut_winmisc.obj : glut_winmisc.c
-layerutil.obj : layerutil.c
diff --git a/src/glut/glx/mms_depend b/src/glut/glx/mms_depend
deleted file mode 100644
index 98f87c29e2..0000000000
--- a/src/glut/glx/mms_depend
+++ /dev/null
@@ -1,72 +0,0 @@
-# DO NOT DELETE
-
-glut_8x13.obj : glutbitmap.h [---.include.gl]gl.h
-glut_9x15.obj : glutbitmap.h [---.include.gl]gl.h
-glut_bitmap.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_bitmap.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_bitmap.obj : glutbitmap.h
-glut_bwidth.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_bwidth.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_bwidth.obj : glutbitmap.h
-glut_cindex.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_cindex.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_cindex.obj : layerutil.h
-glut_cursor.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_cursor.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_dials.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_dials.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
-glut_dstr.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_dstr.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
-glut_event.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_event.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_ext.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_ext.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_fullscrn.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_fullscrn.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h
-glut_fullscrn.obj : [---.include.gl]glu.h
-glut_get.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_get.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_hel10.obj : glutbitmap.h [---.include.gl]gl.h
-glut_hel12.obj : glutbitmap.h [---.include.gl]gl.h
-glut_hel18.obj : glutbitmap.h [---.include.gl]gl.h
-glut_init.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_init.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_menu.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_menu.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h layerutil.h
-glut_mesa.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_mesa.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
-glut_modifier.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_modifier.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h
-glut_modifier.obj : [---.include.gl]glu.h
-glut_mroman.obj : glutstroke.h
-glut_overlay.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_overlay.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_overlay.obj : layerutil.h
-glut_roman.obj : glutstroke.h
-glut_shapes.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_shapes.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_space.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_space.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
-glut_stroke.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_stroke.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_stroke.obj : glutstroke.h
-glut_swidth.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_swidth.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_swidth.obj : glutstroke.h
-glut_tablet.obj : glutint.h [---.include.gl]glx.h [---.include.gl]gl.h
-glut_tablet.obj : [---.include.gl]xmesa.h [---.include.gl]glut.h [---.include.gl]glu.h
-glut_teapot.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_tr10.obj : glutbitmap.h [---.include.gl]gl.h
-glut_tr24.obj : glutbitmap.h [---.include.gl]gl.h
-glut_util.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_util.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_vidresize.obj : [---.include.gl]glx.h [---.include.gl]gl.h
-glut_vidresize.obj : [---.include.gl]xmesa.h glutint.h [---.include.gl]glut.h
-glut_vidresize.obj : [---.include.gl]glu.h
-glut_warp.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_warp.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_win.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_win.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-glut_winmisc.obj : [---.include.gl]glut.h [---.include.gl]gl.h [---.include.gl]glu.h
-glut_winmisc.obj : glutint.h [---.include.gl]glx.h [---.include.gl]xmesa.h
-layerutil.obj : layerutil.h
diff --git a/src/mesa/Makefile.DJ b/src/mesa/Makefile.DJ
deleted file mode 100644
index 06a13fb1ab..0000000000
--- a/src/mesa/Makefile.DJ
+++ /dev/null
@@ -1,166 +0,0 @@
-# Mesa 3-D graphics library
-# Version: 5.1
-#
-# Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# DOS/DJGPP core makefile v1.7 for Mesa
-#
-# Copyright (C) 2002 - Daniel Borca
-# Email : dborca@users.sourceforge.net
-# Web : http://www.geocities.com/dborca
-
-
-#
-# Available options:
-#
-# Environment variables:
-# CFLAGS
-#
-# GLIDE path to Glide3 SDK; used with FX.
-# default = $(TOP)/glide3
-# FX=1 build for 3dfx Glide3. Note that this disables
-# compilation of most DMesa code and requires fxMesa.
-# As a consequence, you'll need the DJGPP Glide3
-# library to build any application.
-# default = no
-# X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow).
-# default = no
-#
-# Targets:
-# all: build GL
-# clean: remove object files
-#
-
-
-
-.PHONY: all clean
-.INTERMEDIATE: x86/gen_matypes.exe
-
-TOP = ../..
-GLIDE ?= $(TOP)/glide3
-LIBDIR = $(TOP)/lib
-GL_LIB = libgl.a
-GL_DXE = gl.dxe
-GL_IMP = libigl.a
-
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH);$(LIBDIR);$(GLIDE)/lib
-
-CC = gcc
-CFLAGS += $(INCLUDE_DIRS)
-CFLAGS += -DUSE_EXTERNAL_DXTN_LIB=1
-ifeq ($(FX),1)
-CFLAGS += -D__DOS__
-CFLAGS += -I$(GLIDE)/include -DFX
-LIBNAME = "Mesa/FX DJGPP"
-else
-LIBNAME = "Mesa DJGPP"
-endif
-
-AR = ar
-ARFLAGS = crus
-
-HAVEDXE3 = $(wildcard $(DJDIR)/bin/dxe3gen.exe)
-
-ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = del $(subst /,\,$(1))
-else
-UNLINK = $(RM) $(1)
-endif
-
-include sources
-
-ifeq ($(X86),1)
-CFLAGS += -DUSE_X86_ASM
-CFLAGS += -DUSE_MMX_ASM
-CFLAGS += -DUSE_SSE_ASM
-CFLAGS += -DUSE_3DNOW_ASM
-X86_SOURCES += $(X86_API)
-else
-X86_SOURCES =
-endif
-
-DRIVER_SOURCES = \
- drivers/dos/dmesa.c
-ifeq ($(FX),1)
-DRIVER_SOURCES += \
- $(GLIDE_DRIVER_SOURCES)
-else
-DRIVER_SOURCES += \
- $(OSMESA_DRIVER_SOURCES) \
- drivers/dos/video.c \
- drivers/dos/vesa.c \
- drivers/dos/blit.S \
- drivers/dos/vga.c \
- drivers/dos/null.c \
- drivers/dos/dpmi.c
-endif
-
-SOURCES = $(CORE_SOURCES) $(X86_SOURCES) $(COMMON_DRIVER_SOURCES) $(DRIVER_SOURCES)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-X86_OBJECTS = $(addsuffix .o,$(basename $(X86_SOURCES)))
-
-.c.o:
- $(CC) -o $@ $(CFLAGS) -c $<
-.S.o:
- $(CC) -o $@ $(CFLAGS) -c $<
-.s.o:
- $(CC) -o $@ $(CFLAGS) -x assembler-with-cpp -c $<
-
-all: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GL_DXE) $(LIBDIR)/$(GL_IMP)
-
-$(LIBDIR)/$(GL_LIB): $(OBJECTS)
- $(AR) $(ARFLAGS) $@ $^
-
-$(LIBDIR)/$(GL_DXE) $(LIBDIR)/$(GL_IMP): $(OBJECTS)
-ifeq ($(HAVEDXE3),)
- $(warning Missing DXE3 package... Skipping $(GL_DXE))
-else
-ifeq ($(FX),1)
- -dxe3gen -o $(LIBDIR)/$(GL_DXE) -Y $(LIBDIR)/$(GL_IMP) -D $(LIBNAME) -E _gl -E _DMesa -P glide3x.dxe -U $^
-else
- -dxe3gen -o $(LIBDIR)/$(GL_DXE) -Y $(LIBDIR)/$(GL_IMP) -D $(LIBNAME) -E _gl -E _DMesa -U $^
-endif
-endif
-
-$(X86_OBJECTS): x86/matypes.h
-
-x86/matypes.h: x86/gen_matypes.exe
- $< > $@
-
-x86/gen_matypes.exe: x86/gen_matypes.c
- $(CC) -o $@ $(CFLAGS) -s $<
-
-clean:
- -$(call UNLINK,array_cache/*.o)
- -$(call UNLINK,glapi/*.o)
- -$(call UNLINK,main/*.o)
- -$(call UNLINK,math/*.o)
- -$(call UNLINK,shader/*.o)
- -$(call UNLINK,sparc/*.o)
- -$(call UNLINK,ppc/*.o)
- -$(call UNLINK,swrast/*.o)
- -$(call UNLINK,swrast_setup/*.o)
- -$(call UNLINK,tnl/*.o)
- -$(call UNLINK,x86/*.o)
- -$(call UNLINK,drivers/common/*.o)
- -$(call UNLINK,drivers/dos/*.o)
- -$(call UNLINK,drivers/glide/*.o)
diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw
deleted file mode 100644
index 3b52834bd1..0000000000
--- a/src/mesa/Makefile.mgw
+++ /dev/null
@@ -1,235 +0,0 @@
-# Mesa 3-D graphics library
-# Version: 7.0
-#
-# Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# MinGW core makefile v1.4 for Mesa
-#
-# Copyright (C) 2002 - Daniel Borca
-# Email : dborca@users.sourceforge.net
-# Web : http://www.geocities.com/dborca
-
-# MinGW core-gl makefile updated for Mesa 7.0
-#
-# updated : by Heromyth, on 2007-7-21
-# Email : zxpmyth@yahoo.com.cn
-# Bugs : 1) All the default settings work fine. But the setting X86=1 can't work.
-# The others havn't been tested yet.
-# 2) The generated DLLs are *not* compatible with the ones built
-# with the other compilers like VC8, especially for GLUT.
-# 3) Although more tests are needed, it can be used individually!
-
-
-#
-# Available options:
-#
-# Environment variables:
-# CFLAGS
-#
-# GLIDE path to Glide3 SDK; used with FX.
-# default = $(TOP)/glide3
-# FX=1 build for 3dfx Glide3. Note that this disables
-# compilation of most WMesa code and requires fxMesa.
-# As a consequence, you'll need the Win32 Glide3
-# library to build any application.
-# default = no
-# ICD=1 build the installable client driver interface
-# (windows opengl driver interface)
-# default = no
-# X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow).
-# default = no
-#
-# Targets:
-# all: build GL
-# clean: remove object files
-#
-
-
-.PHONY: all clean
-.INTERMEDIATE: x86/gen_matypes.exe
-.SUFFIXES: .rc .res
-
-# Set this to the prefix of your build tools, i.e. mingw32-
-TOOLS_PREFIX = mingw32-
-
-
-
-TOP = ../..
-GLIDE ?= $(TOP)/glide3
-LIBDIR = $(TOP)/lib
-ifeq ($(ICD),1)
- GL_DLL = mesa32.dll
- GL_IMP = libmesa32.a
-else
- GL_DLL = opengl32.dll
- GL_IMP = libopengl32.a
-endif
-
-GL_DEF = gl.def
-
-include $(TOP)/configs/config.mgw
-GL_USING_STDCALL ?= 1
-
-MESA_LIB = libmesa.a
-
-LDLIBS = -lgdi32 -luser32 -liberty
-LDFLAGS = -Wl,--out-implib=$(LIBDIR)/$(GL_IMP) -Wl,--output-def=$(LIBDIR)/gl.def
-
-CC = $(TOOLS_PREFIX)gcc
-CFLAGS += -DBUILD_GL32 -D_OPENGL32_ -D_DLL -DMESA_MINWARN -DNDEBUG -D_USRDLL -DGDI_EXPORTS
-
-ifeq ($(GL_USING_STDCALL),1)
- LDFLAGS += -Wl,--add-stdcall-alias
-else
- CFLAGS += -DGL_NO_STDCALL
-endif
-
-CFLAGS += -DUSE_EXTERNAL_DXTN_LIB=1
-ifeq ($(FX),1)
- CFLAGS += -I$(GLIDE)/include -DFX
- LDLIBS += -L$(GLIDE)/lib -lglide3x
- GL_DEF = drivers/windows/fx/fxopengl.def
- GL_RES = drivers/windows/fx/fx.rc
-else
- ifeq ($(ICD),1)
- CFLAGS += -DUSE_MGL_NAMESPACE
- GL_DEF = drivers/windows/icd/mesa.def
- else
- GL_DEF = drivers/windows/gdi/mesa.def
- endif
-endif
-
-AR = ar
-ARFLAGS = crus
-
-UNLINK = del $(subst /,\,$(1))
-ifneq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-ifneq ($(wildcard $(addsuffix /rm,$(subst :, ,$(PATH)))),)
-UNLINK = $(RM) $(1)
-endif
-
-include sources
-
-CFLAGS += $(INCLUDE_DIRS)
-
-ifeq ($(X86),1)
-CFLAGS += -DUSE_X86_ASM
-CFLAGS += -DUSE_MMX_ASM
-CFLAGS += -DUSE_SSE_ASM
-CFLAGS += -DUSE_3DNOW_ASM
-X86_SOURCES += $(X86_API)
-else
-X86_SOURCES =
-endif
-
-ifeq ($(FX),1)
-DRIVER_SOURCES = \
- $(GLIDE_DRIVER_SOURCES) \
- drivers/windows/fx/fxwgl.c
-else
-ifeq ($(ICD),1)
-DRIVER_SOURCES = \
- drivers/windows/gdi/wmesa.c \
- drivers/windows/icd/icd.c
-else
-DRIVER_SOURCES = \
- drivers/windows/gdi/wmesa.c \
- drivers/windows/gdi/wgl.c
-endif
-endif
-
-SOURCES = $(CORE_SOURCES) $(X86_SOURCES) $(COMMON_DRIVER_SOURCES) $(DRIVER_SOURCES)
-
-OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
-
-X86_OBJECTS = $(addsuffix .o,$(basename $(X86_SOURCES)))
-
-RESOURCE = $(GL_RES:.rc=.res)
-
-.c.o:
- $(CC) -o $@ $(CFLAGS) -c $<
-.s.o:
- $(CC) -o $@ $(CFLAGS) -x assembler-with-cpp -c $<
-
-.rc.res:
- windres -o $@ -Irc -Ocoff $<
-
-all: $(LIBDIR) $(LIBDIR)/$(GL_DLL) $(LIBDIR)/$(GL_IMP)
-
-$(LIBDIR):
- mkdir -p $(LIBDIR)
-
-$(LIBDIR)/$(GL_DLL) $(LIBDIR)/$(GL_IMP): $(OBJECTS) $(RESOURCE)
- $(CC) -shared -fPIC -o $(LIBDIR)/$(GL_DLL) $(LDFLAGS) \
- $^ $(LDLIBS)
-
-$(X86_OBJECTS): x86/matypes.h
-
-x86/matypes.h: x86/gen_matypes.exe
- $(subst /,\,$< > $@)
-
-x86/gen_matypes.exe: x86/gen_matypes.c
- $(CC) -o $@ $(CFLAGS) -s $<
-
-# [dBorca]
-# glapi_x86.S needs some adjustments
-# in order to generate correct entrypoints
-# Trick: change the following condition to
-# be always false if you need C entrypoints
-# with USE_X86_ASM (useful for trace/debug)
-ifeq (1,1)
-x86/glapi_x86.o: x86/glapi_x86.S
- $(CC) -o $@ $(CFLAGS) -DSTDCALL_API -c $<
-else
-main/dispatch.o: main/dispatch.c
- $(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
-glapi/glapi.o: glapi/glapi.c
- $(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
-endif
-
-# [dBorca]
-# if we want codegen, we have to stdcall
-tnl/t_vtx_x86_gcc.o: tnl/t_vtx_x86_gcc.S
- $(CC) -o $@ $(CFLAGS) -DSTDCALL_API -c $<
-
-clean:
- -$(call UNLINK,glapi/*.o)
- -$(call UNLINK,main/*.o)
- -$(call UNLINK,math/*.o)
- -$(call UNLINK,vbo/*.o)
- -$(call UNLINK,shader/*.o)
- -$(call UNLINK,shader/slang/*.o)
- -$(call UNLINK,shader/grammar/*.o)
- -$(call UNLINK,sparc/*.o)
- -$(call UNLINK,ppc/*.o)
- -$(call UNLINK,swrast/*.o)
- -$(call UNLINK,swrast_setup/*.o)
- -$(call UNLINK,tnl/*.o)
- -$(call UNLINK,x86/*.o)
- -$(call UNLINK,x86/rtasm/*.o)
- -$(call UNLINK,x86-64/*.o)
- -$(call UNLINK,drivers/common/*.o)
- -$(call UNLINK,drivers/glide/*.o)
- -$(call UNLINK,drivers/windows/fx/*.o)
- -$(call UNLINK,drivers/windows/fx/*.res)
- -$(call UNLINK,drivers/windows/gdi/*.o)
- -$(call UNLINK,drivers/windows/icd/*.o)
diff --git a/src/mesa/descrip.mms b/src/mesa/descrip.mms
deleted file mode 100644
index a12e3fc1b7..0000000000
--- a/src/mesa/descrip.mms
+++ /dev/null
@@ -1,26 +0,0 @@
-# Makefile for Mesa for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-
-all :
- set default [.main]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.glapi]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.shader]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.drivers.common]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.x11]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.osmesa]
- $(MMS)$(MMSQUALIFIERS)
- set default [--.math]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.tnl]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.swrast]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.swrast_setup]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.array_cache]
- $(MMS)$(MMSQUALIFIERS)
diff --git a/src/mesa/drivers/common/descrip.mms b/src/mesa/drivers/common/descrip.mms
deleted file mode 100644
index c2c119db7f..0000000000
--- a/src/mesa/drivers/common/descrip.mms
+++ /dev/null
@@ -1,38 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 2 November 2005
-
-.first
- define gl [----.include.gl]
- define math [--.math]
- define tnl [--.tnl]
- define swrast [--.swrast]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi],[--.shader]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = driverfuncs.c
-
-OBJECTS =driverfuncs.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-driverfuncs.obj : driverfuncs.c
diff --git a/src/mesa/drivers/osmesa/descrip.mms b/src/mesa/drivers/osmesa/descrip.mms
deleted file mode 100644
index 5be194bcee..0000000000
--- a/src/mesa/drivers/osmesa/descrip.mms
+++ /dev/null
@@ -1,41 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
- define gl [----.include.gl]
- define math [--.math]
- define tnl [--.tnl]
- define swrast [--.swrast]
- define swrast_setup [--.swrast_setup]
- define array_cache [--.array_cache]
- define drivers [-]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = osmesa.c
-
-OBJECTS = osmesa.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-osmesa.obj : osmesa.c
diff --git a/src/mesa/drivers/x11/descrip.mms b/src/mesa/drivers/x11/descrip.mms
deleted file mode 100644
index f181707a14..0000000000
--- a/src/mesa/drivers/x11/descrip.mms
+++ /dev/null
@@ -1,51 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
- define gl [----.include.gl]
- define math [--.math]
- define tnl [--.tnl]
- define swrast [--.swrast]
- define swrast_setup [--.swrast_setup]
- define array_cache [--.array_cache]
- define drivers [-]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi]
-LIBDIR = [----.lib]
-CFLAGS =/include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = fakeglx.c glxapi.c xfonts.c xm_api.c xm_dd.c xm_line.c xm_span.c\
- xm_tri.c xm_buffer.c
-
-OBJECTS =fakeglx.obj,glxapi.obj,xfonts.obj,xm_api.obj,xm_dd.obj,xm_line.obj,\
- xm_span.obj,xm_tri.obj,xm_buffer.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-fakeglx.obj : fakeglx.c
-glxapi.obj : glxapi.c
-xfonts.obj : xfonts.c
-xm_api.obj : xm_api.c
-xm_buffer.obj : xm_buffer.c
-xm_dd.obj : xm_dd.c
-xm_line.obj : xm_line.c
-xm_span.obj : xm_span.c
-xm_tri.obj : xm_tri.c
diff --git a/src/mesa/glapi/descrip.mms b/src/mesa/glapi/descrip.mms
deleted file mode 100644
index 16bf6387e8..0000000000
--- a/src/mesa/glapi/descrip.mms
+++ /dev/null
@@ -1,37 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
- define gl [---.include.gl]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = glapi.c glthread.c
-
-OBJECTS = glapi.obj,glthread.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-glapi.obj : glapi.c
-
-glthread.obj : glthread.c
diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
deleted file mode 100644
index 2bd388be89..0000000000
--- a/src/mesa/main/descrip.mms
+++ /dev/null
@@ -1,221 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-# Last revision : 10 May 2005
-
-.first
- define gl [---.include.gl]
- define math [-.math]
- define shader [-.shader]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.glapi],[-.shader]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES =accum.c \
- api_arrayelt.c \
- api_loopback.c \
- api_noop.c \
- api_validate.c \
- attrib.c \
- arrayobj.c \
- blend.c \
- bufferobj.c \
- buffers.c \
- clip.c \
- colortab.c \
- context.c \
- convolve.c \
- debug.c \
- depth.c \
- depthstencil.c \
- dispatch.c \
- dlist.c \
- drawpix.c \
- enable.c \
- enums.c \
- eval.c \
- execmem.c \
- extensions.c \
- fbobject.c \
- feedback.c \
- fog.c \
- framebuffer.c \
- get.c \
- getstring.c \
- hash.c \
- hint.c \
- histogram.c \
- image.c \
- imports.c \
- light.c \
- lines.c \
- matrix.c \
- mipmap.c \
- mm.c \
- occlude.c \
- pixel.c \
- points.c \
- polygon.c \
- rastpos.c \
- rbadaptors.c \
- renderbuffer.c \
- state.c \
- stencil.c \
- texcompress.c \
- texcompress_fxt1.c \
- texcompress_s3tc.c \
- texenvprogram.c \
- texformat.c \
- teximage.c \
- texobj.c \
- texrender.c \
- texstate.c \
- texstore.c \
- varray.c \
- vtxfmt.c
-
-OBJECTS=accum.obj,\
-api_arrayelt.obj,\
-api_loopback.obj,\
-api_noop.obj,\
-api_validate.obj,\
-arrayobj.obj,\
-attrib.obj,\
-blend.obj,\
-bufferobj.obj,\
-buffers.obj,\
-clip.obj,\
-colortab.obj,\
-context.obj,\
-convolve.obj,\
-debug.obj,\
-depth.obj,\
-depthstencil.obj,\
-dispatch.obj,\
-dlist.obj,\
-drawpix.obj,\
-enable.obj,\
-enums.obj,\
-eval.obj,\
-execmem.obj,\
-extensions.obj,\
-fbobject.obj,\
-feedback.obj,\
-fog.obj,\
-framebuffer.obj,\
-get.obj,\
-getstring.obj,\
-hash.obj,\
-hint.obj,\
-histogram.obj,\
-image.obj,\
-imports.obj,\
-light.obj,\
-lines.obj,\
-matrix.obj,\
-mipmap.obj,\
-mm.obj,\
-occlude.obj,\
-pixel.obj,\
-points.obj,\
-polygon.obj,\
-rastpos.obj,\
-renderbuffer.obj,\
-state.obj,\
-stencil.obj,\
-texcompress.obj,\
-texcompress_fxt1.obj,\
-texcompress_s3tc.obj,\
-texenvprogram.obj,\
-texformat.obj,\
-teximage.obj,\
-texobj.obj,\
-texrender.obj,\
-texstate.obj,\
-texstore.obj,\
-varray.obj,\
-vtxfmt.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ $(MAKELIB) $(GL_LIB) $(OBJECTS)
- @ rename $(GL_LIB)* $(LIBDIR)
-
-clean :
- purge
- delete *.obj;*
-
-accum.obj : accum.c
-api_arrayelt.obj : api_arrayelt.c
-api_loopback.obj : api_loopback.c
-api_noop.obj : api_noop.c
-api_validate.obj : api_validate.c
-arrayobj.obj : arrayobj.c
-attrib.obj : attrib.c
-blend.obj : blend.c
-bufferobj.obj : bufferobj.c
-buffers.obj : buffers.c
-clip.obj : clip.c
-colortab.obj : colortab.c
-context.obj : context.c
-convolve.obj : convolve.c
-debug.obj : debug.c
-depth.obj : depth.c
-depthstencil.obj : depthstencil.c
-dispatch.obj : dispatch.c
-dlist.obj : dlist.c
-drawpix.obj : drawpix.c
-enable.obj : enable.c
-enums.obj : enums.c
-eval.obj : eval.c
-execmem.obj : execmem.c
-extensions.obj : extensions.c
-fbobject.obj : fbobject.c
-feedback.obj : feedback.c
-fog.obj : fog.c
-framebuffer.obj : framebuffer.c
-get.obj : get.c
-getstring.obj : getstring.c
-hash.obj : hash.c
-hint.obj : hint.c
-histogram.obj : histogram.c
-image.obj : image.c
-imports.obj : imports.c vsnprintf.c
-light.obj : light.c
-lines.obj : lines.c
-matrix.obj : matrix.c
-mipmap.obj : mipmap.c
-mm.obj : mm.c
-occlude.obj : occlude.c
-pixel.obj : pixel.c
-points.obj : points.c
-polygon.obj : polygon.c
-rastpos.obj : rastpos.c
-rbadaptors.obj : rbadaptors.c
-renderbuffer.obj : renderbuffer.c
-state.obj : state.c
-stencil.obj : stencil.c
-texcompress.obj : texcompress.c
-texcompress_fxt1.obj : texcompress_fxt1.c
- cc$(CFLAGS)/warn=(disable=SHIFTCOUNT) texcompress_fxt1.c
-texcompress_s3tc.obj : texcompress_s3tc.c
-texenvprogram.obj : texenvprogram.c
-texformat.obj : texformat.c
-teximage.obj : teximage.c
-texobj.obj : texobj.c
-texrender.obj : texrender.c
-texstate.obj : texstate.c
-texstore.obj : texstore.c
-varray.obj : varray.c
-vtxfmt.obj : vtxfmt.c
diff --git a/src/mesa/math/descrip.mms b/src/mesa/math/descrip.mms
deleted file mode 100644
index 5b9e9915f8..0000000000
--- a/src/mesa/math/descrip.mms
+++ /dev/null
@@ -1,45 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
- define gl [---.include.gl]
- define math [-.math]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c m_matrix.c\
- m_translate.c m_vector.c m_xform.c
-
-OBJECTS = m_debug_clip.obj,m_debug_norm.obj,m_debug_xform.obj,m_eval.obj,\
- m_matrix.obj,m_translate.obj,m_vector.obj,m_xform.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-m_debug_clip.obj : m_debug_clip.c
-m_debug_norm.obj : m_debug_norm.c
-m_debug_xform.obj : m_debug_xform.c
-m_eval.obj : m_eval.c
-m_matrix.obj : m_matrix.c
-m_translate.obj : m_translate.c
-m_vector.obj : m_vector.c
-m_xform.obj : m_xform.c
diff --git a/src/mesa/shader/descrip.mms b/src/mesa/shader/descrip.mms
deleted file mode 100644
index f5d04cfa78..0000000000
--- a/src/mesa/shader/descrip.mms
+++ /dev/null
@@ -1,76 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 20 November 2006
-.first
- define gl [---.include.gl]
- define math [-.math]
- define swrast [-.swrast]
- define array_cache [-.array_cache]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[.grammar],[-.main],[-.glapi],[.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1,"__extension__=")/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = \
- atifragshader.c \
- arbprogparse.c \
- arbprogram.c \
- nvfragparse.c \
- nvprogram.c \
- nvvertexec.c \
- nvvertparse.c \
- program.c \
- shaderobjects.c \
- shaderobjects_3dlabs.c
-
-OBJECTS = \
- atifragshader.obj,\
- arbprogparse.obj,\
- arbprogram.obj,\
- nvfragparse.obj,\
- nvprogram.obj,\
- nvvertexec.obj,\
- nvvertparse.obj,\
- program.obj,\
- shaderobjects.obj,\
- shaderobjects_3dlabs.obj
-
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-all :
- $(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB)
- set def [.slang]
- $(MMS)$(MMSQUALIFIERS)
- set def [-.grammar]
- $(MMS)$(MMSQUALIFIERS)
- set def [-]
-
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-atifragshader.obj : atifragshader.c
-arbprogparse.obj : arbprogparse.c
-arbprogram.obj : arbprogram.c
-nvfragparse.obj : nvfragparse.c
-nvprogram.obj : nvprogram.c
-nvvertexec.obj : nvvertexec.c
-nvvertparse.obj : nvvertparse.c
-program.obj : program.c
-shaderobjects.obj : shaderobjects.c
- cc$(CFLAGS)/nowarn shaderobjects.c
-shaderobjects_3dlabs.obj : shaderobjects_3dlabs.c
diff --git a/src/mesa/shader/grammar/descrip.mms b/src/mesa/shader/grammar/descrip.mms
deleted file mode 100644
index cff53ee872..0000000000
--- a/src/mesa/shader/grammar/descrip.mms
+++ /dev/null
@@ -1,41 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-# Last revision : 1 June 2005
-
-.first
- define gl [----.include.gl]
- define math [--.math]
- define swrast [--.swrast]
- define array_cache [--.array_cache]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[],[--.main],[--.glapi],[-.slang]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = grammar_mesa.c
-
-OBJECTS = grammar_mesa.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-all :
- $(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB)
-
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-grammar_mesa.obj : grammar_mesa.c grammar.c
diff --git a/src/mesa/shader/slang/descrip.mms b/src/mesa/shader/slang/descrip.mms
deleted file mode 100644
index 8b9cd822b8..0000000000
--- a/src/mesa/shader/slang/descrip.mms
+++ /dev/null
@@ -1,65 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 17 March 2006
-
-.first
- define gl [----.include.gl]
- define math [--.math]
- define swrast [--.swrast]
- define array_cache [--.array_cache]
-
-.include [----]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi],[-.slang],[-.grammar],[-]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = \
- slang_compile.c,slang_preprocess.c
-
-OBJECTS = \
- slang_compile.obj,slang_preprocess.obj,slang_utility.obj,\
- slang_execute.obj,slang_assemble.obj,slang_assemble_conditional.obj,\
- slang_assemble_constructor.obj,slang_assemble_typeinfo.obj,\
- slang_storage.obj,slang_assemble_assignment.obj,\
- slang_compile_function.obj,slang_compile_struct.obj,\
- slang_compile_variable.obj,slang_compile_operation.obj,\
- slang_library_noise.obj,slang_link.obj,slang_export.obj,\
- slang_analyse.obj,slang_library_texsample.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-slang_compile.obj : slang_compile.c
-slang_preprocess.obj : slang_preprocess.c
-slang_utility.obj : slang_utility.c
-slang_execute.obj : slang_execute.c
-slang_assemble.obj : slang_assemble.c
-slang_assemble_conditional.obj : slang_assemble_conditional.c
-slang_assemble_constructor.obj : slang_assemble_constructor.c
-slang_assemble_typeinfo.obj : slang_assemble_typeinfo.c
-slang_storage.obj : slang_storage.c
-slang_assemble_assignment.obj : slang_assemble_assignment.c
-slang_compile_function.obj : slang_compile_function.c
-slang_compile_struct.obj : slang_compile_struct.c
-slang_compile_variable.obj : slang_compile_variable.c
-slang_compile_operation.obj : slang_compile_operation.c
-slang_library_noise.obj : slang_library_noise.c
-slang_link.obj : slang_link.c
-slang_export.obj : slang_export.c
-slang_analyse.obj : slang_analyse.c
-slang_library_texsample.obj : slang_library_texsample.c
diff --git a/src/mesa/state_tracker/st_atom_rasterizer.c b/src/mesa/state_tracker/st_atom_rasterizer.c
index 435d604af7..229839d8b2 100644
--- a/src/mesa/state_tracker/st_atom_rasterizer.c
+++ b/src/mesa/state_tracker/st_atom_rasterizer.c
@@ -30,7 +30,7 @@
* Keith Whitwell <keith@tungstengraphics.com>
*/
-
+#include "main/macros.h"
#include "st_context.h"
#include "st_cache.h"
#include "pipe/p_context.h"
@@ -227,8 +227,18 @@ static void update_raster_state( struct st_context *st )
/* _NEW_LINE
*/
- raster.line_width = ctx->Line.Width;
raster.line_smooth = ctx->Line.SmoothFlag;
+ if (ctx->Line.SmoothFlag) {
+ raster.line_width = CLAMP(ctx->Line.Width,
+ ctx->Const.MinLineWidthAA,
+ ctx->Const.MaxLineWidthAA);
+ }
+ else {
+ raster.line_width = CLAMP(ctx->Line.Width,
+ ctx->Const.MinLineWidth,
+ ctx->Const.MaxLineWidth);
+ }
+
raster.line_stipple_enable = ctx->Line.StippleFlag;
raster.line_stipple_pattern = ctx->Line.StipplePattern;
/* GL stipple factor is in [1,256], remap to [0, 255] here */
diff --git a/src/mesa/state_tracker/st_cache.c b/src/mesa/state_tracker/st_cache.c
index 2979e7fae5..7ee4fadc37 100644
--- a/src/mesa/state_tracker/st_cache.c
+++ b/src/mesa/state_tracker/st_cache.c
@@ -63,6 +63,8 @@ const struct cso_blend * st_cached_blend_state(struct st_context *st,
cso->data = st->pipe->create_blend_state(st->pipe, &cso->state);
if (!cso->data)
cso->data = &cso->state;
+ cso->delete_state = (cso_state_callback)st->pipe->delete_blend_state;
+ cso->context = st->pipe;
iter = cso_insert_state(st->cache, hash_key, CSO_BLEND, cso);
}
return ((struct cso_blend *)cso_hash_iter_data(iter));
@@ -82,6 +84,8 @@ st_cached_sampler_state(struct st_context *st,
cso->data = st->pipe->create_sampler_state(st->pipe, &cso->state);
if (!cso->data)
cso->data = &cso->state;
+ cso->delete_state = (cso_state_callback)st->pipe->delete_sampler_state;
+ cso->context = st->pipe;
iter = cso_insert_state(st->cache, hash_key, CSO_SAMPLER, cso);
}
return (struct cso_sampler*)(cso_hash_iter_data(iter));
@@ -103,6 +107,8 @@ st_cached_depth_stencil_alpha_state(struct st_context *st,
cso->data = st->pipe->create_depth_stencil_alpha_state(st->pipe, &cso->state);
if (!cso->data)
cso->data = &cso->state;
+ cso->delete_state = (cso_state_callback)st->pipe->delete_depth_stencil_alpha_state;
+ cso->context = st->pipe;
iter = cso_insert_state(st->cache, hash_key, CSO_DEPTH_STENCIL_ALPHA, cso);
}
return (struct cso_depth_stencil_alpha*)(cso_hash_iter_data(iter));
@@ -123,6 +129,8 @@ const struct cso_rasterizer* st_cached_rasterizer_state(
cso->data = st->pipe->create_rasterizer_state(st->pipe, &cso->state);
if (!cso->data)
cso->data = &cso->state;
+ cso->delete_state = (cso_state_callback)st->pipe->delete_rasterizer_state;
+ cso->context = st->pipe;
iter = cso_insert_state(st->cache, hash_key, CSO_RASTERIZER, cso);
}
return (struct cso_rasterizer*)(cso_hash_iter_data(iter));
@@ -143,6 +151,8 @@ st_cached_fs_state(struct st_context *st,
cso->data = st->pipe->create_fs_state(st->pipe, &cso->state);
if (!cso->data)
cso->data = &cso->state;
+ cso->delete_state = (cso_state_callback)st->pipe->delete_fs_state;
+ cso->context = st->pipe;
iter = cso_insert_state(st->cache, hash_key, CSO_FRAGMENT_SHADER, cso);
}
return (struct cso_fragment_shader*)(cso_hash_iter_data(iter));
@@ -163,8 +173,9 @@ st_cached_vs_state(struct st_context *st,
cso->data = st->pipe->create_vs_state(st->pipe, &cso->state);
if (!cso->data)
cso->data = &cso->state;
+ cso->delete_state = (cso_state_callback)st->pipe->delete_vs_state;
+ cso->context = st->pipe;
iter = cso_insert_state(st->cache, hash_key, CSO_VERTEX_SHADER, cso);
}
return (struct cso_vertex_shader*)(cso_hash_iter_data(iter));
}
-
diff --git a/src/mesa/swrast/descrip.mms b/src/mesa/swrast/descrip.mms
deleted file mode 100644
index 4d446600ba..0000000000
--- a/src/mesa/swrast/descrip.mms
+++ /dev/null
@@ -1,80 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 21 February 2006
-
-.first
- define gl [---.include.gl]
- define math [-.math]
- define swrast [-.swrast]
- define array_cache [-.array_cache]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \
- s_bitmap.c s_blend.c s_blit.c s_buffers.c s_context.c \
- s_copypix.c s_depth.c \
- s_drawpix.c s_feedback.c s_fog.c s_imaging.c s_lines.c s_logic.c \
- s_masking.c s_nvfragprog.c s_points.c s_readpix.c \
- s_span.c s_stencil.c s_texstore.c s_texcombine.c s_texfilter.c \
- s_triangle.c s_zoom.c s_atifragshader.c s_arbshader.c
-
-OBJECTS = s_aaline.obj,s_aatriangle.obj,s_accum.obj,s_alpha.obj,\
- s_bitmap.obj,s_blend.obj,s_blit.obj,s_arbshader.obj,\
- s_buffers.obj,s_context.obj,s_atifragshader.obj,\
- s_copypix.obj,s_depth.obj,s_drawpix.obj,s_feedback.obj,s_fog.obj,\
- s_imaging.obj,s_lines.obj,s_logic.obj,s_masking.obj,s_nvfragprog.obj,\
- s_points.obj,s_readpix.obj,s_span.obj,s_stencil.obj,\
- s_texstore.obj,s_texcombine.obj,s_texfilter.obj,s_triangle.obj,\
- s_zoom.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-s_atifragshader.obj : s_atifragshader.c
-s_aaline.obj : s_aaline.c
-s_aatriangle.obj : s_aatriangle.c
-s_accum.obj : s_accum.c
-s_alpha.obj : s_alpha.c
-s_bitmap.obj : s_bitmap.c
-s_blend.obj : s_blend.c
-s_blit.obj : s_blit.c
-s_buffers.obj : s_buffers.c
-s_context.obj : s_context.c
-s_copypix.obj : s_copypix.c
-s_depth.obj : s_depth.c
-s_drawpix.obj : s_drawpix.c
-s_feedback.obj : s_feedback.c
-s_fog.obj : s_fog.c
-s_imaging.obj : s_imaging.c
-s_lines.obj : s_lines.c
-s_logic.obj : s_logic.c
-s_masking.obj : s_masking.c
-s_nvfragprog.obj : s_nvfragprog.c
-s_points.obj : s_points.c
-s_readpix.obj : s_readpix.c
-s_span.obj : s_span.c
-s_stencil.obj : s_stencil.c
-s_texstore.obj : s_texstore.c
-s_texcombine.obj : s_texcombine.c
-s_texfilter.obj : s_texfilter.c
-s_triangle.obj : s_triangle.c
-s_zoom.obj : s_zoom.c
-s_arbshader.obj : s_arbshader.c
diff --git a/src/mesa/swrast_setup/descrip.mms b/src/mesa/swrast_setup/descrip.mms
deleted file mode 100644
index 0ab81c07d3..0000000000
--- a/src/mesa/swrast_setup/descrip.mms
+++ /dev/null
@@ -1,39 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
- define gl [---.include.gl]
- define math [-.math]
- define tnl [-.tnl]
- define swrast [-.swrast]
- define array_cache [-.array_cache]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = ss_context.c ss_triangle.c
-
-OBJECTS = ss_context.obj,ss_triangle.obj
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-ss_context.obj : ss_context.c
-ss_triangle.obj : ss_triangle.c
diff --git a/src/mesa/tnl/descrip.mms b/src/mesa/tnl/descrip.mms
deleted file mode 100644
index a9aed89f1d..0000000000
--- a/src/mesa/tnl/descrip.mms
+++ /dev/null
@@ -1,75 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 21 February 2006
-
-.first
- define gl [---.include.gl]
- define math [-.math]
- define shader [-.shader]
- define array_cache [-.array_cache]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = t_array_api.c t_array_import.c t_context.c \
- t_pipeline.c t_vb_fog.c t_save_api.c t_vtx_api.c \
- t_vb_light.c t_vb_normals.c t_vb_points.c t_vb_program.c \
- t_vb_render.c t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c \
- t_vtx_eval.c t_vtx_exec.c t_save_playback.c t_save_loopback.c \
- t_vertex.c t_vtx_generic.c t_vtx_x86.c t_vertex_generic.c \
- t_vb_arbprogram.c t_vp_build.c t_vb_arbshader.c
-
-OBJECTS = t_array_api.obj,t_array_import.obj,t_context.obj,\
- t_pipeline.obj,t_vb_fog.obj,t_vb_light.obj,t_vb_normals.obj,\
- t_vb_points.obj,t_vb_program.obj,t_vb_render.obj,t_vb_texgen.obj,\
- t_vb_texmat.obj,t_vb_vertex.obj,t_save_api.obj,t_vtx_api.obj,\
- t_vtx_eval.obj,t_vtx_exec.obj,t_save_playback.obj,t_save_loopback.obj,\
- t_vertex.obj,t_vtx_generic.obj,t_vtx_x86.obj,t_vertex_generic.obj,\
- t_vb_arbprogram.obj,t_vp_build.obj,t_vb_arbshader.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-t_array_api.obj : t_array_api.c
-t_array_import.obj : t_array_import.c
-t_context.obj : t_context.c
-t_pipeline.obj : t_pipeline.c
-t_vb_fog.obj : t_vb_fog.c
-t_vb_light.obj : t_vb_light.c
-t_vb_normals.obj : t_vb_normals.c
-t_vb_points.obj : t_vb_points.c
-t_vb_program.obj : t_vb_program.c
-t_vb_render.obj : t_vb_render.c
-t_vb_texgen.obj : t_vb_texgen.c
-t_vb_texmat.obj : t_vb_texmat.c
-t_vb_vertex.obj : t_vb_vertex.c
-t_save_api.obj : t_save_api.c
-t_vtx_api.obj : t_vtx_api.c
-t_vtx_eval.obj : t_vtx_eval.c
-t_vtx_exec.obj : t_vtx_exec.c
-t_save_playback.obj : t_save_playback.c
-t_save_loopback.obj : t_save_loopback.c
-t_vertex.obj : t_vertex.c
-t_vtx_x86.obj : t_vtx_x86.c
-t_vtx_generic.obj : t_vtx_generic.c
-t_vertex_generic.obj : t_vertex_generic.c
-t_vb_arbprogram.obj : t_vb_arbprogram.c
-t_vp_build.obj : t_vp_build.c
-t_vb_arbshader.obj : t_vb_arbshader.c
diff --git a/src/mesa/vbo/descrip.mms b/src/mesa/vbo/descrip.mms
deleted file mode 100644
index e00b6703aa..0000000000
--- a/src/mesa/vbo/descrip.mms
+++ /dev/null
@@ -1,60 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 7 March 2007
-
-.first
- define gl [---.include.gl]
- define math [-.math]
- define vbo [-.vbo]
- define tnl [-.tnl]
- define shader [-.shader]
- define swrast [-.swrast]
- define swrast_setup [-.swrast_setup]
-
-.include [---]mms.config
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES =vbo_context.c,vbo_exec.c,vbo_exec_api.c,vbo_exec_array.c,\
- vbo_exec_draw.c,vbo_exec_eval.c,vbo_rebase.c,vbo_save.c,\
- vbo_save_api.c,vbo_save_draw.c,vbo_save_loopback.c,\
- vbo_split.c,vbo_split_copy.c,vbo_split_inplace.c
-
-OBJECTS =vbo_context.obj,vbo_exec.obj,vbo_exec_api.obj,vbo_exec_array.obj,\
- vbo_exec_draw.obj,vbo_exec_eval.obj,vbo_rebase.obj,vbo_save.obj,\
- vbo_save_api.obj,vbo_save_draw.obj,vbo_save_loopback.obj,\
- vbo_split.obj,vbo_split_copy.obj,vbo_split_inplace.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-vbo_context.obj : vbo_context.c
-vbo_exec.obj : vbo_exec.c
-vbo_exec_api.obj : vbo_exec_api.c
-vbo_exec_array.obj : vbo_exec_array.c
-vbo_exec_draw.obj : vbo_exec_draw.c
-vbo_exec_eval.obj : vbo_exec_eval.c
-vbo_rebase.obj : vbo_rebase.c
-vbo_save.obj : vbo_save.c
-vbo_save_api.obj : vbo_save_api.c
-vbo_save_draw.obj : vbo_save_draw.c
-vbo_save_loopback.obj : vbo_save_loopback.c
-vbo_split.obj : vbo_split.c
-vbo_split_copy.obj : vbo_split_copy.c
-vbo_split_inplace.obj : vbo_split_inplace.c
diff --git a/vms/analyze_map.com b/vms/analyze_map.com
deleted file mode 100644
index d024ffcf90..0000000000
--- a/vms/analyze_map.com
+++ /dev/null
@@ -1,148 +0,0 @@
-$! Analyze Map for OpenVMS AXP
-$!
-$! Originally found in the distribution of gv
-$! http://wwwthep.physik.uni-mainz.de/~plass/gv/
-$!
-$! 1-Jul-1999 : modified to be used with $BSS$ & $READONLY sections in the
-$! map-file by J. Jansen (joukj@hrem.stm.tudelft.nl)
-$!
-$ SET SYMBOL/GENERAL/SCOPE=(NOLOCAL,NOGLOBAL)
-$ SAY := "WRITE_ SYS$OUTPUT"
-$
-$ IF F$SEARCH("''P1'") .EQS. ""
-$ THEN
-$ SAY " ANALYZE_MAP.COM: Error, no mapfile provided"
-$ EXIT_
-$ ENDIF
-$ IF "''P2'" .EQS. ""
-$ THEN
-$ SAY " ANALYZE_MAP.COM: Error, no output file provided"
-$ EXIT_
-$ ENDIF
-$
-$ LINK_TMP = F$PARSE(P2,,,"DEVICE")+F$PARSE(P2,,,"DIRECTORY")+F$PARSE(P2,,,"NAME")+".TMP"
-$
-$ SAY " checking PSECT list in ''P2'"
-$ OPEN_/READ IN 'P1'
-$ LOOP_PSECT_SEARCH:
-$ READ_/END=EOF_PSECT IN REC
-$ LOOP_PSECT_SEARCH0:
-$ if F$EXTRACT(0,5,REC) .eqs. "$DATA" .or. F$EXTRACT(0,5,REC) .eqs. -
- "$BSS$" .or. f$extract(0,10,rec) .eqs. "$READONLY$" then goto do_data
-$ if F$EXTRACT(0,14,REC) .eqs. "$READONLY_ADDR" then goto do_readonly
-$ goto LOOP_PSECT_SEARCH
-$ do_data:
-$ LAST = ""
-$ LOOP_PSECT:
-$ READ_/END=EOF_PSECT IN REC
-$ if F$EXTRACT(0,1,REC) .eqs. "$" .and. F$EXTRACT(0,5,REC) .nes. "$DATA" -
- .and. F$EXTRACT(0,5,REC) .nes. "$BSS$" .and. f$extract(0,10,rec) -
- .nes. "$READONLY$" then goto LOOP_PSECT_SEARCH0
-$ if REC - "NOPIC,OVR,REL,GBL,NOSHR,NOEXE, WRT,NOVEC" .nes. REC
-$ then
-$ J = F$LOCATE(" ",REC)
-$ S = F$EXTRACT(0,J,REC)
-$ IF S .EQS. LAST THEN GOTO LOOP_PSECT
-$ P$_'S= 1
-$ LAST = S
-$ endif
-$ if REC - "NOPIC,OVR,REL,GBL,NOSHR,NOEXE,NOWRT,NOVEC" .nes. REC
-$ then
-$ J = F$LOCATE(" ",REC)
-$ S = F$EXTRACT(0,J,REC)
-$ IF S .EQS. LAST THEN GOTO LOOP_PSECT
-$ P$_'S= 1
-$ LAST = S
-$ endif
-$ GOTO LOOP_PSECT
-$
-$ do_readonly:
-$ LAST = ""
-$ LOOP_PSECT3:
-$ READ_/END=EOF_PSECT IN REC
-$ if F$EXTRACT(0,1,REC) .eqs. "-" .or. F$EXTRACT(0,3,REC) .eqs. "NL:" then -
- goto loop_psect3
-$ if F$EXTRACT(0,1,REC) .eqs. "$" .and. F$EXTRACT(0,14,REC) .nes. -
- "$READONLY_ADDR" then goto LOOP_PSECT_SEARCH0
-$ if REC - "OCTA" .nes. REC
-$ then
-$ J = F$LOCATE(" ",REC)
-$ S = F$EXTRACT(0,J,REC)
-$ IF S .EQS. LAST THEN GOTO LOOP_PSECT3
-$ P$_'S= 1
-$ LAST = S
-$ endif
-$ GOTO LOOP_PSECT3
-$
-$ EOF_PSECT:
-$ CLOSE_ IN
-$
-$ SAY " appending list of UNIVERSAL procedures to ''P2'"
-$ SEARCH_/NOHIGH/WINDOW=(0,0) 'P1' " R-"/OUT='LINK_TMP
-$ OPEN_/READ IN 'LINK_TMP
-$ OPEN_/write OUT 'P2'
-$ WRITE_ OUT "!"
-$ WRITE_ OUT "! ### UNIVERSAL procedures and global definitions extracted from ''P1'"
-$ WRITE_ OUT "!"
-$ write_ OUT "case_sensitive=YES"
-$ LOOP_UNIVERSAL:
-$ READ_/END=EOF_UNIVERSAL IN REC
-$ J = F$LOCATE(" R-",REC)
-$ S = F$EXTRACT(J+3,F$length(rec),REC)
-$ J = F$LOCATE(" ",S)
-$ S = F$EXTRACT(0,J,S)
-$ PP$_'S= 1
-$ IF F$TYPE(P$_'S').EQS.""
-$ THEN
-$ WRITE_ OUT "symbol_vector = ("+S+" = PROCEDURE)"
-$ ELSE
-$ WRITE_ OUT "symbol_vector = ("+S+" = DATA)"
-$ ENDIF
-$ GOTO LOOP_UNIVERSAL
-$ EOF_UNIVERSAL:
-$ CLOSE_ IN
-$ CLOSE_ OUT
-$!
-$ SAY " creating PSECT list in ''P2'"
-$ OPEN_/READ IN 'P1'
-$ OPEN_/append OUT 'P2'
-$ WRITE_ OUT "!"
-$ WRITE_ OUT "! ### PSECT list extracted from ''P1'"
-$ WRITE_ OUT "!"
-$ LOOP_PSECT_SEARCH1:
-$ READ_/END=EOF_PSECT1 IN REC
-$ if F$EXTRACT(0,5,REC) .nes. "$DATA" .and. F$EXTRACT(0,5,REC) .nes. -
- "$BSS$" .and. f$extract(0,10,rec) .nes. "$READONLY$" then goto -
- LOOP_PSECT_SEARCH1
-$ LAST = ""
-$ LOOP_PSECT1:
-$ READ_/END=EOF_PSECT1 IN REC
-$ if F$EXTRACT(0,1,REC) .eqs. "$" .and. F$EXTRACT(0,5,REC) .nes. "$DATA" -
- .and. F$EXTRACT(0,5,REC) .nes. "$BSS$" .and. f$extract(0,10,rec) -
- .nes. "$READONLY$" then goto LOOP_PSECT_SEARCH1
-$ if REC - "NOPIC,OVR,REL,GBL,NOSHR,NOEXE, WRT,NOVEC" .nes. REC
-$ then
-$ J = F$LOCATE(" ",REC)
-$ S = F$EXTRACT(0,J,REC)
-$ IF S .EQS. LAST THEN GOTO LOOP_PSECT1
-$ IF F$TYPE(PP$_'S').nes."" then WRITE_ OUT "symbol_vector = (" + S + " = PSECT)"
-$ P$_'S= 1
-$ LAST = S
-$ endif
-$ if REC - "NOPIC,OVR,REL,GBL,NOSHR,NOEXE,NOWRT,NOVEC" .nes. REC
-$ then
-$ J = F$LOCATE(" ",REC)
-$ S = F$EXTRACT(0,J,REC)
-$ IF S .EQS. LAST THEN GOTO LOOP_PSECT1
-$ IF F$TYPE(PP$_'S').nes."" then WRITE_ OUT "symbol_vector = (" + S + " = PSECT)"
-$ P$_'S= 1
-$ LAST = S
-$ endif
-$ GOTO LOOP_PSECT1
-$
-$ EOF_PSECT1:
-$ CLOSE_ IN
-$ CLOSE_ OUT
-$ if f$search("''LINK_TMP'") .nes. "" then DELETE_/NOLOG/NOCONFIRM 'LINK_TMP';*
-$
-$ EXIT_
diff --git a/vms/xlib.opt b/vms/xlib.opt
deleted file mode 100644
index acae358b57..0000000000
--- a/vms/xlib.opt
+++ /dev/null
@@ -1,2 +0,0 @@
-sys$library:decw$xlibshr.exe/share
-sys$library:decw$xmulibshr.exe/share
diff --git a/vms/xlib_share.opt b/vms/xlib_share.opt
deleted file mode 100644
index ebe039f012..0000000000
--- a/vms/xlib_share.opt
+++ /dev/null
@@ -1,7 +0,0 @@
-[--.lib]libmesagl.exe/share
-[--.lib]libmesaglu.exe/share
-[--.lib]libglut.exe/share
-sys$library:decw$xlibshr.exe/share
-sys$library:decw$xmulibshr.exe/share
-sys$library:decw$xmlibshr12/share
-sys$library:decw$xtlibshrr5/share
diff --git a/winddk.py b/winddk.py
new file mode 100644
index 0000000000..3dcf9027e5
--- /dev/null
+++ b/winddk.py
@@ -0,0 +1,278 @@
+"""engine.SCons.Tool.msvc
+
+Tool-specific initialization for Microsoft Visual C/C++.
+
+There normally shouldn't be any need to import this module directly.
+It will usually be imported through the generic SCons.Tool.Tool()
+selection method.
+
+"""
+
+#
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007 The SCons Foundation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "src/engine/SCons/Tool/msvc.py 2523 2007/12/12 09:37:41 knight"
+
+import os.path
+import re
+import string
+
+import SCons.Action
+import SCons.Builder
+import SCons.Errors
+import SCons.Platform.win32
+import SCons.Tool
+import SCons.Tool.mslib
+import SCons.Tool.mslink
+import SCons.Util
+import SCons.Warnings
+
+CSuffixes = ['.c', '.C']
+CXXSuffixes = ['.cc', '.cpp', '.cxx', '.c++', '.C++']
+
+def get_winddk_paths(env, version=None):
+ """Return a 3-tuple of (INCLUDE, LIB, PATH) as the values
+ of those three environment variables that should be set
+ in order to execute the MSVC tools properly."""
+
+ WINDDKdir = None
+ exe_paths = []
+ lib_paths = []
+ include_paths = []
+
+ if 'BASEDIR' in os.environ:
+ WINDDKdir = os.environ['BASEDIR']
+ else:
+ #WINDDKdir = "C:\\WINDDK\\3790.1830"
+ WINDDKdir = "C:/WINDDK/3790.1830"
+
+ exe_paths.append( os.path.join(WINDDKdir, 'bin') )
+ exe_paths.append( os.path.join(WINDDKdir, 'bin/x86') )
+ include_paths.append( os.path.join(WINDDKdir, 'inc/wxp') )
+ lib_paths.append( os.path.join(WINDDKdir, 'lib') )
+
+ target_os = 'wxp'
+ target_cpu = 'i386'
+
+ env['SDK_INC_PATH'] = os.path.join(WINDDKdir, 'inc', target_os)
+ env['CRT_INC_PATH'] = os.path.join(WINDDKdir, 'inc/crt')
+ env['DDK_INC_PATH'] = os.path.join(WINDDKdir, 'inc/ddk', target_os)
+ env['WDM_INC_PATH'] = os.path.join(WINDDKdir, 'inc/ddk/wdm', target_os)
+
+ env['SDK_LIB_PATH'] = os.path.join(WINDDKdir, 'lib', target_os, target_cpu)
+ env['CRT_LIB_PATH'] = os.path.join(WINDDKdir, 'lib/crt', target_cpu)
+ env['DDK_LIB_PATH'] = os.path.join(WINDDKdir, 'lib', target_os, target_cpu)
+ env['WDM_LIB_PATH'] = os.path.join(WINDDKdir, 'lib', target_os, target_cpu)
+
+ include_path = string.join( include_paths, os.pathsep )
+ lib_path = string.join(lib_paths, os.pathsep )
+ exe_path = string.join(exe_paths, os.pathsep )
+ return (include_path, lib_path, exe_path)
+
+def validate_vars(env):
+ """Validate the PCH and PCHSTOP construction variables."""
+ if env.has_key('PCH') and env['PCH']:
+ if not env.has_key('PCHSTOP'):
+ raise SCons.Errors.UserError, "The PCHSTOP construction must be defined if PCH is defined."
+ if not SCons.Util.is_String(env['PCHSTOP']):
+ raise SCons.Errors.UserError, "The PCHSTOP construction variable must be a string: %r"%env['PCHSTOP']
+
+def pch_emitter(target, source, env):
+ """Adds the object file target."""
+
+ validate_vars(env)
+
+ pch = None
+ obj = None
+
+ for t in target:
+ if SCons.Util.splitext(str(t))[1] == '.pch':
+ pch = t
+ if SCons.Util.splitext(str(t))[1] == '.obj':
+ obj = t
+
+ if not obj:
+ obj = SCons.Util.splitext(str(pch))[0]+'.obj'
+
+ target = [pch, obj] # pch must be first, and obj second for the PCHCOM to work
+
+ return (target, source)
+
+def object_emitter(target, source, env, parent_emitter):
+ """Sets up the PCH dependencies for an object file."""
+
+ validate_vars(env)
+
+ parent_emitter(target, source, env)
+
+ if env.has_key('PCH') and env['PCH']:
+ env.Depends(target, env['PCH'])
+
+ return (target, source)
+
+def static_object_emitter(target, source, env):
+ return object_emitter(target, source, env,
+ SCons.Defaults.StaticObjectEmitter)
+
+def shared_object_emitter(target, source, env):
+ return object_emitter(target, source, env,
+ SCons.Defaults.SharedObjectEmitter)
+
+pch_action = SCons.Action.Action('$PCHCOM', '$PCHCOMSTR')
+pch_builder = SCons.Builder.Builder(action=pch_action, suffix='.pch',
+ emitter=pch_emitter,
+ source_scanner=SCons.Tool.SourceFileScanner)
+res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR')
+res_builder = SCons.Builder.Builder(action=res_action,
+ src_suffix='.rc',
+ suffix='.res',
+ src_builder=[],
+ source_scanner=SCons.Tool.SourceFileScanner)
+SCons.Tool.SourceFileScanner.add_scanner('.rc', SCons.Defaults.CScan)
+
+def generate(env):
+ """Add Builders and construction variables for MSVC++ to an Environment."""
+ static_obj, shared_obj = SCons.Tool.createObjBuilders(env)
+
+ for suffix in CSuffixes:
+ static_obj.add_action(suffix, SCons.Defaults.CAction)
+ shared_obj.add_action(suffix, SCons.Defaults.ShCAction)
+ static_obj.add_emitter(suffix, static_object_emitter)
+ shared_obj.add_emitter(suffix, shared_object_emitter)
+
+ for suffix in CXXSuffixes:
+ static_obj.add_action(suffix, SCons.Defaults.CXXAction)
+ shared_obj.add_action(suffix, SCons.Defaults.ShCXXAction)
+ static_obj.add_emitter(suffix, static_object_emitter)
+ shared_obj.add_emitter(suffix, shared_object_emitter)
+
+ env['CCPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Z7") or ""}'])
+ env['CCPCHFLAGS'] = SCons.Util.CLVar(['${(PCH and "/Yu%s /Fp%s"%(PCHSTOP or "",File(PCH))) or ""}'])
+ env['CCCOMFLAGS'] = '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo$TARGET $CCPCHFLAGS $CCPDBFLAGS'
+ env['CC'] = 'cl'
+ env['CCFLAGS'] = SCons.Util.CLVar('/nologo')
+ env['CFLAGS'] = SCons.Util.CLVar('')
+ env['CCCOM'] = '$CC $CFLAGS $CCFLAGS $CCCOMFLAGS'
+ env['SHCC'] = '$CC'
+ env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS')
+ env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
+ env['SHCCCOM'] = '$SHCC $SHCFLAGS $SHCCFLAGS $CCCOMFLAGS'
+ env['CXX'] = '$CC'
+ env['CXXFLAGS'] = SCons.Util.CLVar('$CCFLAGS $( /TP $)')
+ env['CXXCOM'] = '$CXX $CXXFLAGS $CCCOMFLAGS'
+ env['SHCXX'] = '$CXX'
+ env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
+ env['SHCXXCOM'] = '$SHCXX $SHCXXFLAGS $CCCOMFLAGS'
+ env['CPPDEFPREFIX'] = '/D'
+ env['CPPDEFSUFFIX'] = ''
+ env['INCPREFIX'] = '/I'
+ env['INCSUFFIX'] = ''
+# env.Append(OBJEMITTER = [static_object_emitter])
+# env.Append(SHOBJEMITTER = [shared_object_emitter])
+ env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
+
+ env['RC'] = 'rc'
+ env['RCFLAGS'] = SCons.Util.CLVar('')
+ env['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS $RCFLAGS /fo$TARGET $SOURCES'
+ env['BUILDERS']['RES'] = res_builder
+ env['OBJPREFIX'] = ''
+ env['OBJSUFFIX'] = '.obj'
+ env['SHOBJPREFIX'] = '$OBJPREFIX'
+ env['SHOBJSUFFIX'] = '$OBJSUFFIX'
+
+ try:
+ include_path, lib_path, exe_path = get_winddk_paths(env)
+
+ # since other tools can set these, we just make sure that the
+ # relevant stuff from MSVS is in there somewhere.
+ env.PrependENVPath('INCLUDE', include_path)
+ env.PrependENVPath('LIB', lib_path)
+ env.PrependENVPath('PATH', exe_path)
+ except (SCons.Util.RegError, SCons.Errors.InternalError):
+ pass
+
+ env['CFILESUFFIX'] = '.c'
+ env['CXXFILESUFFIX'] = '.cc'
+
+ env['PCHPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Yd") or ""}'])
+ env['PCHCOM'] = '$CXX $CXXFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo${TARGETS[1]} /Yc$PCHSTOP /Fp${TARGETS[0]} $CCPDBFLAGS $PCHPDBFLAGS'
+ env['BUILDERS']['PCH'] = pch_builder
+
+ env['AR'] = 'lib'
+ env['ARFLAGS'] = SCons.Util.CLVar('/nologo')
+ env['ARCOM'] = "${TEMPFILE('$AR $ARFLAGS /OUT:$TARGET $SOURCES')}"
+ env['LIBPREFIX'] = ''
+ env['LIBSUFFIX'] = '.lib'
+
+ SCons.Tool.mslink.generate(env)
+
+ # See also:
+ # - WINDDK's bin/makefile.new i386mk.inc for more info.
+ # - http://alter.org.ua/docs/nt_kernel/vc8_proj/
+ env.Append(CPPDEFINES = [
+ 'WIN32',
+ '_WINDOWS',
+ ('i386', '1'),
+ ('_X86_', '1'),
+ 'STD_CALL',
+ ('CONDITION_HANDLING', '1'),
+ ('NT_INST', '0'),
+ ('_NT1X_', '100'),
+ ('WINNT', '1'),
+ ('_WIN32_WINNT', '0x0500'), # minimum required OS version
+ ('WIN32_LEAN_AND_MEAN', '1'),
+ ('DEVL', '1'),
+ ('FPO', '1'),
+ ])
+ cflags = [
+ '/GF', # Enable String Pooling
+ '/GX-', # Disable C++ Exceptions
+ '/Zp8', # 8bytes struct member alignment
+ #'/GS-', # No Buffer Security Check
+ '/GR-', # Disable Run-Time Type Info
+ '/Gz', # __stdcall Calling convention
+ ]
+ env.Append(CFLAGS = cflags)
+ env.Append(CXXFLAGS = cflags)
+
+ env.Append(LINKFLAGS = [
+ '/DEBUG',
+ '/NODEFAULTLIB',
+ '/SUBSYSTEM:NATIVE',
+ '/INCREMENTAL:NO',
+ #'/DRIVER',
+
+ #'-subsystem:native,4.00',
+ '-base:0x10000',
+
+ '-entry:DrvEnableDriver',
+ ])
+
+ if not env.has_key('ENV'):
+ env['ENV'] = {}
+ if not env['ENV'].has_key('SystemRoot'): # required for dlls in the winsxs folders
+ env['ENV']['SystemRoot'] = SCons.Platform.win32.get_system_root()
+
+def exists(env):
+ return env.Detect('cl')
+
diff --git a/windows/VC6/mesa/gdi/gdi.dsp b/windows/VC6/mesa/gdi/gdi.dsp
deleted file mode 100644
index ef38215216..0000000000
--- a/windows/VC6/mesa/gdi/gdi.dsp
+++ /dev/null
@@ -1,211 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gdi" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=gdi - Win32 Debug x86
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "gdi.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "gdi.mak" CFG="gdi - Win32 Debug x86"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "gdi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gdi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gdi - Win32 Release x86" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "gdi - Win32 Debug x86" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "gdi - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../main" /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 mesa.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/OPENGL32.DLL" /libpath:"../mesa/Release"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Release\OPENGL32.LIB ..\..\..\..\lib copy Release\OPENGL32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Release\OPENGL32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "gdi - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FR /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 mesa.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OPENGL32.DLL" /pdbtype:sept /libpath:"../mesa/Debug"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Debug\OPENGL32.LIB ..\..\..\..\lib copy Debug\OPENGL32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Debug\OPENGL32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "gdi - Win32 Release x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "gdi___Win32_Release_x86"
-# PROP BASE Intermediate_Dir "gdi___Win32_Release_x86"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_x86"
-# PROP Intermediate_Dir "Release_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../main" /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../main" /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 mesa.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/OPENGL32.DLL" /libpath:"../mesa/Release"
-# ADD LINK32 mesa.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release_x86/OPENGL32.DLL" /libpath:"../mesa/Release_x86"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Release_x86\OPENGL32.LIB ..\..\..\..\lib copy Release_x86\OPENGL32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Release_x86\OPENGL32.DLL ..\..\..\..\progs\demos copy Release_x86\OPENGL32.DLL "C:\Documents and Settings\mjk\Pulpit\pen\noise-demo"
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "gdi - Win32 Debug x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "gdi___Win32_Debug_x86"
-# PROP BASE Intermediate_Dir "gdi___Win32_Debug_x86"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_x86"
-# PROP Intermediate_Dir "Debug_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FR /FD /GZ /c
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FR /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 mesa.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OPENGL32.DLL" /pdbtype:sept /libpath:"../mesa/Debug"
-# ADD LINK32 mesa.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug_x86/OPENGL32.DLL" /pdbtype:sept /libpath:"../mesa/Debug_x86"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Debug_x86\OPENGL32.LIB ..\..\..\..\lib copy Debug_x86\OPENGL32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Debug_x86\OPENGL32.DLL ..\..\..\..\progs\demos copy Debug_x86\OPENGL32.DLL "C:\Documents and Settings\mjk\Pulpit\pen\noise-demo"
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "gdi - Win32 Release"
-# Name "gdi - Win32 Debug"
-# Name "gdi - Win32 Release x86"
-# Name "gdi - Win32 Debug x86"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\common\driverfuncs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\windows\gdi\colors.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\common\driverfuncs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows/VC6/mesa/glu/compileDebug.txt b/windows/VC6/mesa/glu/compileDebug.txt
deleted file mode 100644
index d149302245..0000000000
--- a/windows/VC6/mesa/glu/compileDebug.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-/nologo /W2 /GX- /Zi /Od /c /TP
-/I "../../../../include"
-/I "../../../../src/glu/sgi/include"
-/I "../../../../src/glu/sgi/libnurbs/interface"
-/I "../../../../src/glu/sgi/libnurbs/internals"
-/I "../../../../src/glu/sgi/libnurbs/nurbtess"
-/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"
-/D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /D "LIBRARYBUILD"
-/Fo"Debug/" /Fd"Debug/" /GZ
-../../../../src/glu/sgi/libnurbs/interface/bezierEval.cc
-../../../../src/glu/sgi/libnurbs/interface/bezierPatch.cc
-../../../../src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc
-../../../../src/glu/sgi/libnurbs/interface/glcurveval.cc
-../../../../src/glu/sgi/libnurbs/interface/glinterface.cc
-../../../../src/glu/sgi/libnurbs/interface/glrenderer.cc
-../../../../src/glu/sgi/libnurbs/interface/glsurfeval.cc
-../../../../src/glu/sgi/libnurbs/interface/incurveeval.cc
-../../../../src/glu/sgi/libnurbs/interface/insurfeval.cc
-../../../../src/glu/sgi/libnurbs/internals/arc.cc
-../../../../src/glu/sgi/libnurbs/internals/arcsorter.cc
-../../../../src/glu/sgi/libnurbs/internals/arctess.cc
-../../../../src/glu/sgi/libnurbs/internals/backend.cc
-../../../../src/glu/sgi/libnurbs/internals/basiccrveval.cc
-../../../../src/glu/sgi/libnurbs/internals/basicsurfeval.cc
-../../../../src/glu/sgi/libnurbs/internals/bin.cc
-../../../../src/glu/sgi/libnurbs/internals/bufpool.cc
-../../../../src/glu/sgi/libnurbs/internals/cachingeval.cc
-../../../../src/glu/sgi/libnurbs/internals/ccw.cc
-../../../../src/glu/sgi/libnurbs/internals/coveandtiler.cc
-../../../../src/glu/sgi/libnurbs/internals/curve.cc
-../../../../src/glu/sgi/libnurbs/internals/curvelist.cc
-../../../../src/glu/sgi/libnurbs/internals/curvesub.cc
-../../../../src/glu/sgi/libnurbs/internals/dataTransform.cc
-../../../../src/glu/sgi/libnurbs/internals/displaylist.cc
-../../../../src/glu/sgi/libnurbs/internals/flist.cc
-../../../../src/glu/sgi/libnurbs/internals/flistsorter.cc
-../../../../src/glu/sgi/libnurbs/internals/hull.cc
-../../../../src/glu/sgi/libnurbs/internals/intersect.cc
-../../../../src/glu/sgi/libnurbs/internals/knotvector.cc
-../../../../src/glu/sgi/libnurbs/internals/mapdesc.cc
-../../../../src/glu/sgi/libnurbs/internals/mapdescv.cc
-../../../../src/glu/sgi/libnurbs/internals/maplist.cc
-../../../../src/glu/sgi/libnurbs/internals/mesher.cc
-../../../../src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc
-../../../../src/glu/sgi/libnurbs/internals/monotonizer.cc
-../../../../src/glu/sgi/libnurbs/internals/mycode.cc
-../../../../src/glu/sgi/libnurbs/internals/nurbsinterfac.cc
-../../../../src/glu/sgi/libnurbs/internals/nurbstess.cc
-../../../../src/glu/sgi/libnurbs/internals/patch.cc
-../../../../src/glu/sgi/libnurbs/internals/patchlist.cc
-../../../../src/glu/sgi/libnurbs/internals/quilt.cc
-../../../../src/glu/sgi/libnurbs/internals/reader.cc
-../../../../src/glu/sgi/libnurbs/internals/renderhints.cc
-../../../../src/glu/sgi/libnurbs/internals/slicer.cc
-../../../../src/glu/sgi/libnurbs/internals/sorter.cc
-../../../../src/glu/sgi/libnurbs/internals/splitarcs.cc
-../../../../src/glu/sgi/libnurbs/internals/subdivider.cc
-../../../../src/glu/sgi/libnurbs/internals/tobezier.cc
-../../../../src/glu/sgi/libnurbs/internals/trimline.cc
-../../../../src/glu/sgi/libnurbs/internals/trimregion.cc
-../../../../src/glu/sgi/libnurbs/internals/trimvertpool.cc
-../../../../src/glu/sgi/libnurbs/internals/uarray.cc
-../../../../src/glu/sgi/libnurbs/internals/varray.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/directedLine.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/gridWrap.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/monoChain.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/monoPolyPart.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/partitionX.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/partitionY.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/polyDBG.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/polyUtil.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/quicksort.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/rectBlock.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleComp.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/sampledLine.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/searchTree.cc
diff --git a/windows/VC6/mesa/glu/compileRelease.txt b/windows/VC6/mesa/glu/compileRelease.txt
deleted file mode 100644
index 7f41952bd5..0000000000
--- a/windows/VC6/mesa/glu/compileRelease.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-/nologo /W2 /GX- /O2 /c /TP
-/I "../../../../include"
-/I "../../../../src/glu/sgi/include"
-/I "../../../../src/glu/sgi/libnurbs/interface"
-/I "../../../../src/glu/sgi/libnurbs/internals"
-/I "../../../../src/glu/sgi/libnurbs/nurbtess"
-/D "WIN32" /D "_WINDOWS" /D "_MBCS"
-/D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /D "LIBRARYBUILD"
-/Fo"Release/"
-../../../../src/glu/sgi/libnurbs/interface/bezierEval.cc
-../../../../src/glu/sgi/libnurbs/interface/bezierPatch.cc
-../../../../src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc
-../../../../src/glu/sgi/libnurbs/interface/glcurveval.cc
-../../../../src/glu/sgi/libnurbs/interface/glinterface.cc
-../../../../src/glu/sgi/libnurbs/interface/glrenderer.cc
-../../../../src/glu/sgi/libnurbs/interface/glsurfeval.cc
-../../../../src/glu/sgi/libnurbs/interface/incurveeval.cc
-../../../../src/glu/sgi/libnurbs/interface/insurfeval.cc
-../../../../src/glu/sgi/libnurbs/internals/arc.cc
-../../../../src/glu/sgi/libnurbs/internals/arcsorter.cc
-../../../../src/glu/sgi/libnurbs/internals/arctess.cc
-../../../../src/glu/sgi/libnurbs/internals/backend.cc
-../../../../src/glu/sgi/libnurbs/internals/basiccrveval.cc
-../../../../src/glu/sgi/libnurbs/internals/basicsurfeval.cc
-../../../../src/glu/sgi/libnurbs/internals/bin.cc
-../../../../src/glu/sgi/libnurbs/internals/bufpool.cc
-../../../../src/glu/sgi/libnurbs/internals/cachingeval.cc
-../../../../src/glu/sgi/libnurbs/internals/ccw.cc
-../../../../src/glu/sgi/libnurbs/internals/coveandtiler.cc
-../../../../src/glu/sgi/libnurbs/internals/curve.cc
-../../../../src/glu/sgi/libnurbs/internals/curvelist.cc
-../../../../src/glu/sgi/libnurbs/internals/curvesub.cc
-../../../../src/glu/sgi/libnurbs/internals/dataTransform.cc
-../../../../src/glu/sgi/libnurbs/internals/displaylist.cc
-../../../../src/glu/sgi/libnurbs/internals/flist.cc
-../../../../src/glu/sgi/libnurbs/internals/flistsorter.cc
-../../../../src/glu/sgi/libnurbs/internals/hull.cc
-../../../../src/glu/sgi/libnurbs/internals/intersect.cc
-../../../../src/glu/sgi/libnurbs/internals/knotvector.cc
-../../../../src/glu/sgi/libnurbs/internals/mapdesc.cc
-../../../../src/glu/sgi/libnurbs/internals/mapdescv.cc
-../../../../src/glu/sgi/libnurbs/internals/maplist.cc
-../../../../src/glu/sgi/libnurbs/internals/mesher.cc
-../../../../src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc
-../../../../src/glu/sgi/libnurbs/internals/monotonizer.cc
-../../../../src/glu/sgi/libnurbs/internals/mycode.cc
-../../../../src/glu/sgi/libnurbs/internals/nurbsinterfac.cc
-../../../../src/glu/sgi/libnurbs/internals/nurbstess.cc
-../../../../src/glu/sgi/libnurbs/internals/patch.cc
-../../../../src/glu/sgi/libnurbs/internals/patchlist.cc
-../../../../src/glu/sgi/libnurbs/internals/quilt.cc
-../../../../src/glu/sgi/libnurbs/internals/reader.cc
-../../../../src/glu/sgi/libnurbs/internals/renderhints.cc
-../../../../src/glu/sgi/libnurbs/internals/slicer.cc
-../../../../src/glu/sgi/libnurbs/internals/sorter.cc
-../../../../src/glu/sgi/libnurbs/internals/splitarcs.cc
-../../../../src/glu/sgi/libnurbs/internals/subdivider.cc
-../../../../src/glu/sgi/libnurbs/internals/tobezier.cc
-../../../../src/glu/sgi/libnurbs/internals/trimline.cc
-../../../../src/glu/sgi/libnurbs/internals/trimregion.cc
-../../../../src/glu/sgi/libnurbs/internals/trimvertpool.cc
-../../../../src/glu/sgi/libnurbs/internals/uarray.cc
-../../../../src/glu/sgi/libnurbs/internals/varray.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/directedLine.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/gridWrap.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/monoChain.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/monoPolyPart.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/partitionX.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/partitionY.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/polyDBG.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/polyUtil.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/quicksort.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/rectBlock.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleComp.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/sampledLine.cc
-../../../../src/glu/sgi/libnurbs/nurbtess/searchTree.cc
diff --git a/windows/VC6/mesa/glu/glu.dsp b/windows/VC6/mesa/glu/glu.dsp
deleted file mode 100644
index 5f05a81dcc..0000000000
--- a/windows/VC6/mesa/glu/glu.dsp
+++ /dev/null
@@ -1,2579 +0,0 @@
-# Microsoft Developer Studio Project File - Name="glu" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=glu - Win32 Debug x86
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "glu.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "glu.mak" CFG="glu - Win32 Debug x86"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "glu - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "glu - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "glu - Win32 Release x86" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "glu - Win32 Debug x86" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 msvcrt.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Release/glucc.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/GLU32.DLL" /libpath:"../gdi/Release"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Desc=C++ Compilations
-PreLink_Cmds=cl @compileRelease.txt LIB /OUT:Release/GLUCC.LIB @objectsRelease.txt
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Release\GLU32.LIB ..\..\..\..\lib copy Release\GLU32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Release\GLU32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 msvcrtd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Debug/glucc.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/GLU32.DLL" /pdbtype:sept /libpath:"../gdi/Debug"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Desc=C++ Compilations
-PreLink_Cmds=cl @compileDebug.txt LIB /OUT:Debug/GLUCC.LIB @objectsDebug.txt
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Debug\GLU32.LIB ..\..\..\..\lib copy Debug\GLU32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "glu___Win32_Release_x86"
-# PROP BASE Intermediate_Dir "glu___Win32_Release_x86"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_x86"
-# PROP Intermediate_Dir "Release_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 msvcrt.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Release/glucc.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/GLU32.DLL" /libpath:"../gdi/Release"
-# ADD LINK32 msvcrt.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Release/glucc.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release_x86/GLU32.DLL" /libpath:"../gdi/Release_x86"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Desc=C++ Compilations
-PreLink_Cmds=cl @compileRelease.txt LIB /OUT:Release/GLUCC.LIB @objectsRelease.txt
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Release_x86\GLU32.LIB ..\..\..\..\lib copy Release_x86\GLU32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Release_x86\GLU32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "glu___Win32_Debug_x86"
-# PROP BASE Intermediate_Dir "glu___Win32_Debug_x86"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_x86"
-# PROP Intermediate_Dir "Debug_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /GZ /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 msvcrtd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Debug/glucc.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/GLU32.DLL" /pdbtype:sept /libpath:"../gdi/Debug"
-# ADD LINK32 msvcrtd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Debug/glucc.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug_x86/GLU32.DLL" /pdbtype:sept /libpath:"../gdi/Debug_x86"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PreLink_Desc=C++ Compilations
-PreLink_Cmds=cl @compileDebug.txt LIB /OUT:Debug/GLUCC.LIB @objectsDebug.txt
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Debug_x86\GLU32.LIB ..\..\..\..\lib copy Debug_x86\GLU32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Debug_x86\GLU32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "glu - Win32 Release"
-# Name "glu - Win32 Debug"
-# Name "glu - Win32 Release x86"
-# Name "glu - Win32 Debug x86"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\dict.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\error.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\geom.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\glu.def
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\glue.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\memalloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\mesh.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\mipmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\normal.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c"
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\priorityq.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\project.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\quad.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\registry.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\render.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\sweep.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\tess.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\tessmono.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\backend.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curve.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\defines.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\definitions.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\src\glu\sgi\libtess\dict-list.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\dict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\displaymode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\flist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\geom.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libutil\gluint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\include\gluos.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\gridtrimvertex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\jarcloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\memalloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\mesh.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mymath.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\normal.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsconsts.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\patch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\..\src\glu\sgi\libtess\priorityq-sort.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\priorityq.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\pwlarc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\reader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\render.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\simplemath.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\sweep.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\tess.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\tessmono.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\varray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Group "C++ files"
-
-# PROP Default_Filter ".cc"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libtess\README
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE="..\..\..\..\src\glu\sgi\libtess\alg-outline"
-
-!IF "$(CFG)" == "glu - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "glu - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\compileDebug.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\compileRelease.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\objectsDebug.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\objectsRelease.txt
-# End Source File
-# End Target
-# End Project
diff --git a/windows/VC6/mesa/glu/objectsDebug.txt b/windows/VC6/mesa/glu/objectsDebug.txt
deleted file mode 100644
index 9fdce157c4..0000000000
--- a/windows/VC6/mesa/glu/objectsDebug.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-Debug/bezierEval.obj
-Debug/bezierPatch.obj
-Debug/bezierPatchMesh.obj
-Debug/glcurveval.obj
-Debug/glinterface.obj
-Debug/glrenderer.obj
-Debug/glsurfeval.obj
-Debug/incurveeval.obj
-Debug/insurfeval.obj
-Debug/arc.obj
-Debug/arcsorter.obj
-Debug/arctess.obj
-Debug/backend.obj
-Debug/basiccrveval.obj
-Debug/basicsurfeval.obj
-Debug/bin.obj
-Debug/bufpool.obj
-Debug/cachingeval.obj
-Debug/ccw.obj
-Debug/coveandtiler.obj
-Debug/curve.obj
-Debug/curvelist.obj
-Debug/curvesub.obj
-Debug/dataTransform.obj
-Debug/displaylist.obj
-Debug/flist.obj
-Debug/flistsorter.obj
-Debug/hull.obj
-Debug/intersect.obj
-Debug/knotvector.obj
-Debug/mapdesc.obj
-Debug/mapdescv.obj
-Debug/maplist.obj
-Debug/mesher.obj
-Debug/monoTriangulationBackend.obj
-Debug/monotonizer.obj
-Debug/mycode.obj
-Debug/nurbsinterfac.obj
-Debug/nurbstess.obj
-Debug/patch.obj
-Debug/patchlist.obj
-Debug/quilt.obj
-Debug/reader.obj
-Debug/renderhints.obj
-Debug/slicer.obj
-Debug/sorter.obj
-Debug/splitarcs.obj
-Debug/subdivider.obj
-Debug/tobezier.obj
-Debug/trimline.obj
-Debug/trimregion.obj
-Debug/trimvertpool.obj
-Debug/uarray.obj
-Debug/varray.obj
-Debug/directedLine.obj
-Debug/gridWrap.obj
-Debug/monoChain.obj
-Debug/monoPolyPart.obj
-Debug/monoTriangulation.obj
-Debug/partitionX.obj
-Debug/partitionY.obj
-Debug/polyDBG.obj
-Debug/polyUtil.obj
-Debug/primitiveStream.obj
-Debug/quicksort.obj
-Debug/rectBlock.obj
-Debug/sampleComp.obj
-Debug/sampleCompBot.obj
-Debug/sampleCompRight.obj
-Debug/sampleCompTop.obj
-Debug/sampleMonoPoly.obj
-Debug/sampledLine.obj
-Debug/searchTree.obj
diff --git a/windows/VC6/mesa/glu/objectsRelease.txt b/windows/VC6/mesa/glu/objectsRelease.txt
deleted file mode 100644
index 2d1b384db8..0000000000
--- a/windows/VC6/mesa/glu/objectsRelease.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-Release/bezierEval.obj
-Release/bezierPatch.obj
-Release/bezierPatchMesh.obj
-Release/glcurveval.obj
-Release/glinterface.obj
-Release/glrenderer.obj
-Release/glsurfeval.obj
-Release/incurveeval.obj
-Release/insurfeval.obj
-Release/arc.obj
-Release/arcsorter.obj
-Release/arctess.obj
-Release/backend.obj
-Release/basiccrveval.obj
-Release/basicsurfeval.obj
-Release/bin.obj
-Release/bufpool.obj
-Release/cachingeval.obj
-Release/ccw.obj
-Release/coveandtiler.obj
-Release/curve.obj
-Release/curvelist.obj
-Release/curvesub.obj
-Release/dataTransform.obj
-Release/displaylist.obj
-Release/flist.obj
-Release/flistsorter.obj
-Release/hull.obj
-Release/intersect.obj
-Release/knotvector.obj
-Release/mapdesc.obj
-Release/mapdescv.obj
-Release/maplist.obj
-Release/mesher.obj
-Release/monoTriangulationBackend.obj
-Release/monotonizer.obj
-Release/mycode.obj
-Release/nurbsinterfac.obj
-Release/nurbstess.obj
-Release/patch.obj
-Release/patchlist.obj
-Release/quilt.obj
-Release/reader.obj
-Release/renderhints.obj
-Release/slicer.obj
-Release/sorter.obj
-Release/splitarcs.obj
-Release/subdivider.obj
-Release/tobezier.obj
-Release/trimline.obj
-Release/trimregion.obj
-Release/trimvertpool.obj
-Release/uarray.obj
-Release/varray.obj
-Release/directedLine.obj
-Release/gridWrap.obj
-Release/monoChain.obj
-Release/monoPolyPart.obj
-Release/monoTriangulation.obj
-Release/partitionX.obj
-Release/partitionY.obj
-Release/polyDBG.obj
-Release/polyUtil.obj
-Release/primitiveStream.obj
-Release/quicksort.obj
-Release/rectBlock.obj
-Release/sampleComp.obj
-Release/sampleCompBot.obj
-Release/sampleCompRight.obj
-Release/sampleCompTop.obj
-Release/sampleMonoPoly.obj
-Release/sampledLine.obj
-Release/searchTree.obj
diff --git a/windows/VC6/mesa/mesa.dsw b/windows/VC6/mesa/mesa.dsw
deleted file mode 100644
index a6da850c1c..0000000000
--- a/windows/VC6/mesa/mesa.dsw
+++ /dev/null
@@ -1,74 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "gdi"=.\gdi\gdi.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mesa
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "glu"=.\glu\glu.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name gdi
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mesa"=.\mesa\mesa.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "osmesa"=.\osmesa\osmesa.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name gdi
- End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows/VC6/mesa/mesa/mesa.dsp b/windows/VC6/mesa/mesa/mesa.dsp
deleted file mode 100644
index 5a2f724b6a..0000000000
--- a/windows/VC6/mesa/mesa/mesa.dsp
+++ /dev/null
@@ -1,1582 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mesa" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=mesa - Win32 Debug x86
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mesa.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mesa.mak" CFG="mesa - Win32 Debug x86"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mesa - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "mesa - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "mesa - Win32 Release x86" (based on "Win32 (x86) Static Library")
-!MESSAGE "mesa - Win32 Debug x86" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mesa - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /YX /FD /Zm1000 /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /Fr /FD /GZ /Zm1000 /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Release x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "mesa___Win32_Release_x86"
-# PROP BASE Intermediate_Dir "mesa___Win32_Release_x86"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_x86"
-# PROP Intermediate_Dir "Release_x86"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /YX /FD /Zm1000 /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /D "SLANG_X86" /YX /FD /Zm1000 /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Debug x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "mesa___Win32_Debug_x86"
-# PROP BASE Intermediate_Dir "mesa___Win32_Debug_x86"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_x86"
-# PROP Intermediate_Dir "Debug_x86"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /Fr /FD /GZ /Zm1000 /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /D "SLANG_X86" /Fr /FD /GZ /Zm1000 /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "mesa - Win32 Release"
-# Name "mesa - Win32 Debug"
-# Name "mesa - Win32 Release x86"
-# Name "mesa - Win32 Debug x86"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\array_cache\ac_context.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\array_cache\ac_import.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\accum.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_arrayelt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_loopback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_noop.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_validate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\arrayobj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\arbprogparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\arbprogram.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\atifragshader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\attrib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\blend.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\bufferobj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\buffers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\clip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\colortab.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\context.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\convolve.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\debug.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\depth.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\depthstencil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\dispatch.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\dlist.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\drawpix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\enable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\enums.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\eval.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\execmem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\extensions.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\fbobject.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\feedback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\fog.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\framebuffer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\get.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\getstring.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glthread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar.c
-
-!IF "$(CFG)" == "mesa - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\hash.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\hint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\histogram.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\image.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\imports.c
-
-!IF "$(CFG)" == "mesa - Win32 Release"
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Release x86"
-
-# ADD CPP /YX
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Debug x86"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\light.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\lines.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_debug_clip.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_debug_norm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_debug_xform.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_eval.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_matrix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_translate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_vector.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_xform.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\matrix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\mipmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\mm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvfragparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvprogram.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvvertexec.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvvertparse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\occlude.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\pixel.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\points.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\polygon.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\program.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\rastpos.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\rbadaptors.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\renderbuffer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_aaline.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_aatriangle.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_accum.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_alpha.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_arbshader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_atifragshader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_bitmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_blend.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_blit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_buffers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_context.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_copypix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_depth.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_drawpix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_feedback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_fog.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_imaging.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_lines.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_logic.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_masking.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_nvfragprog.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_points.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_readpix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_span.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_stencil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_texcombine.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_texfilter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_texstore.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_triangle.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_zoom.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\shaderobjects.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\shaderobjects_3dlabs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_analyse.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_function.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_operation.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_struct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_execute.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_execute_x86.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_export.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_library_noise.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_library_texsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_link.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_preprocess.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_storage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_utility.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\ss_context.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\ss_triangle.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\state.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\stencil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_array_api.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_array_import.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_context.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_pipeline.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_save_loopback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_save_playback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_arbprogram.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_arbshader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_cull.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_fog.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_light.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_normals.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_points.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_program.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_render.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_texgen.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_texmat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_vertex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vertex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vertex_generic.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vp_build.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_api.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_eval.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_exec.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_generic.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texcompress.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texcompress_fxt1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texcompress_s3tc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texenvprogram.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texformat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\teximage.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texobj.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texrender.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texstate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texstore.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\varray.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\vsnprintf.c
-
-!IF "$(CFG)" == "mesa - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Release x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\vtxfmt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\x86\rtasm\x86sse.c
-
-!IF "$(CFG)" == "mesa - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Release x86"
-
-!ELSEIF "$(CFG)" == "mesa - Win32 Debug x86"
-
-# PROP BASE Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\array_cache\ac_context.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\array_cache\acache.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\accum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_arrayelt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_eval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_loopback.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_noop.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\api_validate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\arrayobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\arbprogparse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\arbprogram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\arbprogram_syn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\atifragshader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\attrib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\bitset.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\blend.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\bufferobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\buffers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\clip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\colormac.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\colortab.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\context.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\convolve.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\dd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\depth.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\depthstencil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\dlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\drawpix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\enable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\enums.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\eval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\extensions.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\fbobject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\feedback.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\fog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\framebuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\get.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glapi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glapioffsets.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glapitable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glapitemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\glheader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glprocs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\glapi\glthread.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar_mesa.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar_syn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\hash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\hint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\histogram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\image.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\imports.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\light.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\lines.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_clip_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_copy_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_debug_util.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_dotprod_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_eval.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_matrix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_norm_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_trans_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_translate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_vector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_xform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\m_xform_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\macros.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\math\mathmod.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\matrix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\mm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\mtypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvfragparse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvfragprog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvprogram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvvertexec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvvertparse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\nvvertprog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\occlude.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\pixel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\points.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\polygon.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\program.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\rastpos.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\rbadaptors.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\renderbuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_aaline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_aalinetemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_aatriangle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_aatritemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_accum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_alpha.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_arbshader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_atifragshader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_blend.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_context.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_depth.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_drawpix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_feedback.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_fog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_lines.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_linetemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_logic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_masking.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_nvfragprog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_points.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_pointtemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_span.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_spantemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_stencil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_texcombine.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_texfilter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_triangle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_trispan.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_tritemp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\s_zoom.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\shaderobjects.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\shaderobjects_3dlabs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\simple_list.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_analyse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_function.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_operation.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_struct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_execute.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_export.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_library_noise.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_library_texsample.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_link.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_mesa.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_preprocess.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_storage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_utility.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\ss_context.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\ss_triangle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\ss_tritmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\ss_vb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\state.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\stencil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast\swrast.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\swrast_setup\swrast_setup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_array_api.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_array_import.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_context.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_pipeline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_save_api.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_arbprogram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_lighttmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vb_rendertmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vertex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vp_build.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\t_vtx_api.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texcompress.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texenvprogram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texformat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texformat_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\teximage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texrender.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texstate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\texstore.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\tnl\tnl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\shader\slang\traverse_wrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\varray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\vtxfmt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\main\vtxfmt_tmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\x86\rtasm\x86sse.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/windows/VC6/mesa/osmesa/osmesa.dsp b/windows/VC6/mesa/osmesa/osmesa.dsp
deleted file mode 100644
index 0dd5cd4ac7..0000000000
--- a/windows/VC6/mesa/osmesa/osmesa.dsp
+++ /dev/null
@@ -1,195 +0,0 @@
-# Microsoft Developer Studio Project File - Name="osmesa" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=osmesa - Win32 Debug x86
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "osmesa.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "osmesa.mak" CFG="osmesa - Win32 Debug x86"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "osmesa - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "osmesa - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "osmesa - Win32 Release x86" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "osmesa - Win32 Debug x86" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "osmesa - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 opengl32.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/OSMESA32.DLL" /libpath:"../gdi/Release"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Release\OSMESA32.LIB ..\..\..\..\lib copy Release\OSMESA32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Release\OSMESA32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "osmesa - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 opengl32.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OSMESA32.DLL" /pdbtype:sept /libpath:"../gdi/Debug"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Debug\OSMESA32.LIB ..\..\..\..\lib copy Debug\OSMESA32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Debug\OSMESA32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "osmesa - Win32 Release x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "osmesa___Win32_Release_x86"
-# PROP BASE Intermediate_Dir "osmesa___Win32_Release_x86"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_x86"
-# PROP Intermediate_Dir "Release_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 opengl32.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/OSMESA32.DLL" /libpath:"../gdi/Release"
-# ADD LINK32 opengl32.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release_x86/OSMESA32.DLL" /libpath:"../gdi/Release_x86"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Release_x86\OSMESA32.LIB ..\..\..\..\lib copy Release_x86\OSMESA32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Release_x86\OSMESA32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "osmesa - Win32 Debug x86"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "osmesa___Win32_Debug_x86"
-# PROP BASE Intermediate_Dir "osmesa___Win32_Debug_x86"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_x86"
-# PROP Intermediate_Dir "Debug_x86"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /GZ /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 opengl32.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OSMESA32.DLL" /pdbtype:sept /libpath:"../gdi/Debug"
-# ADD LINK32 opengl32.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OSMESA32.DLL" /pdbtype:sept /libpath:"../gdi/Debug_x86"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Debug_x86\OSMESA32.LIB ..\..\..\..\lib copy Debug_x86\OSMESA32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Debug_x86\OSMESA32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "osmesa - Win32 Release"
-# Name "osmesa - Win32 Debug"
-# Name "osmesa - Win32 Release x86"
-# Name "osmesa - Win32 Debug x86"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\common\driverfuncs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\osmesa\osmesa.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\mesa\drivers\osmesa\osmesa.def
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows/VC6/progs/demos/gears.dsp b/windows/VC6/progs/demos/gears.dsp
deleted file mode 100644
index af6b3a8793..0000000000
--- a/windows/VC6/progs/demos/gears.dsp
+++ /dev/null
@@ -1,114 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gears" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gears - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "gears.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "gears.mak" CFG="gears - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "gears - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gears - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "gears - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glut32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../glut/Release"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Release\gears.exe ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "gears - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glut32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../glut/Debug"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Debug\gears.exe ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "gears - Win32 Release"
-# Name "gears - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\progs\demos\gears.c
-# ADD CPP /I "../../../../include"
-# SUBTRACT CPP /I "../../../../../include"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows/VC6/progs/glut/glut.dsp b/windows/VC6/progs/glut/glut.dsp
deleted file mode 100644
index 04fb886c05..0000000000
--- a/windows/VC6/progs/glut/glut.dsp
+++ /dev/null
@@ -1,333 +0,0 @@
-# Microsoft Developer Studio Project File - Name="glut" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=glut - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "glut.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "glut.mak" CFG="glut - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "glut - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "glut - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "glut - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLUT_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_DLL" /D "_USRDLL" /D "GLUT_EXPORTS" /D "MESA" /D "BUILD_GL32" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 opengl32.lib glu32.lib winmm.lib msvcrt.lib oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/GLUT32.DLL" /libpath:"../../mesa/Release"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Release\GLUT32.LIB ..\..\..\..\lib copy Release\GLUT32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Release\GLUT32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ELSEIF "$(CFG)" == "glut - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLUT_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_DLL" /D "_USRDLL" /D "GLUT_EXPORTS" /D "MESA" /D "BUILD_GL32" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 winmm.lib msvcrtd.lib oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/GLUT32.DLL" /pdbtype:sept /libpath:"../../mesa/Debug"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib copy Debug\GLUT32.LIB ..\..\..\..\lib copy Debug\GLUT32.DLL ..\..\..\..\lib if exist ..\..\..\..\progs\demos copy Debug\GLUT32.DLL ..\..\..\..\progs\demos
-# End Special Build Tool
-
-!ENDIF
-
-# Begin Target
-
-# Name "glut - Win32 Release"
-# Name "glut - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_8x13.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_9x15.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_bitmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_bwidth.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_cindex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_cmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_cursor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_dials.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_dstr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_event.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_ext.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_fbc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_fullscrn.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_gamemode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_get.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_hel10.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_hel12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_hel18.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_init.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_input.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_joy.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_key.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_keyctrl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_keyup.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_mesa.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_modifier.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_mroman.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_overlay.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_roman.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_shapes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_space.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_stroke.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_swap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_swidth.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_tablet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_teapot.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_tr10.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_tr24.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_vidresize.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_warp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_win.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glut_winmisc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_glx.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_menu.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_winproc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_x11.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glutbitmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glutint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glutstroke.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\glutwin32.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\stroke.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_glx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\glut\glx\win32_x11.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/windows/VC6/progs/progs.dsw b/windows/VC6/progs/progs.dsw
deleted file mode 100644
index d220455e64..0000000000
--- a/windows/VC6/progs/progs.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "gears"=.\demos\gears.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "glut"=.\glut\glut.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows/VC7/mesa/gdi/gdi.vcproj b/windows/VC7/mesa/gdi/gdi.vcproj
deleted file mode 100644
index 82de75dc5d..0000000000
--- a/windows/VC7/mesa/gdi/gdi.vcproj
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.00"
- Name="gdi"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/gdi.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="mesa.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"
- OutputFile="Debug/OPENGL32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="../mesa/Debug"
- IgnoreAllDefaultLibraries="TRUE"
- ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug/OPENGL32.pdb"
- ImportLibrary=".\Debug/OPENGL32.lib"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/gdi.tlb"/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Debug\OPENGL32.LIB ..\..\..\..\lib
-copy Debug\OPENGL32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Debug\OPENGL32.DLL ..\..\..\..\progs\demos
-"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
- StringPooling="TRUE"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
- PrecompiledHeaderFile=".\Release/gdi.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="mesa.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"
- OutputFile="Release/OPENGL32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="../mesa/Release"
- IgnoreAllDefaultLibraries="TRUE"
- ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
- ProgramDatabaseFile=".\Release/OPENGL32.pdb"
- ImportLibrary=".\Release/OPENGL32.lib"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\Release/gdi.tlb"/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Release\OPENGL32.LIB ..\..\..\..\lib
-copy Release\OPENGL32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Release\OPENGL32.DLL ..\..\..\..\progs\demos
-"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
- </Configurations>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h">
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/VC7/mesa/glu/glu.vcproj b/windows/VC7/mesa/glu/glu.vcproj
deleted file mode 100644
index e0c481e011..0000000000
--- a/windows/VC7/mesa/glu/glu.vcproj
+++ /dev/null
@@ -1,752 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.00"
- Name="glu"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD"
- StringPooling="TRUE"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
- PrecompiledHeaderFile=".\Release/glu.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="msvcrt.lib winmm.lib odbc32.lib odbccp32.lib opengl32.lib"
- OutputFile="Release/GLU32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="../gdi/Release"
- IgnoreAllDefaultLibraries="TRUE"
- ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
- ProgramDatabaseFile=".\Release/GLU32.pdb"
- ImportLibrary=".\Release/GLU32.lib"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\Release/glu.tlb"/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Release\GLU32.LIB ..\..\..\..\lib
-copy Release\GLU32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Release\GLU32.DLL ..\..\..\..\progs\demos
-"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/glu.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="msvcrtd.lib winmm.lib odbc32.lib odbccp32.lib opengl32.lib"
- OutputFile="Debug/GLU32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="../gdi/Debug"
- IgnoreAllDefaultLibraries="TRUE"
- ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug/GLU32.pdb"
- ImportLibrary=".\Debug/GLU32.lib"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/glu.tlb"/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Debug\GLU32.LIB ..\..\..\..\lib
-copy Debug\GLU32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
-"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
- </Configurations>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\dict.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\error.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\geom.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\glu.def">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\glue.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\memalloc.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\mesh.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\mipmap.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\normal.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c">
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\project.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\quad.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\registry.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\render.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\sweep.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\tess.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\tessmono.c">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\defines.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\definitions.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\dict-list.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\dict.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaymode.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\geom.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\gluint.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\include\gluos.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridtrimvertex.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\jarcloc.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\memalloc.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\mesh.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mymath.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\normal.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsconsts.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-sort.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\pwlarc.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\render.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\simplemath.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\sweep.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\tess.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\tessmono.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertex.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\types.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h">
- </File>
- </Filter>
- <Filter
- Name="C++ files"
- Filter=".cc">
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\README">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc">
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc">
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
- </Filter>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\alg-outline">
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/VC7/mesa/mesa.sln b/windows/VC7/mesa/mesa.sln
deleted file mode 100644
index ada5568f48..0000000000
--- a/windows/VC7/mesa/mesa.sln
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcproj", "{A1B24907-E196-4826-B6AF-26723629B633}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glu", "glu\glu.vcproj", "{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcproj", "{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- ConfigName.0 = Debug
- ConfigName.1 = Release
- EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
- {A1B24907-E196-4826-B6AF-26723629B633}.0 = {2120C974-2717-4709-B44F-D6E6D0A56448}
- {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.0 = {A1B24907-E196-4826-B6AF-26723629B633}
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {A1B24907-E196-4826-B6AF-26723629B633}.Debug.ActiveCfg = Debug|Win32
- {A1B24907-E196-4826-B6AF-26723629B633}.Debug.Build.0 = Debug|Win32
- {A1B24907-E196-4826-B6AF-26723629B633}.Release.ActiveCfg = Release|Win32
- {A1B24907-E196-4826-B6AF-26723629B633}.Release.Build.0 = Release|Win32
- {2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug.ActiveCfg = Debug|Win32
- {2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug.Build.0 = Debug|Win32
- {2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release.ActiveCfg = Release|Win32
- {2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release.Build.0 = Release|Win32
- {2120C974-2717-4709-B44F-D6E6D0A56448}.Debug.ActiveCfg = Debug|Win32
- {2120C974-2717-4709-B44F-D6E6D0A56448}.Debug.Build.0 = Debug|Win32
- {2120C974-2717-4709-B44F-D6E6D0A56448}.Release.ActiveCfg = Release|Win32
- {2120C974-2717-4709-B44F-D6E6D0A56448}.Release.Build.0 = Release|Win32
- {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug.ActiveCfg = Debug|Win32
- {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug.Build.0 = Debug|Win32
- {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release.ActiveCfg = Release|Win32
- {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj
deleted file mode 100644
index 668c6fbb81..0000000000
--- a/windows/VC7/mesa/mesa/mesa.vcproj
+++ /dev/null
@@ -1,1114 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.00"
- Name="mesa"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/Zm1000 "
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"
- PreprocessorDefinitions="NDEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"
- StringPooling="TRUE"
- RuntimeLibrary="4"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\Release/mesa.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile=".\Release\mesa.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/Zm1000 "
- Optimization="0"
- AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"
- PreprocessorDefinitions="_DEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"
- BasicRuntimeChecks="3"
- RuntimeLibrary="5"
- PrecompiledHeaderFile=".\Debug/mesa.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile=".\Debug\mesa.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- </Configuration>
- </Configurations>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- <File
- RelativePath="..\..\..\..\src\mesa\array_cache\ac_context.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\array_cache\ac_import.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\accum.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_arrayelt.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_loopback.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_noop.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_validate.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\arrayobj.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\arbprogram.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\atifragshader.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\attrib.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\blend.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\bufferobj.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\buffers.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\clip.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\colortab.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\context.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\convolve.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\debug.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\depth.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\depthstencil.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\dispatch.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\dlist.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\drawpix.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\enable.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\enums.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\eval.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\execmem.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\extensions.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\fbobject.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\feedback.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\fog.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\framebuffer.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\get.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\getstring.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glapi.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glthread.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.c">
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\hash.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\hint.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\histogram.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\image.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\imports.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\light.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\lines.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_debug_clip.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_debug_norm.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_debug_xform.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_eval.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_matrix.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_translate.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_vector.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_xform.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\matrix.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\mipmap.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\mm.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvprogram.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvvertexec.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\occlude.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\pixel.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\points.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\polygon.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\program.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\rastpos.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\rbadaptors.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\renderbuffer.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_aaline.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_aatriangle.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_accum.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_arbshader.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_bitmap.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_blend.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_blit.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_buffers.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_context.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_copypix.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_depth.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_drawpix.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_feedback.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_fog.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_imaging.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_lines.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_logic.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_masking.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_nvfragprog.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_points.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_readpix.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_span.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_texstore.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\shaderobjects.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\shaderobjects_3dlabs.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_analyse.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_function.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_execute.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_execute_x86.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_export.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_texsample.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\state.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\stencil.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_array_api.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_array_import.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_context.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cull.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_fog.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_light.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_normals.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_points.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_program.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_render.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_texgen.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_texmat.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_vertex.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vertex.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vertex_generic.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_api.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_eval.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_exec.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_generic.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texcompress.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texcompress_fxt1.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texcompress_s3tc.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texenvprogram.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texformat.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\teximage.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texobj.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texrender.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texstate.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texstore.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\varray.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\vsnprintf.c">
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\vtxfmt.c">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
- <File
- RelativePath="..\..\..\..\src\mesa\array_cache\ac_context.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\array_cache\acache.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\accum.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_arrayelt.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_eval.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_loopback.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_noop.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_validate.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\arbprogram.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\arbprogram_syn.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\atifragshader.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\attrib.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\blend.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\bufferobj.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\buffers.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\clip.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\colormac.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\colortab.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\config.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\context.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\convolve.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\dd.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\debug.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\depth.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\depthstencil.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\dlist.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\drawpix.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\enable.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\enums.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\eval.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\extensions.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\fbobject.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\feedback.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\fog.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\framebuffer.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\get.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glapi.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glapioffsets.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glapitable.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glapitemp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\glheader.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glprocs.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glthread.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_syn.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\hash.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\hint.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\histogram.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\image.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\imports.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\light.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\lines.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_clip_tmp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_copy_tmp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_debug.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_debug_util.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_dotprod_tmp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_eval.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_matrix.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_norm_tmp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_trans_tmp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_translate.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_vector.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_xform.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_xform_tmp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\macros.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\mathmod.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\matrix.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\mm.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\mtypes.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvfragprog.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvprogram.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvvertexec.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvvertprog.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\occlude.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\pixel.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\points.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\polygon.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\program.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\rastpos.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\rbadaptors.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\renderbuffer.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_aaline.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_aalinetemp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_aatriangle.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_aatritemp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_accum.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_blend.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_context.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_depth.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_drawpix.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_feedback.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_fog.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_lines.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_linetemp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_logic.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_masking.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_nvfragprog.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_points.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_pointtemp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_span.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_spantemp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_trispan.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_tritemp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\shaderobjects.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\shaderobjects_3dlabs.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\simple_list.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_execute.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mesa.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_triangle.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_tritmp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_vb.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\state.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\stencil.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\swrast.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\swrast_setup.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_array_api.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_array_import.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_context.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_save_api.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_arbprogram.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_lighttmp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_rendertmp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vertex.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_api.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texcompress.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texenvprogram.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texformat.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texformat_tmp.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\teximage.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texobj.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texrender.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texstate.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texstore.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\tnl.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\traverse_wrap.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\varray.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\version.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\vtxfmt.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\vtxfmt_tmp.h">
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/VC7/mesa/osmesa/osmesa.vcproj b/windows/VC7/mesa/osmesa/osmesa.vcproj
deleted file mode 100644
index 266aff509f..0000000000
--- a/windows/VC7/mesa/osmesa/osmesa.vcproj
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.00"
- Name="osmesa"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"
- StringPooling="TRUE"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
- PrecompiledHeaderFile=".\Release/osmesa.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="opengl32.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"
- OutputFile="Release/OSMESA32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="../gdi/Release"
- IgnoreAllDefaultLibraries="TRUE"
- ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
- ProgramDatabaseFile=".\Release/OSMESA32.pdb"
- ImportLibrary=".\Release/OSMESA32.lib"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\Release/osmesa.tlb"/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Release\OSMESA32.LIB ..\..\..\..\lib
-copy Release\OSMESA32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Release\OSMESA32.DLL ..\..\..\..\progs\demos
-"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/osmesa.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="opengl32.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"
- OutputFile="Debug/OSMESA32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="../gdi/Debug"
- IgnoreAllDefaultLibraries="TRUE"
- ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug/OSMESA32.pdb"
- ImportLibrary=".\Debug/OSMESA32.lib"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/osmesa.tlb"/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Debug\OSMESA32.LIB ..\..\..\..\lib
-copy Debug\OSMESA32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Debug\OSMESA32.DLL ..\..\..\..\progs\demos
-"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
- </Configurations>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\osmesa\osmesa.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/VC7/progs/demos/gears.vcproj b/windows/VC7/progs/demos/gears.vcproj
deleted file mode 100644
index 9880b2e080..0000000000
--- a/windows/VC7/progs/demos/gears.vcproj
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.00"
- Name="gears"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="5"
- PrecompiledHeaderFile=".\Debug/gears.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"
- OutputFile=".\Debug/gears.exe"
- LinkIncremental="2"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="../glut/Debug"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug/gears.pdb"
- SubSystem="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/gears.tlb"/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy Debug\gears.exe ..\..\..\..\progs\demos"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../../include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
- StringPooling="TRUE"
- RuntimeLibrary="4"
- EnableFunctionLevelLinking="TRUE"
- PrecompiledHeaderFile=".\Release/gears.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"
- OutputFile=".\Release/gears.exe"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="../glut/Release"
- ProgramDatabaseFile=".\Release/gears.pdb"
- SubSystem="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/gears.tlb"/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy Release\gears.exe ..\..\..\..\progs\demos"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
- </Configurations>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- <File
- RelativePath="..\..\..\..\progs\demos\gears.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""/>
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/VC7/progs/glut/glut.vcproj b/windows/VC7/progs/glut/glut.vcproj
deleted file mode 100644
index 2d0dd351ce..0000000000
--- a/windows/VC7/progs/glut/glut.vcproj
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.00"
- Name="glut"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../include"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/glut.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="winmm.lib msvcrtd.lib oldnames.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib"
- OutputFile="Debug/GLUT32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="../../mesa/Debug"
- IgnoreAllDefaultLibraries="TRUE"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug/GLUT32.pdb"
- ImportLibrary=".\Debug/GLUT32.lib"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/glut.tlb"/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Debug\GLUT32.LIB ..\..\..\..\lib
-copy Debug\GLUT32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Debug\GLUT32.DLL ..\..\..\..\progs\demos
-"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../../include"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32"
- StringPooling="TRUE"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
- PrecompiledHeaderFile=".\Release/glut.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="opengl32.lib glu32.lib winmm.lib msvcrt.lib oldnames.lib odbc32.lib odbccp32.lib"
- OutputFile="Release/GLUT32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="../../mesa/Release"
- IgnoreAllDefaultLibraries="TRUE"
- ProgramDatabaseFile=".\Release/GLUT32.pdb"
- ImportLibrary=".\Release/GLUT32.lib"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\Release/glut.tlb"/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Release\GLUT32.LIB ..\..\..\..\lib
-copy Release\GLUT32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Release\GLUT32.DLL ..\..\..\..\progs\demos
-"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
- </Configurations>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_8x13.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_9x15.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_bitmap.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_bwidth.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_cindex.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_cmap.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_cursor.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_dials.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_dstr.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_event.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_ext.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_fbc.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_fullscrn.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_gamemode.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_get.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_hel10.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_hel12.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_hel18.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_init.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_input.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_joy.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_key.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_keyctrl.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_keyup.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_mesa.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_modifier.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_mroman.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_overlay.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_roman.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_shapes.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_space.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_stroke.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_swap.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_swidth.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_tablet.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_teapot.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_tr10.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_tr24.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_util.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_vidresize.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_warp.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_win.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_winmisc.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_glx.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_menu.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_util.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_winproc.c">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_x11.c">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
- <File
- RelativePath="..\..\..\..\src\glut\glx\glutbitmap.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glutint.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glutstroke.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glutwin32.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\stroke.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_glx.h">
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_x11.h">
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/VC7/progs/progs.sln b/windows/VC7/progs/progs.sln
deleted file mode 100644
index d94293e316..0000000000
--- a/windows/VC7/progs/progs.sln
+++ /dev/null
@@ -1,27 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gears", "demos\gears.vcproj", "{3A7B0671-10F8-45D1-B012-F6D650F817CE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glut", "glut\glut.vcproj", "{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}"
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- ConfigName.0 = Debug
- ConfigName.1 = Release
- EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {3A7B0671-10F8-45D1-B012-F6D650F817CE}.Debug.ActiveCfg = Debug|Win32
- {3A7B0671-10F8-45D1-B012-F6D650F817CE}.Debug.Build.0 = Debug|Win32
- {3A7B0671-10F8-45D1-B012-F6D650F817CE}.Release.ActiveCfg = Release|Win32
- {3A7B0671-10F8-45D1-B012-F6D650F817CE}.Release.Build.0 = Release|Win32
- {0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Debug.ActiveCfg = Debug|Win32
- {0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Debug.Build.0 = Debug|Win32
- {0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Release.ActiveCfg = Release|Win32
- {0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
diff --git a/windows/VC8/mesa/gdi/gdi.vcproj b/windows/VC8/mesa/gdi/gdi.vcproj
deleted file mode 100644
index 0aab8cf9d4..0000000000
--- a/windows/VC8/mesa/gdi/gdi.vcproj
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="gdi"
- ProjectGUID="{A1B24907-E196-4826-B6AF-26723629B633}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/gdi.tlb"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/gdi.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="mesa.lib msvcrtd.lib gdi32.lib user32.lib winmm.lib odbc32.lib odbccp32.lib"
- OutputFile="Debug/OPENGL32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../mesa/Debug"
- IgnoreAllDefaultLibraries="true"
- ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/OPENGL32.pdb"
- ImportLibrary=".\Debug/OPENGL32.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Debug\OPENGL32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Debug\OPENGL32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Debug\OPENGL32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Release/gdi.tlb"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\Release/gdi.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="mesa.lib winmm.lib gdi32.lib user32.lib msvcrt.lib odbc32.lib odbccp32.lib"
- OutputFile="Release/OPENGL32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../mesa/Release"
- IgnoreAllDefaultLibraries="true"
- ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
- ProgramDatabaseFile=".\Release/OPENGL32.pdb"
- ImportLibrary=".\Release/OPENGL32.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Release\OPENGL32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Release\OPENGL32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Release\OPENGL32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/VC8/mesa/glu/glu.vcproj b/windows/VC8/mesa/glu/glu.vcproj
deleted file mode 100644
index 8679aa18ce..0000000000
--- a/windows/VC8/mesa/glu/glu.vcproj
+++ /dev/null
@@ -1,1022 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="glu"
- ProjectGUID="{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Release/glu.tlb"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\Release/glu.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="msvcrt.lib winmm.lib odbc32.lib odbccp32.lib opengl32.lib"
- OutputFile="Release/GLU32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../gdi/Release"
- IgnoreAllDefaultLibraries="true"
- ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
- ProgramDatabaseFile=".\Release/GLU32.pdb"
- ImportLibrary=".\Release/GLU32.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Release\GLU32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Release\GLU32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Release\GLU32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/glu.tlb"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/glu.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="msvcrtd.lib winmm.lib odbc32.lib odbccp32.lib opengl32.lib"
- OutputFile="Debug/GLU32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../gdi/Debug"
- IgnoreAllDefaultLibraries="true"
- ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/GLU32.pdb"
- ImportLibrary=".\Debug/GLU32.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Debug\GLU32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Debug\GLU32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\dict.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\error.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\geom.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\glu.def"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\glue.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\memalloc.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\mesh.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\mipmap.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\normal.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\project.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\quad.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\registry.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\render.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\sweep.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\tess.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\tessmono.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\defines.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\definitions.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\dict-list.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\dict.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaymode.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\geom.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libutil\gluint.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\include\gluos.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridtrimvertex.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\jarcloc.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\memalloc.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\mesh.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mymath.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\normal.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsconsts.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq-sort.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\priorityq.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\pwlarc.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\render.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\simplemath.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\sweep.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\tess.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\tessmono.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertex.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\types.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h"
- >
- </File>
- </Filter>
- <Filter
- Name="C++ files"
- Filter=".cc"
- >
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\README"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
- <File
- RelativePath="..\..\..\..\src\glu\sgi\libtess\alg-outline"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/VC8/mesa/mesa.sln b/windows/VC8/mesa/mesa.sln
deleted file mode 100644
index 46d361ae28..0000000000
--- a/windows/VC8/mesa/mesa.sln
+++ /dev/null
@@ -1,43 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcproj", "{A1B24907-E196-4826-B6AF-26723629B633}"
- ProjectSection(ProjectDependencies) = postProject
- {2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glu", "glu\glu.vcproj", "{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcproj", "{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"
- ProjectSection(ProjectDependencies) = postProject
- {A1B24907-E196-4826-B6AF-26723629B633} = {A1B24907-E196-4826-B6AF-26723629B633}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.ActiveCfg = Debug|Win32
- {A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.Build.0 = Debug|Win32
- {A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.ActiveCfg = Release|Win32
- {A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.Build.0 = Release|Win32
- {2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.ActiveCfg = Debug|Win32
- {2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.Build.0 = Debug|Win32
- {2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.ActiveCfg = Release|Win32
- {2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.Build.0 = Release|Win32
- {2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.ActiveCfg = Debug|Win32
- {2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.Build.0 = Debug|Win32
- {2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.ActiveCfg = Release|Win32
- {2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.Build.0 = Release|Win32
- {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.ActiveCfg = Debug|Win32
- {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.Build.0 = Debug|Win32
- {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.ActiveCfg = Release|Win32
- {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
deleted file mode 100644
index 58856842a3..0000000000
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ /dev/null
@@ -1,1753 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="mesa"
- ProjectGUID="{2120C974-2717-4709-B44F-D6E6D0A56448}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/Zm1000 "
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"
- PreprocessorDefinitions="NDEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\Release/mesa.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile=".\Release\mesa.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="4"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/Zm1000 "
- Optimization="0"
- AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"
- PreprocessorDefinitions="_DEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/mesa.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile=".\Debug\mesa.lib"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\..\..\src\mesa\main\accum.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_arrayelt.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_loopback.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_noop.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_validate.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\arbprogram.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\arrayobj.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\atifragshader.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\attrib.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\blend.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\bufferobj.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\buffers.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\clip.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\colortab.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\context.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\convolve.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\debug.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\depth.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\depthstencil.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\dispatch.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\dlist.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\drawpix.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\enable.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\enums.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\eval.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\execmem.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\extensions.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\fbobject.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\feedback.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\fog.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\framebuffer.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\get.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\getstring.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glapi.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glthread.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\hash.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\hint.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\histogram.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\image.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\imports.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\light.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\lines.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_debug_clip.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_debug_norm.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_debug_xform.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_eval.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_matrix.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_translate.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_vector.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_xform.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\matrix.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\mipmap.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\mm.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvprogram.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\pixel.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\points.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\polygon.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\prog_debug.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\prog_execute.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\prog_print.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\program.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\programopt.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\queryobj.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\rastpos.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\rbadaptors.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\renderbuffer.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_aaline.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_aatriangle.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_accum.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_bitmap.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_blend.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_blit.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_buffers.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_context.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_copypix.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_depth.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_drawpix.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_feedback.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_fog.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_imaging.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_lines.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_logic.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_masking.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_points.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_readpix.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_span.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_texstore.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\shader_api.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\shaders.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_function.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_log.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\state.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\stencil.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_context.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_draw.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cull.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_fog.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_light.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_normals.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_points.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_program.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_render.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_texgen.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_texmat.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_vertex.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vertex.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vertex_generic.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texcompress.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texcompress_fxt1.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texcompress_s3tc.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texenvprogram.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texformat.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\teximage.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texobj.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texrender.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texstate.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texstore.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\varray.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_api.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_array.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_rebase.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_save.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_api.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_draw.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_split.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_copy.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\vsnprintf.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\vtxfmt.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath="..\..\..\..\src\mesa\main\accum.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_arrayelt.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_eval.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_loopback.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_noop.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\api_validate.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\arbprogram.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\arbprogram_syn.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\atifragshader.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\attrib.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\blend.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\bufferobj.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\buffers.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\clip.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\colormac.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\colortab.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\config.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\context.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\convolve.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\dd.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\debug.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\depth.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\depthstencil.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\dlist.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\drawpix.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\enable.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\enums.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\eval.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\extensions.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\fbobject.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\feedback.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\fog.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\framebuffer.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\get.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glapi.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glapioffsets.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glapitable.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glapitemp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\glheader.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glprocs.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\glapi\glthread.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_syn.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\hash.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\hint.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\histogram.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\image.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\imports.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\light.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\lines.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_clip_tmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_copy_tmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_debug.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_debug_util.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_dotprod_tmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_eval.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_matrix.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_norm_tmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_trans_tmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_translate.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_vector.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_xform.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\m_xform_tmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\macros.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\math\mathmod.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\matrix.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\mm.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\mtypes.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvprogram.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\pixel.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\points.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\polygon.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\prog_debug.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\prog_execute.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\prog_print.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\program.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\programopt.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\queryobj.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\rastpos.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\rbadaptors.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\renderbuffer.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_aaline.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_aalinetemp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_aatriangle.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_aatritemp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_accum.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_blend.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_context.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_depth.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_drawpix.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_feedback.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_fog.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_lines.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_linetemp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_logic.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_masking.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_points.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_pointtemp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_span.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_spantemp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_stencil.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_texcombine.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_texfilter.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_trispan.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_tritemp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\shader_api.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\shaders.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\simple_list.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_function.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_log.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_triangle.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_tritmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_vb.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\state.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\stencil.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast\swrast.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\swrast_setup\swrast_setup.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_context.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_lighttmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vb_rendertmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vertex.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texcompress.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texenvprogram.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texformat.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texformat_tmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\teximage.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texobj.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texrender.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texstate.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\texstore.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\tnl\tnl.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\varray.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_attrib.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_attrib_tmp.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_save.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\vbo\vbo_split.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\version.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\vtxfmt.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\vtxfmt_tmp.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/VC8/mesa/osmesa/osmesa.vcproj b/windows/VC8/mesa/osmesa/osmesa.vcproj
deleted file mode 100644
index 2ba0077fca..0000000000
--- a/windows/VC8/mesa/osmesa/osmesa.vcproj
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="osmesa"
- ProjectGUID="{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Release/osmesa.tlb"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\Release/osmesa.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="opengl32.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"
- OutputFile="Release/OSMESA32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../gdi/Release"
- IgnoreAllDefaultLibraries="true"
- ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
- ProgramDatabaseFile=".\Release/OSMESA32.pdb"
- ImportLibrary=".\Release/OSMESA32.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Release\OSMESA32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Release\OSMESA32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Release\OSMESA32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/osmesa.tlb"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/osmesa.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="opengl32.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"
- OutputFile="Debug/OSMESA32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../gdi/Debug"
- IgnoreAllDefaultLibraries="true"
- ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/OSMESA32.pdb"
- ImportLibrary=".\Debug/OSMESA32.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Debug\OSMESA32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Debug\OSMESA32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Debug\OSMESA32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\osmesa\osmesa.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/VC8/progs/demos/gears.vcproj b/windows/VC8/progs/demos/gears.vcproj
deleted file mode 100644
index 891acd641a..0000000000
--- a/windows/VC8/progs/demos/gears.vcproj
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="gears"
- ProjectGUID="{3A7B0671-10F8-45D1-B012-F6D650F817CE}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/gears.tlb"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../include"
- PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/gears.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"
- OutputFile=".\Debug/gears.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../glut/Debug"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/gears.pdb"
- SubSystem="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy Debug\gears.exe ..\..\..\..\progs\demos"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/gears.tlb"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../../include"
- PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\Release/gears.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"
- OutputFile=".\Release/gears.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../glut/Release"
- ProgramDatabaseFile=".\Release/gears.pdb"
- SubSystem="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy Release\gears.exe ..\..\..\..\progs\demos"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\..\..\progs\demos\gears.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/VC8/progs/glut/glut.vcproj b/windows/VC8/progs/glut/glut.vcproj
deleted file mode 100644
index f86cc1b15a..0000000000
--- a/windows/VC8/progs/glut/glut.vcproj
+++ /dev/null
@@ -1,449 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="glut"
- ProjectGUID="{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/glut.tlb"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../include"
- PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32;_CRT_SECURE_NO_DEPRECATE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/glut.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="winmm.lib msvcrtd.lib gdi32.lib user32.lib oldnames.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib"
- OutputFile="Debug/GLUT32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../../mesa/Debug"
- IgnoreAllDefaultLibraries="true"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/GLUT32.pdb"
- ImportLibrary=".\Debug/GLUT32.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Debug\GLUT32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Debug\GLUT32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Debug\GLUT32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\Release/glut.tlb"
- />
- <Tool
- Name="VCCLCompilerTool"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../../../include"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32;_CRT_SECURE_NO_DEPRECATE"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\Release/glut.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="opengl32.lib glu32.lib user32.lib winmm.lib gdi32.lib msvcrt.lib oldnames.lib odbc32.lib odbccp32.lib"
- OutputFile="Release/GLUT32.DLL"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../../mesa/Release"
- IgnoreAllDefaultLibraries="true"
- ProgramDatabaseFile=".\Release/GLUT32.pdb"
- ImportLibrary=".\Release/GLUT32.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy Release\GLUT32.LIB ..\..\..\..\lib&#x0D;&#x0A;copy Release\GLUT32.DLL ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy Release\GLUT32.DLL ..\..\..\..\progs\demos&#x0D;&#x0A;"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_8x13.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_9x15.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_bitmap.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_bwidth.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_cindex.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_cmap.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_cursor.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_dials.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_dstr.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_event.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_ext.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_fbc.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_fullscrn.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_gamemode.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_get.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_hel10.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_hel12.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_hel18.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_init.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_input.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_joy.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_key.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_keyctrl.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_keyup.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_mesa.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_modifier.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_mroman.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_overlay.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_roman.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_shapes.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_space.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_stroke.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_swap.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_swidth.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_tablet.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_teapot.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_tr10.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_tr24.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_util.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_vidresize.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_warp.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_win.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glut_winmisc.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_glx.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_menu.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_util.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_winproc.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_x11.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath="..\..\..\..\src\glut\glx\glutbitmap.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glutint.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glutstroke.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\glutwin32.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\stroke.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_glx.h"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\glut\glx\win32_x11.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/windows/VC8/progs/progs.sln b/windows/VC8/progs/progs.sln
deleted file mode 100644
index 3d91afa1a3..0000000000
--- a/windows/VC8/progs/progs.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gears", "demos\gears.vcproj", "{3A7B0671-10F8-45D1-B012-F6D650F817CE}"
- ProjectSection(ProjectDependencies) = postProject
- {0234F0D2-C8A6-4C4D-93E7-0E2248049C67} = {0234F0D2-C8A6-4C4D-93E7-0E2248049C67}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glut", "glut\glut.vcproj", "{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {3A7B0671-10F8-45D1-B012-F6D650F817CE}.Debug|Win32.ActiveCfg = Debug|Win32
- {3A7B0671-10F8-45D1-B012-F6D650F817CE}.Debug|Win32.Build.0 = Debug|Win32
- {3A7B0671-10F8-45D1-B012-F6D650F817CE}.Release|Win32.ActiveCfg = Release|Win32
- {3A7B0671-10F8-45D1-B012-F6D650F817CE}.Release|Win32.Build.0 = Release|Win32
- {0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Debug|Win32.ActiveCfg = Debug|Win32
- {0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Debug|Win32.Build.0 = Debug|Win32
- {0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Release|Win32.ActiveCfg = Release|Win32
- {0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal