Rename Platform.h to PlatformMethods.h.

null77 · Commit Bot · commit 0df92012a18e · 2020-06-04T15:44:40.000Z
"platform.h" is too common a name and causes headers to be included incorrectly. Disambiguate the header using a more specific name. Solves a problem that came up with the GLES 1 tests and the standalone test harness. Bug: angleproject:3162 Change-Id: I88229a2c9407e0db57f5beee44daa11a4075f700 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2229065 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
diff --git a/include/platform/Platform.h b/include/platform/Platform.h
diff --git a/include/platform/PlatformMethods.h b/include/platform/PlatformMethods.h
diff --git a/scripts/code_generation_hashes/proc_table.json b/scripts/code_generation_hashes/proc_table.json
@@ -4,7 +4,7 @@
   "scripts/egl_angle_ext.xml":
     "854e99785af19f8f4eea4f73005a0451",
   "scripts/gen_proc_table.py":
-    "7f52dba9bba75fffba11f427af205d6a",
+    "05587426d508d13eec257c4e5f3a0a13",
   "scripts/gl.xml":
     "e74a595068cbdd6064300be1e71b7cc9",
   "scripts/gl_angle_ext.xml":
@@ -14,7 +14,7 @@
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libGL/proc_table_wgl_autogen.cpp":
-    "b2ea218380642a9f426a131b77762ce9",
+    "253f59ef3aa9ccfcab1364ae5101dbe2",
   "src/libGLESv2/proc_table_egl_autogen.cpp":
-    "ebf1d019dd3a474485549bd052e7cd87"
+    "d35c6036573a3b9a69438687b4f7136c"
 }
diff --git a/scripts/gen_proc_table.py b/scripts/gen_proc_table.py
@@ -55,7 +55,7 @@
 #include "libGLESv2/entry_points_gles_3_1_autogen.h"
 #include "libGLESv2/entry_points_gles_3_2_autogen.h"
 #include "libGLESv2/entry_points_gles_ext_autogen.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 """
 
 includes_gl = """#include "libGL/proc_table_wgl.h"
@@ -80,7 +80,7 @@
 #include "libGL/entry_points_gl_4_4_autogen.h"
 #include "libGL/entry_points_gl_4_5_autogen.h"
 #include "libGL/entry_points_gl_4_6_autogen.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 """
 
 sys.path.append('../src/libANGLE/renderer')
