Rename Platform.h to PlatformMethods.h.

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"
 }
\ No newline at end of file

scripts/gen_proc_table.py

@@ -55,7 +55,7 @@ includes_gles = """#include "libGLESv2/proc_table_egl.h"
 #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 @@ includes_gl = """#include "libGL/proc_table_wgl.h"
 #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')

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
 {

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
 {

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
 {

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
 {

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
 {

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"
 

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;

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
 {

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.

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>

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

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)
 

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",
 ]
 

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)
 

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"

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"

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

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"

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"

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"
 

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"

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.