diff options
| author | marha <marha@users.sourceforge.net> | 2015-02-24 07:44:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-02-24 07:44:41 +0100 |
| commit | f64e43decd0fdac938feddeedee255dc4508aaa5 (patch) | |
| tree | 34e1cfaaea9ad73d9335197ee79b4f99affe4ea9 /mesalib/windows/VC8/mesa | |
| parent | 462f18c7b25fe3e467f837647d07ab0a78aa8d2b (diff) | |
| parent | ac2c8a704aac7569f4ae85b890a546644bd86c60 (diff) | |
| download | vcxsrv-f64e43decd0fdac938feddeedee255dc4508aaa5.tar.gz vcxsrv-f64e43decd0fdac938feddeedee255dc4508aaa5.tar.bz2 vcxsrv-f64e43decd0fdac938feddeedee255dc4508aaa5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
apps/xcalc/math.c
freetype/src/base/ftbdf.c
freetype/src/base/fttype1.c
freetype/src/pfr/pfrobjs.c
mesalib/src/mesa/main/.gitignore
openssl/Configure
openssl/Makefile
openssl/crypto/cryptlib.c
openssl/crypto/opensslconf.h
openssl/test/v3nametest.c
openssl/util/mk1mf.pl
openssl/util/pl/VC-32.pl
xorg-server/Xi/xipassivegrab.c
xorg-server/dix/dispatch.c
xorg-server/dix/getevents.c
xorg-server/glx/glxcmds.c
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_reqsize.h
xorg-server/hw/xwin/winclipboard/internal.h
xorg-server/hw/xwin/winclipboard/thread.c
xorg-server/hw/xwin/winclipboard/wndproc.c
xorg-server/hw/xwin/winclipboard/xevents.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/render/render.c
Diffstat (limited to 'mesalib/windows/VC8/mesa')
5 files changed, 29 insertions, 18 deletions
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 55ec5b270..835b3ac1f 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;..\..\..\..\..;..\..\..\..\src</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src;..\..\..\..\src\gallium\auxiliary;..\..\..\..\src\gallium\include</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;..\..\..\..\..;..\..\..\..\src</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src;..\..\..\..\src\gallium\auxiliary;..\..\..\..\src\gallium\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index a35b594ec..cb75cce2f 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -52,7 +52,8 @@ DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.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\format_unpack.c \
+ ..\..\..\src\mesa\main\format_pack.c \
..\..\..\src\mesa\main\remap_helper.h \
..\..\..\src\mesa\drivers\dri\common\xmlpool\options.h
@@ -84,6 +85,12 @@ GEN_FORMAT_INFO=../../../src/mesa/main/format_info.py ..\..\..\src\util\format_srgb.c: ..\..\..\src\util\format_srgb.py
python $< > $@
+..\..\..\src\mesa\main\format_unpack.c: ..\..\..\src\mesa\main\format_unpack.py ..\..\..\src\mesa\main\formats.csv
+ python ..\..\..\src\mesa\main\format_unpack.py ..\..\..\src\mesa\main\formats.csv > $@
+
+..\..\..\src\mesa\main\format_pack.c: ..\..\..\src\mesa\main\format_pack.py ..\..\..\src\mesa\main\formats.csv
+ python ..\..\..\src\mesa\main\format_pack.py ..\..\..\src\mesa\main\formats.csv > $@
+
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 1a5af42da..84e779c50 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;../../../../src;%(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;../../../../src/gallium/include;%(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;../../../../src;%(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;../../../../src/gallium/include;%(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>
@@ -298,6 +298,7 @@ <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />
+ <ClCompile Include="..\..\..\..\src\mapi\glapi\glapi_nop.c" />
<ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta_blit.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\accum.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c" />
@@ -314,6 +315,7 @@ <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_unpack.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\format_utils.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\genmipmap.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\glformats.c" />
@@ -324,7 +326,6 @@ <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\remap.c" />
- <ClCompile Include="..\..\..\..\src\mesa\main\set.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\shaderimage.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c" />
@@ -366,7 +367,6 @@ <ClCompile Include="..\..\..\..\src\mesa\main\ffvertex_prog.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\fog.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\formats.c" />
- <ClCompile Include="..\..\..\..\src\mesa\main\format_unpack.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\framebuffer.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\get.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\getstring.c" />
@@ -475,6 +475,7 @@ <ClCompile Include="..\..\..\..\src\util\hash_table.c" />
<ClCompile Include="..\..\..\..\src\util\ralloc.c" />
<ClCompile Include="..\..\..\..\src\util\rgtc.c" />
+ <ClCompile Include="..\..\..\..\src\util\set.c" />
<ClCompile Include="..\..\..\..\src\util\strtod.cpp" />
</ItemGroup>
<ItemGroup>
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 68199cc96..f453cdf6e 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -107,9 +107,6 @@ <ClCompile Include="..\..\..\..\src\mesa\main\formats.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\mesa\main\format_unpack.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\mesa\main\framebuffer.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -656,9 +653,6 @@ <ClCompile Include="..\..\..\..\src\mesa\main\texstorage.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\mesa\main\errors.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -692,9 +686,6 @@ <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\mesa\main\set.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -821,6 +812,18 @@ <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\util\set.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\format_unpack.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\mapi\glapi\glapi_nop.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l">
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj index 196ec77bc..d11b021bc 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;../../../../..;../../../../src;%(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;../../../../src/gallium/auxiliary;../../../../src/gallium/include;%(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;../../../../..;../../../../src;%(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;../../../../src/gallium/auxiliary;../../../../src/gallium/include;%(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>
|