Diff
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2013-11-21 17:36:32 UTC (rev 159630)
@@ -163,7 +163,6 @@
<ClInclude Include="..\include\EGL\egl.h" />
<ClInclude Include="..\include\EGL\eglext.h" />
<ClInclude Include="..\include\EGL\eglplatform.h" />
- <ClInclude Include="..\include\EGL\eglsoftlinking.h" />
<ClInclude Include="..\src\common\version.h" />
<ClInclude Include="..\src\libEGL\Config.h" />
<ClInclude Include="..\src\libEGL\Display.h" />
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj.filters (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj.filters 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj.filters 2013-11-21 17:36:32 UTC (rev 159630)
@@ -44,9 +44,6 @@
<ClInclude Include="..\src\common\version.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\include\EGL\eglsoftlinking.h">
- <Filter>Header Files</Filter>
- </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\libEGL\Config.cpp">
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2013-11-21 17:36:32 UTC (rev 159630)
@@ -145,7 +145,9 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemGroup>
+ <ClCompile Include="..\src\common\event_tracer.cpp" />
<ClCompile Include="..\src\libGLESv2\Buffer.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\IndexRangeCache.cpp" />
<ClCompile Include="..\src\third_party\murmurhash\MurmurHash3.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
@@ -238,9 +240,10 @@
<ClCompile Include="..\src\libGLESv2\utilities.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\include\GLES2\gl2softlinking.h" />
<ClInclude Include="..\src\common\debug.h" />
+ <ClInclude Include="..\src\common\event_tracer.h" />
<ClInclude Include="..\src\common\system.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\IndexRangeCache.h" />
<ClInclude Include="..\src\third_party\murmurhash\MurmurHash3.h" />
<ClInclude Include="..\src\libGLESv2\angletypes.h" />
<ClInclude Include="..\src\libGLESv2\BinaryStream.h" />
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters 2013-11-21 17:36:32 UTC (rev 159630)
@@ -218,6 +218,12 @@
<ClCompile Include="..\src\libGLESv2\Buffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\IndexRangeCache.cpp">
+ <Filter>Source Files\Renderer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\common\event_tracer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\libGLESv2\BinaryStream.h">
@@ -484,7 +490,10 @@
<ClInclude Include="..\src\libGLESv2\precompiled.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\include\GLES2\gl2softlinking.h">
+ <ClInclude Include="..\src\libGLESv2\renderer\IndexRangeCache.h">
+ <Filter>Header Files\Renderer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\common\event_tracer.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2013-11-21 17:36:32 UTC (rev 159630)
@@ -9,7 +9,7 @@
</ClCompile>
<Link>
<ModuleDefinitionFile>../src/libGLESv2/libGLESv2.def</ModuleDefinitionFile>
- <AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common.lib;translator_hlsl.lib;preprocessor.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common.lib;translator_hlsl.lib;translator_glsl.lib;preprocessor.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2013-11-21 17:36:32 UTC (rev 159630)
@@ -130,6 +130,7 @@
<PropertyGroup Label="UserMacros" />
<ItemGroup>
<ClCompile Include="..\src\compiler\BuiltInFunctionEmulator.cpp" />
+ <ClCompile Include="..\src\compiler\CodeGen.cpp" />
<ClCompile Include="..\src\compiler\Compiler.cpp" />
<ClCompile Include="..\src\compiler\debug.cpp" />
<ClCompile Include="..\src\compiler\DetectCallDepth.cpp" />
@@ -139,6 +140,7 @@
<ClCompile Include="..\src\compiler\InfoSink.cpp" />
<ClCompile Include="..\src\compiler\Initialize.cpp" />
<ClCompile Include="..\src\compiler\InitializeDll.cpp" />
+ <ClCompile Include="..\src\compiler\InitializeGLPosition.cpp" />
<ClCompile Include="..\src\compiler\InitializeParseContext.cpp" />
<ClCompile Include="..\src\compiler\Intermediate.cpp" />
<ClCompile Include="..\src\compiler\intermOut.cpp" />
@@ -146,12 +148,13 @@
<ClCompile Include="..\src\compiler\MapLongVariableNames.cpp" />
<ClCompile Include="..\src\compiler\ossource_win.cpp" />
<ClCompile Include="..\src\compiler\parseConst.cpp" />
- <ClCompile Include="..\src\compiler\ParseHelper.cpp" />
+ <ClCompile Include="..\src\compiler\ParseContext.cpp" />
<ClCompile Include="..\src\compiler\PoolAlloc.cpp" />
<ClCompile Include="..\src\compiler\QualifierAlive.cpp" />
<ClCompile Include="..\src\compiler\RemoveTree.cpp" />
<ClCompile Include="..\src\compiler\ShaderLang.cpp" />
<ClCompile Include="..\src\compiler\SymbolTable.cpp" />
+ <ClCompile Include="..\src\compiler\UnfoldShortCircuitAST.cpp" />
<ClCompile Include="..\src\compiler\util.cpp" />
<ClCompile Include="..\src\compiler\ValidateLimitations.cpp" />
<ClCompile Include="..\src\compiler\VariableInfo.cpp" />
@@ -164,6 +167,7 @@
<ClCompile Include="..\src\compiler\depgraph\DependencyGraphTraverse.cpp" />
<ClCompile Include="..\src\compiler\timing\RestrictFragmentShaderTiming.cpp" />
<ClCompile Include="..\src\compiler\timing\RestrictVertexShaderTiming.cpp" />
+ <ClCompile Include="..\src\compiler\VersionGLSL.cpp" />
<ClCompile Include="..\src\third_party\compiler\ArrayBoundsClamper.cpp" />
</ItemGroup>
<ItemGroup>
@@ -187,13 +191,14 @@
<ClInclude Include="..\src\compiler\Initialize.h" />
<ClInclude Include="..\src\compiler\InitializeDll.h" />
<ClInclude Include="..\src\compiler\InitializeGlobals.h" />
+ <ClInclude Include="..\src\compiler\InitializeGLPosition.h" />
<ClInclude Include="..\src\compiler\InitializeParseContext.h" />
<ClInclude Include="..\src\compiler\intermediate.h" />
<ClInclude Include="..\src\compiler\localintermediate.h" />
<ClInclude Include="..\src\compiler\MapLongVariableNames.h" />
<ClInclude Include="..\src\compiler\MMap.h" />
<ClInclude Include="..\src\compiler\osinclude.h" />
- <ClInclude Include="..\src\compiler\ParseHelper.h" />
+ <ClInclude Include="..\src\compiler\ParseContext.h" />
<ClInclude Include="..\src\compiler\PoolAlloc.h" />
<ClInclude Include="..\src\compiler\QualifierAlive.h" />
<ClInclude Include="..\src\compiler\RemoveTree.h" />
@@ -202,6 +207,7 @@
<ClInclude Include="..\src\compiler\ShHandle.h" />
<ClInclude Include="..\src\compiler\SymbolTable.h" />
<ClInclude Include="..\src\compiler\Types.h" />
+ <ClInclude Include="..\src\compiler\UnfoldShortCircuitAST.h" />
<ClInclude Include="..\src\compiler\util.h" />
<ClInclude Include="..\src\compiler\ValidateLimitations.h" />
<ClInclude Include="..\src\compiler\VariableInfo.h" />
@@ -212,6 +218,7 @@
<ClInclude Include="..\src\compiler\depgraph\DependencyGraph.h" />
<ClInclude Include="..\src\compiler\depgraph\DependencyGraphBuilder.h" />
<ClInclude Include="..\src\compiler\depgraph\DependencyGraphOutput.h" />
+ <ClInclude Include="..\src\compiler\VersionGLSL.h" />
<ClInclude Include="..\src\third_party\compiler\ArrayBoundsClamper.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters 2013-11-21 17:36:32 UTC (rev 159630)
@@ -110,9 +110,6 @@
<ClCompile Include="..\src\compiler\parseConst.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\src\compiler\ParseHelper.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\src\compiler\PoolAlloc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -137,6 +134,21 @@
<ClCompile Include="..\src\compiler\VariableInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\src\compiler\InitializeGLPosition.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\compiler\ParseContext.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\compiler\VersionGLSL.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\compiler\CodeGen.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\compiler\UnfoldShortCircuitAST.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\compiler\glslang_tab.h">
@@ -196,9 +208,6 @@
<ClInclude Include="..\src\compiler\PoolAlloc.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\src\compiler\ParseHelper.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\src\compiler\osinclude.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -259,6 +268,18 @@
<ClInclude Include="..\src\compiler\BaseTypes.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\src\compiler\InitializeGLPosition.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\compiler\ParseContext.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\compiler\VersionGLSL.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\compiler\UnfoldShortCircuitAST.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\src\compiler\glslang.l">
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2013-11-21 17:36:32 UTC (rev 159630)
@@ -129,7 +129,6 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemGroup>
- <ClCompile Include="..\src\compiler\CodeGenGLSL.cpp" />
<ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp" />
<ClCompile Include="..\src\compiler\OutputESSL.cpp" />
<ClCompile Include="..\src\compiler\OutputGLSL.cpp" />
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters 2013-11-21 17:36:32 UTC (rev 159630)
@@ -11,9 +11,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\src\compiler\CodeGenGLSL.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\src\compiler\VersionGLSL.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2013-11-21 17:36:32 UTC (rev 159630)
@@ -129,7 +129,6 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemGroup>
- <ClCompile Include="..\src\compiler\CodeGenHLSL.cpp" />
<ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp" />
<ClCompile Include="..\src\compiler\OutputHLSL.cpp" />
<ClCompile Include="..\src\compiler\SearchSymbol.cpp" />
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters 2013-11-21 17:36:32 UTC (rev 159630)
@@ -23,9 +23,6 @@
<ClCompile Include="..\src\compiler\Uniform.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\src\compiler\CodeGenHLSL.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\src\compiler\OutputHLSL.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-11-21 17:36:32 UTC (rev 159630)
@@ -1,3 +1,25 @@
+2013-11-21 [email protected] <[email protected]>
+
+ [WinCairo] Building ANGLE libraries fails.
+ https://bugs.webkit.org/show_bug.cgi?id=124679
+
+ Reviewed by Brent Fulgham.
+
+ Added/removed files to/from project, and re-added constants.h file.
+
+ * ANGLE.vcxproj/libEGL.vcxproj:
+ * ANGLE.vcxproj/libEGL.vcxproj.filters:
+ * 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:
+ * src/libGLESv2/libGLESv2.def:
+
2013-11-20 Sergio Correia <[email protected]>
ANGLE doesn't build with bison 3.0
Modified: trunk/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.def (159629 => 159630)
--- trunk/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.def 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.def 2013-11-21 17:36:32 UTC (rev 159630)
@@ -183,6 +183,3 @@
glBindTexImage @158 NONAME
glCreateRenderer @177 NONAME
glDestroyRenderer @178 NONAME
-
- ; Setting up TRACE macro callbacks
- SetTraceFunctionPointers @180
Modified: trunk/Source/WebKit/ChangeLog (159629 => 159630)
--- trunk/Source/WebKit/ChangeLog 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/WebKit/ChangeLog 2013-11-21 17:36:32 UTC (rev 159630)
@@ -1,3 +1,12 @@
+2013-11-21 [email protected] <[email protected]>
+
+ [WinCairo] Building ANGLE libraries fails.
+ https://bugs.webkit.org/show_bug.cgi?id=124679
+
+ Reviewed by Brent Fulgham.
+
+ * WebKit.vcxproj/WebKit/WebKitCFLite.props: Link with translator_hlsl.lib.
+
2013-11-19 Mark Lam <[email protected]>
Add tracking of endColumn for Executables.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCFLite.props (159629 => 159630)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCFLite.props 2013-11-21 17:11:35 UTC (rev 159629)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCFLite.props 2013-11-21 17:36:32 UTC (rev 159630)
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<Link>
- <AdditionalDependencies>CFLite.lib;preprocessor.lib;translator_common.lib;translator_glsl.lib;libEGL.lib;libGLESv2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>CFLite.lib;preprocessor.lib;translator_common.lib;translator_glsl.lib;translator_hlsl.lib;libEGL.lib;libGLESv2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
