Merge branch 'master' into i915-unification

Conflicts:

	src/mesa/drivers/dri/common/dri_bufmgr.c
	src/mesa/drivers/dri/common/dri_drmpool.c
	src/mesa/drivers/dri/i915tex/intel_batchpool.c
	src/mesa/drivers/dri/i915tex/intel_buffer_objects.c
	src/mesa/drivers/dri/i915tex/intel_regions.c
	src/mesa/drivers/dri/i915tex/intel_screen.c
	src/mesa/drivers/dri/i915tex/intel_screen.h

1 files changed, 449 insertions, 0 deletions

diff --git a/windows/VC8/progs/glut/glut.vcproj b/windows/VC8/progs/glut/glut.vcproj
new file mode 100644
index 0000000000..f86cc1b15a
--- /dev/null
+++ b/windows/VC8/progs/glut/glut.vcproj
@@ -0,0 +1,449 @@
+<?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>