[ANGLE] Update ANGLE in WebKit

https://bugs.webkit.org/show_bug.cgi?id=106274

Unreviewed attempted build fix.

Source/ThirdParty/ANGLE:

Remove the copy files stage. Make khrplatform.h a public header.

* ANGLE.xcodeproj/project.pbxproj:
* include/GLSLANG/ShaderLang.h:

Source/WebKit:

The khrplatform.h file is now a public header without a directory
prefix. Update the include path to look in the right place.

* PlatformEfl.cmake:

Source/WebKit2:

The khrplatform.h file is now a public header without a directory
prefix. Update the include path to look in the right place.

* PlatformEfl.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139702 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj b/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
index 5113b799cc3400792cd0621f1f516d4d0a730916..2d3195a81f4e69b91bc30adf0676ca8dda206346 100644 (file)
--- a/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
+++ b/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
@@ -70,7 +70,7 @@
                A264F8C816974E2A006FAA5A /* HashNames.h in Headers */ = {isa = PBXBuildFile; fileRef = A264F8C516974E2A006FAA5A /* HashNames.h */; };
                A264F8C916974E2A006FAA5A /* VariablePacker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A264F8C616974E2A006FAA5A /* VariablePacker.cpp */; };
                A264F8CA16974E2A006FAA5A /* VariablePacker.h in Headers */ = {isa = PBXBuildFile; fileRef = A264F8C716974E2A006FAA5A /* VariablePacker.h */; };
-               A264F8CD169762AA006FAA5A /* khrplatform.h in Headers */ = {isa = PBXBuildFile; fileRef = A264F8CC169762AA006FAA5A /* khrplatform.h */; settings = {ATTRIBUTES = (); }; };
+               A264F8CD169762AA006FAA5A /* khrplatform.h in Headers */ = {isa = PBXBuildFile; fileRef = A264F8CC169762AA006FAA5A /* khrplatform.h */; settings = {ATTRIBUTES = (Public, ); }; };
                A26567BB159C21B100398539 /* Diagnostics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A26567B0159C21B100398539 /* Diagnostics.cpp */; };
                A26567BC159C21B100398539 /* Diagnostics.h in Headers */ = {isa = PBXBuildFile; fileRef = A26567B1159C21B100398539 /* Diagnostics.h */; };
                A26567BD159C21B100398539 /* DirectiveHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A26567B2159C21B100398539 /* DirectiveHandler.cpp */; };
@@ -89,7 +89,6 @@
                A2656841159C23E100398539 /* RestrictFragmentShaderTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = A2656836159C23E100398539 /* RestrictFragmentShaderTiming.h */; };
                A2656842159C23E100398539 /* RestrictVertexShaderTiming.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A2656837159C23E100398539 /* RestrictVertexShaderTiming.cpp */; };
                A2656843159C23E100398539 /* RestrictVertexShaderTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = A2656838159C23E100398539 /* RestrictVertexShaderTiming.h */; };
-               A29B15E81697845700111D97 /* khrplatform.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A264F8CC169762AA006FAA5A /* khrplatform.h */; };
                FB39D2711200F35A00088E69 /* CodeGenGLSL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB39D2221200F35A00088E69 /* CodeGenGLSL.cpp */; };
                FB39D2751200F35A00088E69 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB39D2261200F35A00088E69 /* debug.cpp */; };
                FB39D2791200F35A00088E69 /* InfoSink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB39D22A1200F35A00088E69 /* InfoSink.cpp */; };
@@ -132,16 +131,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               A29B15E61697844500111D97 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 12;
-                       dstPath = usr/local/include/KHR;
-                       dstSubfolderSpec = 16;
-                       files = (
-                               A29B15E81697845700111D97 /* khrplatform.h in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -521,6 +510,7 @@
                        buildActionMask = 2147483647;
                        files = (
                                FB39D76E120110FC00088E69 /* ShaderLang.h in Headers */,
+                               A264F8CD169762AA006FAA5A /* khrplatform.h in Headers */,
                                90D9B10312E11DCB002D4255 /* ExtensionBehavior.h in Headers */,
                                90D9B10612E11DCB002D4255 /* glslang_tab.h in Headers */,
                                90D9B10712E11DCB002D4255 /* glslang.h in Headers */,
@@ -563,7 +553,6 @@
                                A264F8C416974DED006FAA5A /* Tokenizer.h in Headers */,
                                A264F8C816974E2A006FAA5A /* HashNames.h in Headers */,
                                A264F8CA16974E2A006FAA5A /* VariablePacker.h in Headers */,
-                               A264F8CD169762AA006FAA5A /* khrplatform.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -579,7 +568,6 @@
                                FB39D0CF1200F0E300088E69 /* Frameworks */,
                                312BDB0B15FECAB00097EBC7 /* CopyFiles */,
                                312BDB0D15FECACE0097EBC7 /* CopyFiles */,
-                               A29B15E61697844500111D97 /* CopyFiles */,
                        );
                        buildRules = (
                        );

diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
index 011f1ece0d74042c69fb756efa7f3dffcba600e8..2e27f2dc78307902043a0a7d15bfba38edeb96ad 100644 (file)
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -1,3 +1,15 @@
+2013-01-14  Dean Jackson  <dino@apple.com>
+
+        [ANGLE] Update ANGLE in WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=106274
+
+        Unreviewed attempted build fix.
+
+        Remove the copy files stage. Make khrplatform.h a public header.
+
+        * ANGLE.xcodeproj/project.pbxproj:
+        * include/GLSLANG/ShaderLang.h:
+
 2013-01-14  Max Vujovic  <mvujovic@adobe.com>
 
         [ANGLE] Update ANGLE in WebKit

diff --git a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
index 46237f1f201a2813d66288f12d10a73a80ecba33..22e128432e4c2f7f3d1588b6baa8fc9cc6378d78 100644 (file)
--- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
+++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
@@ -23,7 +23,7 @@
 #define COMPILER_EXPORT
 #endif
 
-#include "KHR/khrplatform.h"
+#include "khrplatform.h"
 
 //
 // This is the platform independent interface between an OGL driver

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 1f568d9a2aff60c56e15f34e4127785828f7ee2b..31cc188f3af47cc86ac959c4fc22b7f6f0da1630 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2013-01-14  Dean Jackson  <dino@apple.com>
+
+        [ANGLE] Update ANGLE in WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=106274
+
+        Unreviewed attempted build fix.
+
+        The khrplatform.h file is now a public header without a directory
+        prefix. Update the include path to look in the right place.
+
+        * PlatformEfl.cmake:
+
 2013-01-14  Max Vujovic  <mvujovic@adobe.com>
 
         [ANGLE] Update ANGLE in WebKit

diff --git a/Source/WebKit/PlatformEfl.cmake b/Source/WebKit/PlatformEfl.cmake
index a458ed4dcf2254136813bf30f1b0ec7176f38a08..4db6d55cca7bdf3673309df9b1dc2ddd4581607d 100644 (file)
--- a/Source/WebKit/PlatformEfl.cmake
+++ b/Source/WebKit/PlatformEfl.cmake
@@ -78,7 +78,7 @@ if (WTF_USE_3D_GRAPHICS)
     list(APPEND WebKit_INCLUDE_DIRECTORIES
         "${WEBCORE_DIR}/platform/graphics/surfaces"
         "${WEBCORE_DIR}/platform/graphics/texmap"
-        "${THIRDPARTY_DIR}/ANGLE/include"
+        "${THIRDPARTY_DIR}/ANGLE/include/KHR"
         "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
     )
 endif ()

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 63fedd1d61afb72ddd866c2184f6d22963b969ba..ac116f4e6c06240eff9b6e753a516318897befa3 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2013-01-14  Dean Jackson  <dino@apple.com>
+
+        [ANGLE] Update ANGLE in WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=106274
+
+        Unreviewed attempted build fix.
+
+        The khrplatform.h file is now a public header without a directory
+        prefix. Update the include path to look in the right place.
+
+        * PlatformEfl.cmake:
+
 2013-01-14  Alexey Proskuryakov  <ap@apple.com>
 
         <rdar://problem/12524710> Update sandbox rules after r128003

diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
index ea41035921afcc36d53ace0ef274f7f3e43ca666..4076c85363d96a2a0f047cf030a234b13fbfcf61 100644 (file)
--- a/Source/WebKit2/PlatformEfl.cmake
+++ b/Source/WebKit2/PlatformEfl.cmake
@@ -195,7 +195,7 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
 
 if (WTF_USE_3D_GRAPHICS)
     list(APPEND WebKit2_INCLUDE_DIRECTORIES
-        "${THIRDPARTY_DIR}/ANGLE/include"
+        "${THIRDPARTY_DIR}/ANGLE/include/KHR"
         "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
     )
 endif ()