diff --git a/src/common/event_tracer.h b/src/common/event_tracer.h
@@ -6,7 +6,7 @@
 #define COMMON_EVENT_TRACER_H_
 
 #include "common/platform.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 namespace angle
 {
diff --git a/src/libANGLE/BlobCache.cpp b/src/libANGLE/BlobCache.cpp
@@ -13,7 +13,7 @@
 #include "libANGLE/Context.h"
 #include "libANGLE/Display.h"
 #include "libANGLE/histogram_macros.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 namespace egl
 {
diff --git a/src/libANGLE/MemoryProgramCache.cpp b/src/libANGLE/MemoryProgramCache.cpp
@@ -19,7 +19,7 @@
 #include "libANGLE/Uniform.h"
 #include "libANGLE/histogram_macros.h"
 #include "libANGLE/renderer/ProgramImpl.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 namespace gl
 {
diff --git a/src/libANGLE/Program.cpp b/src/libANGLE/Program.cpp
@@ -33,7 +33,7 @@
 #include "libANGLE/renderer/GLImplFactory.h"
 #include "libANGLE/renderer/ProgramImpl.h"
 #include "platform/FrontendFeatures.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 namespace gl
 {
diff --git a/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp b/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
@@ -30,7 +30,7 @@
 #include "libANGLE/renderer/d3d/d3d11/texture_format_table.h"
 #include "libANGLE/renderer/driver_utils.h"
 #include "platform/FeaturesD3D.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 namespace rx
 {
diff --git a/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp b/src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
@@ -17,7 +17,7 @@
 #include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
 #include "libANGLE/renderer/driver_utils.h"
 #include "platform/FeaturesD3D.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 #include "third_party/systeminfo/SystemInfo.h"
 
diff --git a/src/libANGLE/renderer/gl/FramebufferGL.cpp b/src/libANGLE/renderer/gl/FramebufferGL.cpp
@@ -26,7 +26,7 @@
 #include "libANGLE/renderer/gl/formatutilsgl.h"
 #include "libANGLE/renderer/gl/renderergl_utils.h"
 #include "platform/FeaturesGL.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 using namespace gl;
 using angle::CheckedNumeric;
diff --git a/src/libANGLE/renderer/gl/ProgramGL.cpp b/src/libANGLE/renderer/gl/ProgramGL.cpp
@@ -24,7 +24,7 @@
 #include "libANGLE/renderer/gl/ShaderGL.h"
 #include "libANGLE/renderer/gl/StateManagerGL.h"
 #include "platform/FeaturesGL.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 namespace rx
 {
diff --git a/src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.cpp b/src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.cpp
@@ -30,7 +30,7 @@
 #include "libANGLE/renderer/gl/egl/DisplayEGL.h"
 #include "libANGLE/renderer/gl/egl/FunctionsEGLDL.h"
 #include "libANGLE/renderer/gl/egl/gbm/SurfaceGbm.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 // ARM-specific extension needed to make Mali GPU behave - not in any
 // published header file.
diff --git a/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp b/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
@@ -24,8 +24,7 @@
 #include "libANGLE/renderer/gl/wgl/RendererWGL.h"
 #include "libANGLE/renderer/gl/wgl/WindowSurfaceWGL.h"
 #include "libANGLE/renderer/gl/wgl/wgl_utils.h"
-
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 #include <EGL/eglext.h>
 #include <sstream>
diff --git a/src/libANGLE/renderer/vulkan/RendererVk.cpp b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -34,7 +34,7 @@
 #include "libANGLE/renderer/vulkan/vk_format_utils.h"
 #include "libANGLE/renderer/vulkan/vk_google_filtering_precision.h"
 #include "libANGLE/trace.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 // Consts
 namespace
diff --git a/src/libGL/proc_table_wgl_autogen.cpp b/src/libGL/proc_table_wgl_autogen.cpp
@@ -31,7 +31,7 @@
 #include "libGL/entry_points_gl_4_5_autogen.h"
 #include "libGL/entry_points_gl_4_6_autogen.h"
 #include "libGL/entry_points_wgl.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 #define P(FUNC) reinterpret_cast<PROC>(FUNC)
 
diff --git a/src/libGLESv2.gni b/src/libGLESv2.gni
@@ -176,6 +176,7 @@ libangle_includes = [
   "include/platform/FeaturesVk.h",
   "include/platform/FrontendFeatures.h",
   "include/platform/Platform.h",
+  "include/platform/PlatformMethods.h",
   "include/vulkan/vulkan_fuchsia_ext.h",
 ]
 
diff --git a/src/libGLESv2/proc_table_egl_autogen.cpp b/src/libGLESv2/proc_table_egl_autogen.cpp
@@ -20,7 +20,7 @@
 #include "libGLESv2/entry_points_gles_3_1_autogen.h"
 #include "libGLESv2/entry_points_gles_3_2_autogen.h"
 #include "libGLESv2/entry_points_gles_ext_autogen.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 
 #define P(FUNC) reinterpret_cast<__eglMustCastToProperFunctionPointerType>(FUNC)
 
diff --git a/src/tests/deqp_support/angle_deqp_gtest.cpp b/src/tests/deqp_support/angle_deqp_gtest.cpp
@@ -20,7 +20,7 @@
 #include "common/platform.h"
 #include "common/string_utils.h"
 #include "common/system_utils.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 #include "tests/test_expectations/GPUTestConfig.h"
 #include "tests/test_expectations/GPUTestExpectationsParser.h"
 #include "util/test_utils.h"
diff --git a/src/tests/deqp_support/angle_deqp_libtester_main.cpp b/src/tests/deqp_support/angle_deqp_libtester_main.cpp
@@ -13,7 +13,7 @@
 #include "common/system_utils.h"
 #include "deMath.h"
 #include "deUniquePtr.hpp"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 #include "tcuApp.hpp"
 #include "tcuCommandLine.hpp"
 #include "tcuDefs.hpp"
diff --git a/src/tests/deqp_support/tcuANGLEPlatform.h b/src/tests/deqp_support/tcuANGLEPlatform.h
@@ -29,7 +29,7 @@
 #    include "egluPlatform.hpp"
 #endif
 
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 #include "tcuANGLENativeDisplayFactory.h"
 
 namespace tcu
diff --git a/src/tests/perf_tests/ANGLEPerfTest.h b/src/tests/perf_tests/ANGLEPerfTest.h
@@ -16,7 +16,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 #include "test_utils/angle_test_configs.h"
 #include "test_utils/angle_test_instantiate.h"
 #include "test_utils/angle_test_platform.h"
diff --git a/src/tests/perf_tests/EGLInitializePerf.cpp b/src/tests/perf_tests/EGLInitializePerf.cpp
@@ -8,7 +8,7 @@
 //
 
 #include "ANGLEPerfTest.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 #include "test_utils/angle_test_configs.h"
 #include "test_utils/angle_test_instantiate.h"
 #include "util/Timer.h"
diff --git a/src/tests/perf_tests/EGLMakeCurrentPerf.cpp b/src/tests/perf_tests/EGLMakeCurrentPerf.cpp
@@ -10,7 +10,7 @@
 #include "ANGLEPerfTest.h"
 #include "common/platform.h"
 #include "common/system_utils.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 #include "test_utils/angle_test_configs.h"
 #include "test_utils/angle_test_instantiate.h"
 
diff --git a/src/tests/test_utils/ANGLETest.h b/src/tests/test_utils/ANGLETest.h
@@ -19,7 +19,7 @@
 #include "common/angleutils.h"
 #include "common/system_utils.h"
 #include "common/vector_utils.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 #include "util/EGLWindow.h"
 #include "util/shader_utils.h"
 #include "util/util_gl.h"
diff --git a/util/EGLWindow.cpp b/util/EGLWindow.cpp
@@ -13,7 +13,7 @@
 #include <string.h>
 
 #include "common/system_utils.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 #include "util/OSWindow.h"
 
 // ConfigParameters implementation.

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#define COMMON_EVENT_TRACER_H_`
`7`	`7`
`8`	`8`	`#include "common/platform.h"`
`9`		`-#include "platform/Platform.h"`
	`9`	`+#include "platform/PlatformMethods.h"`
`10`	`10`
`11`	`11`	`namespace angle`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`#include "libANGLE/Context.h"`
`14`	`14`	`#include "libANGLE/Display.h"`
`15`	`15`	`#include "libANGLE/histogram_macros.h"`
`16`		`-#include "platform/Platform.h"`
	`16`	`+#include "platform/PlatformMethods.h"`
`17`	`17`
`18`	`18`	`namespace egl`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#include "libANGLE/Uniform.h"`
`20`	`20`	`#include "libANGLE/histogram_macros.h"`
`21`	`21`	`#include "libANGLE/renderer/ProgramImpl.h"`
`22`		`-#include "platform/Platform.h"`
	`22`	`+#include "platform/PlatformMethods.h"`
`23`	`23`
`24`	`24`	`namespace gl`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`#include "libANGLE/renderer/GLImplFactory.h"`
`34`	`34`	`#include "libANGLE/renderer/ProgramImpl.h"`
`35`	`35`	`#include "platform/FrontendFeatures.h"`
`36`		`-#include "platform/Platform.h"`
	`36`	`+#include "platform/PlatformMethods.h"`
`37`	`37`
`38`	`38`	`namespace gl`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`#include "libANGLE/renderer/d3d/d3d11/texture_format_table.h"`
`31`	`31`	`#include "libANGLE/renderer/driver_utils.h"`
`32`	`32`	`#include "platform/FeaturesD3D.h"`
`33`		`-#include "platform/Platform.h"`
	`33`	`+#include "platform/PlatformMethods.h"`
`34`	`34`
`35`	`35`	`namespace rx`
`36`	`36`	`{`