diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-01 23:12:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-01 23:12:13 +0200 |
| commit | 88236adfe3eb41b8368b4c9ecf3e09a7199dc474 (patch) | |
| tree | 6acb3f7ad3c60c4605551245df9c321b5fb22c3b /mesalib/windows/VC8 | |
| parent | e4086b3defb6186a2fb8a5845968c97e613fb493 (diff) | |
| parent | 30eb28e89e513ba7c04e8424be0cba326a01882b (diff) | |
| download | vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.tar.gz vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.tar.bz2 vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/win.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/winclipboardinit.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winglobals.c
Diffstat (limited to 'mesalib/windows/VC8')
4 files changed, 8 insertions, 4 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 068d369d1..af78c2cfe 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 @@ -240,6 +240,7 @@ <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_variables.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />
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 a631e0626..046b9f911 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 @@ -309,6 +309,9 @@ <ClCompile Include="..\..\..\..\src\glsl\lower_vertex_id.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_variables.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index d0627cc1f..626258f65 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -279,6 +279,7 @@ <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_variables.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />
@@ -387,7 +388,6 @@ <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter_layout.c" />
<ClCompile Include="..\..\..\..\src\mesa\program\prog_print.c" />
<ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c" />
- <ClCompile Include="..\..\..\..\src\mesa\program\register_allocate.c" />
<ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp" />
<ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\hint.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 36afc75b4..43c86ea67 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -569,9 +569,6 @@ <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\mesa\program\register_allocate.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -815,6 +812,9 @@ <ClCompile Include="..\..\..\..\src\glsl\lower_vertex_id.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_variables.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
|