Compiled and synchronised

7 files changed, 49 insertions, 28 deletions

diff --git a/mesalib/src/mesa/main/macros.h b/mesalib/src/mesa/main/macros.h
index 0ba658a9a..947efac1f 100644
--- a/mesalib/src/mesa/main/macros.h
+++ b/mesalib/src/mesa/main/macros.h
@@ -153,21 +153,21 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
            else if (__tmp.i >= IEEE_ONE)				\
               UB = (GLubyte) 255;					\
            else {							\
-              __tmp.f = __tmp.f * (255.0F/256.0F) + 32768.0F;		\
+              __tmp.f = __tmp.f * (255.0f/256.0f) + 32768.0f;		\
               UB = (GLubyte) __tmp.i;					\
            }								\
         } while (0)
 #define CLAMPED_FLOAT_TO_UBYTE(UB, F)					\
         do {								\
            fi_type __tmp;						\
-           __tmp.f = (F) * (255.0F/256.0F) + 32768.0F;			\
+           __tmp.f = (F) * (255.0f/256.0f) + 32768.0f;			\
            UB = (GLubyte) __tmp.i;					\
         } while (0)
 #else
-#define UNCLAMPED_FLOAT_TO_UBYTE(ub, f) \
-	ub = ((GLubyte) F_TO_I(CLAMP((f), 0.0F, 1.0F) * 255.0F))
-#define CLAMPED_FLOAT_TO_UBYTE(ub, f) \
-	ub = ((GLubyte) F_TO_I((f) * 255.0F))
+#define UNCLAMPED_FLOAT_TO_UBYTE(ub, fl) \
+	ub = ((GLubyte) F_TO_I(CLAMP((fl), 0.0f, 1.0f) * 255.0f))
+#define CLAMPED_FLOAT_TO_UBYTE(ub, fl) \
+	ub = ((GLubyte) F_TO_I((fl) * 255.0f))
 #endif
 
 static inline GLfloat INT_AS_FLT(GLint i)
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
index 3bfc5cefa..d0831ccdb 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@ -113,7 +113,7 @@
       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -152,7 +152,7 @@
       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -255,13 +255,13 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />

     <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp" />

     <ClCompile Include="..\..\..\..\src\glsl\standalone_scaffolding.cpp" />

-    <ClCompile Include="..\..\..\..\src\glsl\ralloc.c" />

     <ClCompile Include="..\..\..\..\src\glsl\strtod.c" />

     <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />

-    <ClCompile Include="..\..\..\..\src\mesa\main\hash_table.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\imports.c" />

     <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c" />

     <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" />

+    <ClCompile Include="..\..\..\..\src\util\hash_table.c" />

+    <ClCompile Include="..\..\..\..\src\util\ralloc.c" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\..\src\glsl\strtod.h" />

diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
index 98d29eee7..d0edf569c 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
@@ -129,9 +129,6 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\src\glsl\ralloc.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -246,9 +243,6 @@
     <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\src\mesa\main\hash_table.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -306,6 +300,12 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\..\..\src\util\hash_table.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\util\ralloc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">

diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile
index 63f4b101b..a35b594ec 100644
--- a/mesalib/windows/VC8/mesa/makefile
+++ b/mesalib/windows/VC8/mesa/makefile
@@ -51,6 +51,8 @@ DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \
       ..\..\..\src\mesa\main\enums.c \

       ..\..\..\src\mesa\main\api_exec.c \

       ..\..\..\src\mesa\main\get_hash.h \

+      ..\..\..\src\mesa\main\format_info.c \

+      ..\..\..\src\util\format_srgb.c \

       ..\..\..\src\mesa\main\remap_helper.h \

       ..\..\..\src\mesa\drivers\dri\common\xmlpool\options.h

 

@@ -75,6 +77,13 @@ GET_HASH_GEN = ../../../src/mesa/main/get_hash_generator.py
 ..\..\..\src\mesa\main\get_hash.h: ..\..\..\src\mapi\glapi\gen\gl_and_es_API.xml ..\..\..\src\mesa\main\get_hash_params.py $(GET_HASH_GEN)

 	python $(GET_HASH_GEN) -f $(subst $/,/,$<) > $@

 

+GEN_FORMAT_INFO=../../../src/mesa/main/format_info.py

+..\..\..\src\mesa\main\format_info.c: ..\..\..\src\mesa\main\formats.csv ..\..\..\src\mesa\main\format_parser.py $(GEN_FORMAT_INFO)

+	python $(GEN_FORMAT_INFO) $< > $@

+

+..\..\..\src\util\format_srgb.c: ..\..\..\src\util\format_srgb.py

+	python $< > $@

+

 REMAP_HELPER = ../../../src/mapi/glapi/gen/remap_helper.py

 ..\..\..\src\mesa\main\remap_helper.h: ..\..\..\src\mapi\glapi\gen\gl_and_es_API.xml $(REMAP_HELPER)

 	python $(REMAP_HELPER) -f $(subst $/,/,$<) > $@

diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 4135da13e..430a49c11 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -116,7 +116,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <OmitFramePointers>true</OmitFramePointers>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

@@ -162,7 +162,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -293,7 +293,6 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />

     <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />

     <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp" />

-    <ClCompile Include="..\..\..\..\src\glsl\ralloc.c" />

     <ClCompile Include="..\..\..\..\src\glsl\strtod.c" />

     <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />

     <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta_blit.c" />

@@ -306,14 +305,15 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\blit.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\compute.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\copyimage.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\errors.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\formatquery.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\format_utils.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\genmipmap.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\glformats.c" />

-    <ClCompile Include="..\..\..\..\src\mesa\main\hash_table.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\objectlabel.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\pack.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\performance_monitor.c" />

@@ -468,6 +468,9 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\version.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c" />

+    <ClCompile Include="..\..\..\..\src\util\format_srgb.c" />

+    <ClCompile Include="..\..\..\..\src\util\hash_table.c" />

+    <ClCompile Include="..\..\..\..\src\util\ralloc.c" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\..\src\glsl\strtod.h" />

diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index 8b3d39cc4..0d05001c8 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -440,9 +440,6 @@
     <ClCompile Include="..\..\..\..\src\mesa\program\string_to_uint_map.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\src\glsl\ralloc.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\glsl\ir.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -698,9 +695,6 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\src\mesa\main\hash_table.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -797,6 +791,21 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\..\..\src\util\hash_table.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\util\ralloc.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\util\format_srgb.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\format_utils.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\main\copyimage.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">

diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
index 3ea6f593f..9e8ebeba4 100644
--- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
@@ -127,7 +127,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;../../../../../expat/lib;../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;../../../../../expat/lib;../../../../..;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;__NOT_HAVE_DRM_H;XML_STATIC;COMPILED_FROM_DSP;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -206,7 +206,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <OmitFramePointers>true</OmitFramePointers>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;../../../../../expat/lib;../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;../../../../../expat/lib;../../../../..;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;__NOT_HAVE_DRM_H;XML_STATIC;COMPILED_FROM_DSP;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>