[webkit-changes] [153732] trunk/Source/ThirdParty/ANGLE

Mon, 05 Aug 2013 17:40:55 -0700

Title: [153732] trunk/Source/ThirdParty/ANGLE
Revision
153732
Author
achristen...@apple.com
Date
2013-08-05 17:41:08 -0700 (Mon, 05 Aug 2013)

Log Message

Added optimizations to Windows ANGLE builds.
https://bugs.webkit.org/show_bug.cgi?id=119500

Reviewed by Brent Fulgham.

* ANGLE.vcxproj/ANGLERelease.props: Added.
* ANGLE.vcxproj/libEGL.vcxproj:
* ANGLE.vcxproj/libGLESv2.vcxproj:
* ANGLE.vcxproj/preprocessor.vcxproj:
* ANGLE.vcxproj/translator_common.vcxproj:
* ANGLE.vcxproj/translator_glsl.vcxproj:
* ANGLE.vcxproj/translator_hlsl.vcxproj:
Use ANGLERelease.props for Release, Release_WinCairo, and Production configurations.

Modified Paths

Added Paths

Diff

Added: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLERelease.props (0 => 153732)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLERelease.props	                        (rev 0)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLERelease.props	2013-08-06 00:41:08 UTC (rev 153732)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj (153731 => 153732)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj	2013-08-06 00:39:42 UTC (rev 153731)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj	2013-08-06 00:41:08 UTC (rev 153732)
@@ -91,6 +91,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -101,6 +102,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -118,18 +120,22 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj (153731 => 153732)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj	2013-08-06 00:39:42 UTC (rev 153731)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj	2013-08-06 00:41:08 UTC (rev 153732)
@@ -87,6 +87,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -97,6 +98,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -114,18 +116,22 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj (153731 => 153732)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj	2013-08-06 00:39:42 UTC (rev 153731)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj	2013-08-06 00:41:08 UTC (rev 153732)
@@ -84,6 +84,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
@@ -92,6 +93,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
@@ -108,18 +110,22 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj (153731 => 153732)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj	2013-08-06 00:39:42 UTC (rev 153731)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj	2013-08-06 00:41:08 UTC (rev 153732)
@@ -84,6 +84,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
@@ -92,6 +93,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
@@ -108,18 +110,22 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj (153731 => 153732)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj	2013-08-06 00:39:42 UTC (rev 153731)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj	2013-08-06 00:41:08 UTC (rev 153732)
@@ -84,6 +84,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
@@ -92,6 +93,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
@@ -108,18 +110,22 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj (153731 => 153732)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj	2013-08-06 00:39:42 UTC (rev 153731)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj	2013-08-06 00:41:08 UTC (rev 153732)
@@ -84,6 +84,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
@@ -92,6 +93,7 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
@@ -108,18 +110,22 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
     <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
+    <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (153731 => 153732)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2013-08-06 00:39:42 UTC (rev 153731)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2013-08-06 00:41:08 UTC (rev 153732)
@@ -1,3 +1,19 @@
+2013-08-05  Alex Christensen  <achristen...@apple.com>
+
+        Added optimizations to Windows ANGLE builds.
+        https://bugs.webkit.org/show_bug.cgi?id=119500
+
+        Reviewed by Brent Fulgham.
+
+        * ANGLE.vcxproj/ANGLERelease.props: Added.
+        * ANGLE.vcxproj/libEGL.vcxproj:
+        * ANGLE.vcxproj/libGLESv2.vcxproj:
+        * ANGLE.vcxproj/preprocessor.vcxproj:
+        * ANGLE.vcxproj/translator_common.vcxproj:
+        * ANGLE.vcxproj/translator_glsl.vcxproj:
+        * ANGLE.vcxproj/translator_hlsl.vcxproj:
+        Use ANGLERelease.props for Release, Release_WinCairo, and Production configurations.
+
 2013-08-02  Alex Christensen  <achristen...@apple.com>
 
         Soft link ANGLE on Windows.

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to