<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168187] trunk/Source/ThirdParty/ANGLE</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168187">168187</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-02 13:53:11 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update ANGLE Windows build.
https://bugs.webkit.org/show_bug.cgi?id=132456
Patch by Alex Christensen <achristensen@webkit.org> on 2014-05-02
Reviewed by Brent Fulgham.
* ANGLE.vcxproj/libEGLCommon.props:
* ANGLE.vcxproj/libGLESv2.vcxproj:
* ANGLE.vcxproj/libGLESv2.vcxproj.filters:
* ANGLE.vcxproj/libGLESv2Common.props:
* ANGLE.vcxproj/translator_common.vcxproj:
* ANGLE.vcxproj/translator_common.vcxproj.filters:
* ANGLE.vcxproj/translator_glsl.vcxproj:
* ANGLE.vcxproj/translator_glsl.vcxproj.filters:
* ANGLE.vcxproj/translator_hlsl.vcxproj:
* ANGLE.vcxproj/translator_hlsl.vcxproj.filters:
Updated ANGLE build.
* src/ANGLE.sln: Removed.
* src/build_angle.gyp: Removed.
* src/commit.h: Added.
* changes.diff:
* src/libGLESv2/Program.cpp:
(gl::InfoLog::append):
Fixed typo.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojlibEGLCommonprops">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxprojfilters">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2Commonprops">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxprojfilters">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxprojfilters">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxprojfilters">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEchangesdiff">trunk/Source/ThirdParty/ANGLE/changes.diff</a></li>
<li><a href="#trunkSourceThirdPartyANGLEsrclibGLESv2Programcpp">trunk/Source/ThirdParty/ANGLE/src/libGLESv2/Program.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartyANGLEsrccommith">trunk/Source/ThirdParty/ANGLE/src/commit.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartyANGLEsrcANGLEsln">trunk/Source/ThirdParty/ANGLE/src/ANGLE.sln</a></li>
<li><a href="#trunkSourceThirdPartyANGLEsrcbuild_anglegyp">trunk/Source/ThirdParty/ANGLE/src/build_angle.gyp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojlibEGLCommonprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -14,6 +14,9 @@
</span><span class="cx"> <ModuleDefinitionFile>../src/libEGL/libEGL.def</ModuleDefinitionFile>
</span><span class="cx"> <GenerateDebugInformation>true</GenerateDebugInformation>
</span><span class="cx"> </Link>
</span><ins>+ <ResourceCompile>
+ <AdditionalIncludeDirectories>..\src</AdditionalIncludeDirectories>
+ </ResourceCompile>
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup />
</span><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -156,8 +156,27 @@
</span><span class="cx"> <PropertyGroup Label="UserMacros" />
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClCompile Include="..\src\common\event_tracer.cpp" />
</span><ins>+ <ClCompile Include="..\src\libGLESv2\angletypes.cpp" />
</ins><span class="cx"> <ClCompile Include="..\src\libGLESv2\Buffer.cpp" />
</span><ins>+ <ClCompile Include="..\src\libGLESv2\DynamicHLSL.cpp" />
+ <ClCompile Include="..\src\libGLESv2\formatutils.cpp" />
+ <ClCompile Include="..\src\libGLESv2\queryconversions.cpp" />
+ <ClCompile Include="..\src\libGLESv2\RenderbufferProxySet.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\copyimage.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d9\Blit9.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d9\formatutils9.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d9\RenderTarget9.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d\HLSLCompiler.cpp" />
</ins><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\IndexRangeCache.cpp" />
</span><ins>+ <ClCompile Include="..\src\libGLESv2\renderer\loadimage.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\loadimageSSE2.cpp" />
+ <ClCompile Include="..\src\libGLESv2\Sampler.cpp" />
+ <ClCompile Include="..\src\libGLESv2\TransformFeedback.cpp" />
+ <ClCompile Include="..\src\libGLESv2\validationES.cpp" />
+ <ClCompile Include="..\src\libGLESv2\validationES2.cpp" />
+ <ClCompile Include="..\src\libGLESv2\validationES3.cpp" />
+ <ClCompile Include="..\src\libGLESv2\VertexArray.cpp" />
</ins><span class="cx"> <ClCompile Include="..\src\third_party\murmurhash\MurmurHash3.cpp">
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</span><span class="lines">@@ -206,54 +225,58 @@
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\Query.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\common\RefCountObject.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\Renderbuffer.cpp" />
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\Blit.cpp" />
- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Fence11.cpp" />
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\Fence9.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\BufferStorage.cpp" />
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\BufferStorage11.cpp" />
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\BufferStorage9.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\Image.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\Image9.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\IndexBuffer.cpp" />
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\IndexBuffer11.cpp" />
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\IndexBuffer9.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\IndexDataManager.cpp" />
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\ImageSSE2.cpp" />
- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Image11.cpp" />
- <ClCompile Include="..\src\libGLESv2\renderer\InputLayoutCache.cpp" />
- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Query11.cpp" />
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\Query9.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\Renderer.cpp" />
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Renderer11.cpp" />
- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\renderer11_utils.cpp" />
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\Renderer9.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\renderer9_utils.cpp" />
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\RenderTarget11.cpp" />
- <ClCompile Include="..\src\libGLESv2\renderer\RenderTarget9.cpp" />
- <ClCompile Include="..\src\libGLESv2\renderer\RenderStateCache.cpp" />
- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.cpp" />
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.cpp" />
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\SwapChain11.cpp" />
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\SwapChain9.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\TextureStorage.cpp" />
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\TextureStorage11.cpp" />
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\TextureStorage9.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\VertexBuffer.cpp" />
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\VertexBuffer11.cpp" />
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\VertexBuffer9.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\VertexDataManager.cpp" />
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\VertexDeclarationCache.cpp" />
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\ResourceManager.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\Shader.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\Texture.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\Uniform.cpp" />
</span><del>- <ClCompile Include="..\src\libGLESv2\utilities.cpp" />
</del><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\src\common\debug.h" />
</span><span class="cx"> <ClInclude Include="..\src\common\event_tracer.h" />
</span><span class="cx"> <ClInclude Include="..\src\common\system.h" />
</span><ins>+ <ClInclude Include="..\src\libGLESv2\commit.h" />
+ <ClInclude Include="..\src\libGLESv2\DynamicHLSL.h" />
+ <ClInclude Include="..\src\libGLESv2\formatutils.h" />
+ <ClInclude Include="..\src\libGLESv2\queryconversions.h" />
+ <ClInclude Include="..\src\libGLESv2\RenderbufferProxySet.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\copyimage.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\copyvertex.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d9\Blit9.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d9\formatutils9.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d9\RenderTarget9.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d9\ShaderCache.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d\HLSLCompiler.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\imageformats.h" />
</ins><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\IndexRangeCache.h" />
</span><ins>+ <ClInclude Include="..\src\libGLESv2\renderer\loadimage.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\vertexconversion.h" />
+ <ClInclude Include="..\src\libGLESv2\Sampler.h" />
+ <ClInclude Include="..\src\libGLESv2\TransformFeedback.h" />
+ <ClInclude Include="..\src\libGLESv2\validationES.h" />
+ <ClInclude Include="..\src\libGLESv2\validationES2.h" />
+ <ClInclude Include="..\src\libGLESv2\validationES3.h" />
+ <ClInclude Include="..\src\libGLESv2\VertexArray.h" />
+ <ClInclude Include="..\src\libGLESv2\VertexAttribute.h" />
</ins><span class="cx"> <ClInclude Include="..\src\third_party\murmurhash\MurmurHash3.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\angletypes.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\BinaryStream.h" />
</span><span class="lines">@@ -274,37 +297,24 @@
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\Query.h" />
</span><span class="cx"> <ClInclude Include="..\src\common\RefCountObject.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\Renderbuffer.h" />
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\Blit.h" />
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Fence11.h" />
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\Fence9.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\FenceImpl.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\BufferStorage.h" />
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\BufferStorage11.h" />
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\BufferStorage9.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\generatemip.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\Image.h" />
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Image11.h" />
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\Image9.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\IndexBuffer.h" />
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\IndexBuffer11.h" />
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\IndexBuffer9.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\IndexDataManager.h" />
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\InputLayoutCache.h" />
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Query11.h" />
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\QueryImpl.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\Query9.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\Renderer.h" />
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Renderer11.h" />
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\renderer11_utils.h" />
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\Renderer9.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\renderer9_utils.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\RenderTarget.h" />
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\RenderTarget11.h" />
- <ClInclude Include="..\src\libGLESv2\renderer\d3d9\RenderTarget9.h" />
- <ClInclude Include="..\src\libGLESv2\renderer\RenderStateCache.h" />
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\ShaderCache.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\ShaderExecutable.h" />
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.h" />
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\shaders\compiled\clear11vs.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\shaders\compiled\clearmultiple11ps.h" />
</span><span class="lines">@@ -320,17 +330,13 @@
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\shaders\compiled\passthroughrgba11ps.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\shaders\compiled\standardvs.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\SwapChain.h" />
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\SwapChain11.h" />
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\SwapChain9.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\TextureStorage.h" />
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\TextureStorage11.h" />
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\TextureStorage9.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\VertexBuffer.h" />
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\VertexBuffer11.h" />
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\VertexBuffer9.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\vertexconversion.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\VertexDataManager.h" />
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\VertexDeclarationCache.h" />
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\resource.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\ResourceManager.h" />
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\Shader.h" />
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -30,14 +30,14 @@
</span><span class="cx"> <Filter Include="Header Files\Renderer9">
</span><span class="cx"> <UniqueIdentifier>{3877f35e-845c-4e95-b9a5-c7d8b9f307c5}</UniqueIdentifier>
</span><span class="cx"> </Filter>
</span><del>- <Filter Include="Header Files\Renderer11">
- <UniqueIdentifier>{2d70fd60-6dea-489f-ac09-16890d325669}</UniqueIdentifier>
</del><ins>+ <Filter Include="Source Files\Renderer\d3d9">
+ <UniqueIdentifier>{6c9e41f2-5292-431a-a120-067417a563c0}</UniqueIdentifier>
</ins><span class="cx"> </Filter>
</span><del>- <Filter Include="Source Files\Renderer9">
- <UniqueIdentifier>{60e14f04-2cf2-4a07-b3ef-7c68a82ba2d9}</UniqueIdentifier>
</del><ins>+ <Filter Include="Source Files\Renderer\d3d9\shaders">
+ <UniqueIdentifier>{293f2fd9-989d-4ac1-adfc-77eac2313394}</UniqueIdentifier>
</ins><span class="cx"> </Filter>
</span><del>- <Filter Include="Source Files\Renderer11">
- <UniqueIdentifier>{72db61d3-e081-4b58-bc63-a04a8a70585f}</UniqueIdentifier>
</del><ins>+ <Filter Include="Source Files\Renderer\d3d">
+ <UniqueIdentifier>{97836edd-b435-437e-9a3e-eb4f2a457f67}</UniqueIdentifier>
</ins><span class="cx"> </Filter>
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="lines">@@ -89,9 +89,6 @@
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\Texture.cpp">
</span><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\utilities.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\Image.cpp">
</span><span class="cx"> <Filter>Source Files\Renderer</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -113,9 +110,6 @@
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\Image.cpp">
</span><span class="cx"> <Filter>Renderer</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\ImageSSE2.cpp">
- <Filter>Source Files\Renderer</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\VertexBuffer.cpp">
</span><span class="cx"> <Filter>Source Files\Renderer</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -128,102 +122,108 @@
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\BufferStorage.cpp">
</span><span class="cx"> <Filter>Source Files\Renderer</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\BufferStorage11.cpp">
- <Filter>Source Files\Renderer11</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\precompiled.cpp">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Fence11.cpp">
- <Filter>Source Files\Renderer11</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\Buffer.cpp">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Image11.cpp">
- <Filter>Source Files\Renderer11</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\renderer\IndexRangeCache.cpp">
+ <Filter>Source Files\Renderer</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\IndexBuffer11.cpp">
- <Filter>Source Files\Renderer11</Filter>
</del><ins>+ <ClCompile Include="..\src\common\event_tracer.cpp">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Query11.cpp">
- <Filter>Source Files\Renderer11</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\angletypes.cpp">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Renderer11.cpp">
- <Filter>Source Files\Renderer11</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\DynamicHLSL.cpp">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\renderer11_utils.cpp">
- <Filter>Source Files\Renderer11</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\formatutils.cpp">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\RenderTarget11.cpp">
- <Filter>Source Files\Renderer11</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\queryconversions.cpp">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.cpp">
- <Filter>Source Files\Renderer11</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\RenderbufferProxySet.cpp">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\SwapChain11.cpp">
- <Filter>Source Files\Renderer11</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\Sampler.cpp">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\TextureStorage11.cpp">
- <Filter>Source Files\Renderer11</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\TransformFeedback.cpp">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\VertexBuffer11.cpp">
- <Filter>Source Files\Renderer11</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\validationES.cpp">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\src\libGLESv2\validationES2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\validationES3.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\VertexArray.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d9\Blit9.cpp">
+ <Filter>Source Files\Renderer\d3d9</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\BufferStorage9.cpp">
</span><del>- <Filter>Source Files\Renderer9</Filter>
</del><ins>+ <Filter>Source Files\Renderer\d3d9</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\Fence9.cpp">
</span><del>- <Filter>Source Files\Renderer9</Filter>
</del><ins>+ <Filter>Source Files\Renderer\d3d9</Filter>
</ins><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\src\libGLESv2\renderer\d3d9\formatutils9.cpp">
+ <Filter>Source Files\Renderer\d3d9</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\Image9.cpp">
</span><del>- <Filter>Source Files\Renderer9</Filter>
</del><ins>+ <Filter>Source Files\Renderer\d3d9</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\IndexBuffer9.cpp">
</span><del>- <Filter>Source Files\Renderer9</Filter>
</del><ins>+ <Filter>Source Files\Renderer\d3d9</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\Query9.cpp">
</span><del>- <Filter>Source Files\Renderer9</Filter>
</del><ins>+ <Filter>Source Files\Renderer\d3d9</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\Renderer9.cpp">
</span><del>- <Filter>Source Files\Renderer9</Filter>
</del><ins>+ <Filter>Source Files\Renderer\d3d9</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\renderer9_utils.cpp">
</span><del>- <Filter>Source Files\Renderer9</Filter>
</del><ins>+ <Filter>Source Files\Renderer\d3d9</Filter>
</ins><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\src\libGLESv2\renderer\d3d9\RenderTarget9.cpp">
+ <Filter>Source Files\Renderer\d3d9</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.cpp">
</span><del>- <Filter>Source Files\Renderer9</Filter>
</del><ins>+ <Filter>Source Files\Renderer\d3d9</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\SwapChain9.cpp">
</span><del>- <Filter>Source Files\Renderer9</Filter>
</del><ins>+ <Filter>Source Files\Renderer\d3d9</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\TextureStorage9.cpp">
</span><del>- <Filter>Source Files\Renderer9</Filter>
</del><ins>+ <Filter>Source Files\Renderer\d3d9</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\VertexBuffer9.cpp">
</span><del>- <Filter>Source Files\Renderer9</Filter>
</del><ins>+ <Filter>Source Files\Renderer\d3d9</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\precompiled.cpp">
- <Filter>Source Files</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp">
+ <Filter>Source Files\Renderer\d3d9</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\Buffer.cpp">
- <Filter>Source Files</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\renderer\copyimage.cpp">
+ <Filter>Source Files\Renderer</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\IndexRangeCache.cpp">
</del><ins>+ <ClCompile Include="..\src\libGLESv2\renderer\loadimage.cpp">
</ins><span class="cx"> <Filter>Source Files\Renderer</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\common\event_tracer.cpp">
- <Filter>Source Files</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\renderer\loadimageSSE2.cpp">
+ <Filter>Source Files\Renderer</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\Blit.cpp">
- <Filter>Source Files</Filter>
</del><ins>+ <ClCompile Include="..\src\libGLESv2\renderer\d3d\HLSLCompiler.cpp">
+ <Filter>Source Files\Renderer\d3d</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\InputLayoutCache.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\src\libGLESv2\renderer\RenderTarget9.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\src\libGLESv2\renderer\RenderStateCache.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\src\libGLESv2\renderer\VertexDeclarationCache.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</del><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\BinaryStream.h">
</span><span class="lines">@@ -388,33 +388,6 @@
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\VertexDataManager.h">
</span><span class="cx"> <Filter>Header Files\Renderer</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\BufferStorage11.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\IndexBuffer11.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Query11.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Renderer11.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\RenderTarget11.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\SwapChain11.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\TextureStorage11.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\VertexBuffer11.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\BufferStorage9.h">
</span><span class="cx"> <Filter>Header Files\Renderer9</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -436,9 +409,6 @@
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\renderer9_utils.h">
</span><span class="cx"> <Filter>Header Files\Renderer9</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d9\RenderTarget9.h">
- <Filter>Header Files\Renderer9</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.h">
</span><span class="cx"> <Filter>Header Files\Renderer9</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -451,24 +421,9 @@
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\VertexBuffer9.h">
</span><span class="cx"> <Filter>Header Files\Renderer9</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Fence11.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Image11.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\renderer11_utils.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d9\Fence9.h">
</span><span class="cx"> <Filter>Header Files\Renderer\Renderer9</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Query11.h">
- <Filter>Header Files\Renderer\Renderer11</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\VertexDeclarationCache.h">
- <Filter>Header Files\Renderer9</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\constants.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -481,21 +436,81 @@
</span><span class="cx"> <ClInclude Include="..\src\common\event_tracer.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\Blit.h">
</del><ins>+ <ClInclude Include="..\src\libGLESv2\renderer\ShaderCache.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\InputLayoutCache.h">
</del><ins>+ <ClInclude Include="..\src\libGLESv2\renderer\d3d9\vertexconversion.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\RenderStateCache.h">
- <Filter>Header Files</Filter>
</del><ins>+ <ClInclude Include="..\src\libGLESv2\commit.h">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\ShaderCache.h">
- <Filter>Header Files</Filter>
</del><ins>+ <ClInclude Include="..\src\libGLESv2\DynamicHLSL.h">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d9\vertexconversion.h">
- <Filter>Header Files</Filter>
</del><ins>+ <ClInclude Include="..\src\libGLESv2\formatutils.h">
+ <Filter>Source Files</Filter>
</ins><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\src\libGLESv2\queryconversions.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\RenderbufferProxySet.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\Sampler.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\TransformFeedback.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\validationES.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\validationES2.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\validationES3.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\VertexArray.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\VertexAttribute.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d9\Blit9.h">
+ <Filter>Source Files\Renderer\d3d9</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d9\formatutils9.h">
+ <Filter>Source Files\Renderer\d3d9</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d9\RenderTarget9.h">
+ <Filter>Source Files\Renderer\d3d9</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d9\ShaderCache.h">
+ <Filter>Source Files\Renderer\d3d9</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.h">
+ <Filter>Source Files\Renderer\d3d9</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\copyimage.h">
+ <Filter>Source Files\Renderer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\copyvertex.h">
+ <Filter>Source Files\Renderer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\imageformats.h">
+ <Filter>Source Files\Renderer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\loadimage.h">
+ <Filter>Source Files\Renderer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\vertexconversion.h">
+ <Filter>Source Files\Renderer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d\HLSLCompiler.h">
+ <Filter>Source Files\Renderer\d3d</Filter>
+ </ClInclude>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="..\src\libGLESv2\renderer\d3d11\shaders\Passthrough11.hlsl">
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2Commonprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><span class="cx"> <AdditionalIncludeDirectories>..\src;..\src\libGLESv2;..\include;..\include\KHR;$(DXSDK_DIR)Include</AdditionalIncludeDirectories>
</span><del>- <PreprocessorDefinitions>NOMINMAX;ANGLE_WEBKIT_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</del><ins>+ <PreprocessorDefinitions>ANGLE_ENABLE_D3D9;NOMINMAX;ANGLE_WEBKIT_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <Link>
</span><span class="cx"> <ModuleDefinitionFile>../src/libGLESv2/libGLESv2.def</ModuleDefinitionFile>
</span><span class="lines">@@ -13,6 +13,9 @@
</span><span class="cx"> <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
</span><span class="cx"> <GenerateDebugInformation>true</GenerateDebugInformation>
</span><span class="cx"> </Link>
</span><ins>+ <ResourceCompile>
+ <AdditionalIncludeDirectories>..\src</AdditionalIncludeDirectories>
+ </ResourceCompile>
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup />
</span><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -139,6 +139,13 @@
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <PropertyGroup Label="UserMacros" />
</span><span class="cx"> <ItemGroup>
</span><ins>+ <ClCompile Include="..\src\common\blocklayout.cpp" />
+ <ClCompile Include="..\src\common\debug.cpp" />
+ <ClCompile Include="..\src\common\event_tracer.cpp" />
+ <ClCompile Include="..\src\common\mathutil.cpp" />
+ <ClCompile Include="..\src\common\RefCountObject.cpp" />
+ <ClCompile Include="..\src\common\shadervars.cpp" />
+ <ClCompile Include="..\src\common\utilities.cpp" />
</ins><span class="cx"> <ClCompile Include="..\src\compiler\translator\BuiltInFunctionEmulator.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\CodeGen.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\Compiler.cpp" />
</span><span class="lines">@@ -146,6 +153,7 @@
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\DetectCallDepth.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\Diagnostics.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\DirectiveHandler.cpp" />
</span><ins>+ <ClCompile Include="..\src\compiler\translator\FlagStd140Structs.cpp" />
</ins><span class="cx"> <ClCompile Include="..\src\compiler\translator\ForLoopUnroll.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\InfoSink.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\Initialize.cpp" />
</span><span class="lines">@@ -155,7 +163,7 @@
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\Intermediate.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\intermOut.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\IntermTraverse.cpp" />
</span><del>- <ClCompile Include="..\src\compiler\translator\MapLongVariableNames.cpp" />
</del><ins>+ <ClCompile Include="..\src\compiler\translator\LoopInfo.cpp" />
</ins><span class="cx"> <ClCompile Include="..\src\compiler\translator\ossource_win.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\parseConst.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\ParseContext.cpp" />
</span><span class="lines">@@ -168,6 +176,7 @@
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuitAST.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\util.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\ValidateLimitations.cpp" />
</span><ins>+ <ClCompile Include="..\src\compiler\translator\ValidateOutputs.cpp" />
</ins><span class="cx"> <ClCompile Include="..\src\compiler\translator\VariableInfo.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\VariablePacker.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\glslang_lex.cpp" />
</span><span class="lines">@@ -188,6 +197,15 @@
</span><span class="cx"> </CustomBuild>
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><ins>+ <ClInclude Include="..\src\common\angleutils.h" />
+ <ClInclude Include="..\src\common\blocklayout.h" />
+ <ClInclude Include="..\src\common\debug.h" />
+ <ClInclude Include="..\src\common\event_tracer.h" />
+ <ClInclude Include="..\src\common\mathutil.h" />
+ <ClInclude Include="..\src\common\RefCountObject.h" />
+ <ClInclude Include="..\src\common\shadervars.h" />
+ <ClInclude Include="..\src\common\utilities.h" />
+ <ClInclude Include="..\src\common\version.h" />
</ins><span class="cx"> <ClInclude Include="..\src\compiler\translator\BaseTypes.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\BuiltInFunctionEmulator.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\Common.h" />
</span><span class="lines">@@ -196,6 +214,7 @@
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\DetectCallDepth.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\Diagnostics.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\DirectiveHandler.h" />
</span><ins>+ <ClInclude Include="..\src\compiler\translator\FlagStd140Structs.h" />
</ins><span class="cx"> <ClInclude Include="..\src\compiler\translator\ForLoopUnroll.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\HashNames.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\InfoSink.h" />
</span><span class="lines">@@ -206,7 +225,7 @@
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\InitializeParseContext.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\intermediate.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\localintermediate.h" />
</span><del>- <ClInclude Include="..\src\compiler\translator\MapLongVariableNames.h" />
</del><ins>+ <ClInclude Include="..\src\compiler\translator\LoopInfo.h" />
</ins><span class="cx"> <ClInclude Include="..\src\compiler\translator\MMap.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\osinclude.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\ParseContext.h" />
</span><span class="lines">@@ -222,6 +241,7 @@
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuitAST.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\util.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\ValidateLimitations.h" />
</span><ins>+ <ClInclude Include="..\src\compiler\translator\ValidateOutputs.h" />
</ins><span class="cx"> <ClInclude Include="..\src\compiler\translator\VariableInfo.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\VariablePacker.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\glslang_tab.h" />
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -27,6 +27,9 @@
</span><span class="cx"> <Filter Include="Source Files\generated">
</span><span class="cx"> <UniqueIdentifier>{eb8da157-b29c-43c3-880d-54679e176dc5}</UniqueIdentifier>
</span><span class="cx"> </Filter>
</span><ins>+ <Filter Include="Source Files\common">
+ <UniqueIdentifier>{69095c0a-dd27-4295-b89c-fe324ffa36ad}</UniqueIdentifier>
+ </Filter>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\glslang_lex.cpp">
</span><span class="lines">@@ -104,7 +107,7 @@
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\IntermTraverse.cpp">
</span><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\translator\MapLongVariableNames.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\LoopInfo.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\ossource_win.cpp">
</span><span class="lines">@@ -152,6 +155,33 @@
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\RewriteElseBlocks.cpp">
</span><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\src\common\blocklayout.cpp">
+ <Filter>Source Files\common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\common\debug.cpp">
+ <Filter>Source Files\common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\common\event_tracer.cpp">
+ <Filter>Source Files\common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\common\mathutil.cpp">
+ <Filter>Source Files\common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\common\RefCountObject.cpp">
+ <Filter>Source Files\common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\common\shadervars.cpp">
+ <Filter>Source Files\common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\common\utilities.cpp">
+ <Filter>Source Files\common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\compiler\translator\FlagStd140Structs.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\compiler\translator\ValidateOutputs.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\glslang_tab.h">
</span><span class="lines">@@ -217,7 +247,7 @@
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\MMap.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\translator\MapLongVariableNames.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\LoopInfo.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\localintermediate.h">
</span><span class="lines">@@ -286,6 +316,39 @@
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\RewriteElseBlocks.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\src\common\angleutils.h">
+ <Filter>Source Files\common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\common\blocklayout.h">
+ <Filter>Source Files\common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\common\debug.h">
+ <Filter>Source Files\common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\common\event_tracer.h">
+ <Filter>Source Files\common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\common\mathutil.h">
+ <Filter>Source Files\common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\common\RefCountObject.h">
+ <Filter>Source Files\common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\common\shadervars.h">
+ <Filter>Source Files\common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\common\utilities.h">
+ <Filter>Source Files\common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\common\version.h">
+ <Filter>Source Files\common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\compiler\translator\FlagStd140Structs.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\compiler\translator\ValidateOutputs.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <CustomBuild Include="..\src\compiler\translator\glslang.l">
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -147,7 +147,6 @@
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\TranslatorESSL.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\TranslatorGLSL.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuit.cpp" />
</span><del>- <ClCompile Include="..\src\compiler\translator\Uniform.cpp" />
</del><span class="cx"> <ClCompile Include="..\src\compiler\translator\VersionGLSL.cpp" />
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="lines">@@ -159,7 +158,6 @@
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\TranslatorESSL.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\TranslatorGLSL.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuit.h" />
</span><del>- <ClInclude Include="..\src\compiler\translator\Uniform.h" />
</del><span class="cx"> <ClInclude Include="..\src\compiler\translator\VersionGLSL.h" />
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -38,9 +38,6 @@
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuit.cpp">
</span><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\translator\Uniform.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</del><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\DetectDiscontinuity.h">
</span><span class="lines">@@ -70,8 +67,5 @@
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuit.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\translator\Uniform.h">
- <Filter>Header Files</Filter>
- </ClInclude>
</del><span class="cx"> </ItemGroup>
</span><span class="cx"> </Project>
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -144,7 +144,6 @@
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\SearchSymbol.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\TranslatorHLSL.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuit.cpp" />
</span><del>- <ClCompile Include="..\src\compiler\translator\Uniform.cpp" />
</del><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\DetectDiscontinuity.h" />
</span><span class="lines">@@ -152,7 +151,6 @@
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\SearchSymbol.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\TranslatorHLSL.h" />
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuit.h" />
</span><del>- <ClInclude Include="..\src\compiler\translator\Uniform.h" />
</del><span class="cx"> </ItemGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -20,9 +20,6 @@
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuit.cpp">
</span><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\translator\Uniform.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\src\compiler\translator\OutputHLSL.cpp">
</span><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -40,9 +37,6 @@
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuit.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\translator\Uniform.h">
- <Filter>Header Files</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\src\compiler\translator\OutputHLSL.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-05-02 Alex Christensen <achristensen@webkit.org>
+
+ Update ANGLE Windows build.
+ https://bugs.webkit.org/show_bug.cgi?id=132456
+
+ Reviewed by Brent Fulgham.
+
+ * ANGLE.vcxproj/libEGLCommon.props:
+ * ANGLE.vcxproj/libGLESv2.vcxproj:
+ * ANGLE.vcxproj/libGLESv2.vcxproj.filters:
+ * ANGLE.vcxproj/libGLESv2Common.props:
+ * ANGLE.vcxproj/translator_common.vcxproj:
+ * ANGLE.vcxproj/translator_common.vcxproj.filters:
+ * ANGLE.vcxproj/translator_glsl.vcxproj:
+ * ANGLE.vcxproj/translator_glsl.vcxproj.filters:
+ * ANGLE.vcxproj/translator_hlsl.vcxproj:
+ * ANGLE.vcxproj/translator_hlsl.vcxproj.filters:
+ Updated ANGLE build.
+ * src/ANGLE.sln: Removed.
+ * src/build_angle.gyp: Removed.
+ * src/commit.h: Added.
+ * changes.diff:
+ * src/libGLESv2/Program.cpp:
+ (gl::InfoLog::append):
+ Fixed typo.
+
</ins><span class="cx"> 2014-05-01 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Finish updating ANGLE.
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEchangesdiff"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/changes.diff (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/changes.diff 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/changes.diff 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> {
</span><span class="cx"> mInfoLog = new char[infoLength + 2];
</span><span class="cx"> logPointer = mInfoLog;
</span><del>-+ logLength = infoLenfth + 2;
</del><ins>++ logLength = infoLength + 2;
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEsrcANGLEsln"></a>
<div class="delfile"><h4>Deleted: trunk/Source/ThirdParty/ANGLE/src/ANGLE.sln (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/src/ANGLE.sln 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/src/ANGLE.sln 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL\libEGL.vcxproj", "{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator", "compiler\translator.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "compiler\preprocessor\preprocessor.vcxproj", "{FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug|Win32.ActiveCfg = Debug|Win32
- {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug|Win32.Build.0 = Debug|Win32
- {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug|x64.ActiveCfg = Debug|x64
- {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug|x64.Build.0 = Debug|x64
- {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|Win32.ActiveCfg = Release|Win32
- {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|Win32.Build.0 = Release|Win32
- {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|x64.ActiveCfg = Release|x64
- {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|x64.Build.0 = Release|x64
- {B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug|Win32.ActiveCfg = Debug|Win32
- {B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug|Win32.Build.0 = Debug|Win32
- {B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug|x64.ActiveCfg = Debug|x64
- {B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug|x64.Build.0 = Debug|x64
- {B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|Win32.ActiveCfg = Release|Win32
- {B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|Win32.Build.0 = Release|Win32
- {B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.ActiveCfg = Release|x64
- {B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.Build.0 = Release|x64
- {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.ActiveCfg = Debug|Win32
- {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.Build.0 = Debug|Win32
- {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.ActiveCfg = Debug|x64
- {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.Build.0 = Debug|x64
- {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.ActiveCfg = Release|Win32
- {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.Build.0 = Release|Win32
- {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.ActiveCfg = Release|x64
- {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.Build.0 = Release|x64
- {FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}.Debug|Win32.ActiveCfg = Debug|Win32
- {FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}.Debug|Win32.Build.0 = Debug|Win32
- {FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}.Debug|x64.ActiveCfg = Debug|x64
- {FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}.Debug|x64.Build.0 = Debug|x64
- {FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}.Release|Win32.ActiveCfg = Release|Win32
- {FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}.Release|Win32.Build.0 = Release|Win32
- {FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}.Release|x64.ActiveCfg = Release|x64
- {FBE32DF3-0FB0-4F2F-A424-2C21BD7BC325}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
</del></span></pre></div>
<a id="trunkSourceThirdPartyANGLEsrcbuild_anglegyp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/ThirdParty/ANGLE/src/build_angle.gyp (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/src/build_angle.gyp 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/src/build_angle.gyp 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>-# Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'includes':
- [
- 'angle.gypi',
- ],
-}
</del></span></pre></div>
<a id="trunkSourceThirdPartyANGLEsrccommith"></a>
<div class="addfile"><h4>Added: trunk/Source/ThirdParty/ANGLE/src/commit.h (0 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/src/commit.h (rev 0)
+++ trunk/Source/ThirdParty/ANGLE/src/commit.h 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+#define ANGLE_COMMIT_HASH "e7a453a5bd76"
+#define ANGLE_COMMIT_HASH_SIZE 12
+#define ANGLE_COMMIT_DATE "2014-04-28 20:07:02 +0000"
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEsrclibGLESv2Programcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/src/libGLESv2/Program.cpp (168186 => 168187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/src/libGLESv2/Program.cpp 2014-05-02 20:03:41 UTC (rev 168186)
+++ trunk/Source/ThirdParty/ANGLE/src/libGLESv2/Program.cpp 2014-05-02 20:53:11 UTC (rev 168187)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> {
</span><span class="cx"> mInfoLog = new char[infoLength + 2];
</span><span class="cx"> logPointer = mInfoLog;
</span><del>- logLength = infoLenfth + 2;
</del><ins>+ logLength = infoLength + 2;
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>