Revert "Move as many files as possible from common to libANGLE."

BUILD.gn

@@ -166,25 +166,26 @@ if (is_win) {
   }
 
   static_library("libANGLE") {
-    sources = rebase_path(gles_gypi.libangle_sources, ".", "src")
-    sources += rebase_path(gles_gypi.libangle_common_sources, ".", "src")
+    sources = rebase_path(gles_gypi.angle_libangle_sources, ".", "src")
 
     libs = []
     defines = []
 
+    # Windows-specific sources.
+    sources += rebase_path(gles_gypi.angle_libangle_win_sources, ".", "src")
+
     # Shared D3dD sources.
     if (angle_enable_d3d9 || angle_enable_d3d11) {
-      sources += rebase_path(gles_gypi.libangle_d3d_shared_sources, ".", "src")
+      sources += rebase_path(gles_gypi.angle_d3d_shared_sources, ".", "src")
     }
 
     if (angle_enable_d3d9) {
-      sources += rebase_path(gles_gypi.libangle_d3d9_sources, ".", "src")
+      sources += rebase_path(gles_gypi.angle_d3d9_sources, ".", "src")
       libs += [ "d3d9.lib" ]
     }
 
     if (angle_enable_d3d11) {
-      sources += rebase_path(gles_gypi.libangle_d3d11_sources, ".", "src")
-      sources += rebase_path(gles_gypi.libangle_d3d11_win32_sources, ".", "src")
+      sources += rebase_path(gles_gypi.angle_d3d11_sources, ".", "src")
       libs += [ "dxguid.lib" ]
     }
 

src/libANGLE/renderer/d3d/d3d11/NativeWindow.h → src/common/NativeWindow.h

@@ -9,8 +9,8 @@
 // It is used for HWND (Desktop Windows) and IInspectable objects
 //(Windows Store Applications).
 
-#ifndef LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_
-#define LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_
+#ifndef COMMON_NATIVEWINDOW_H_
+#define COMMON_NATIVEWINDOW_H_
 
 #include <EGL/eglplatform.h>
 #include "common/debug.h"
@@ -71,4 +71,4 @@ class NativeWindow
 bool IsValidEGLNativeWindowType(EGLNativeWindowType window);
 }
 
-#endif // LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_
+#endif // COMMON_NATIVEWINDOW_H_

src/libANGLE/RefCountObject.h → src/common/RefCountObject.h

@@ -9,8 +9,8 @@
 // that need to be reference counted for correct cross-context deletion.
 // (Concretely, textures, buffers and renderbuffers.)
 
-#ifndef LIBANGLE_REFCOUNTOBJECT_H_
-#define LIBANGLE_REFCOUNTOBJECT_H_
+#ifndef COMMON_REFCOUNTOBJECT_H_
+#define COMMON_REFCOUNTOBJECT_H_
 
 #include "common/debug.h"
 
@@ -92,4 +92,4 @@ class OffsetBindingPointer : public RefCountObjectBindingPointer
     GLsizeiptr mSize;
 };
 
-#endif   // LIBANGLE_REFCOUNTOBJECT_H_
+#endif   // COMMON_REFCOUNTOBJECT_H_

src/common/angleutils.cpp

@@ -5,8 +5,7 @@
 //
 
 #include "common/angleutils.h"
-#include "common/debug.h"
-
+#include "debug.h"
 #include <stdio.h>
 #include <vector>
 

src/libANGLE/features.h → src/common/features.h

@@ -4,8 +4,8 @@
 // found in the LICENSE file.
 //
 
-#ifndef LIBANGLE_FEATURES_H_
-#define LIBANGLE_FEATURES_H_
+#ifndef COMMON_FEATURES_H_
+#define COMMON_FEATURES_H_
 
 #define ANGLE_DISABLED 0
 #define ANGLE_ENABLED 1
@@ -37,4 +37,4 @@
 #define ANGLE_SHADER_DEBUG_INFO ANGLE_DISABLED
 #endif
 
-#endif // LIBANGLE_FEATURES_H_
+#endif // COMMON_FEATURES_H_

src/libANGLE/version.h → src/common/version.h

-//
-// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-
-#ifndef LIBANGLE_VERSION_H_
-#define LIBANGLE_VERSION_H_
-
 #include "id/commit.h"
 
 #define ANGLE_MAJOR_VERSION 2
@@ -19,5 +10,3 @@
     ANGLE_MACRO_STRINGIFY(ANGLE_MAJOR_VERSION) "." \
     ANGLE_MACRO_STRINGIFY(ANGLE_MINOR_VERSION) "." \
     ANGLE_COMMIT_HASH
-
-#endif // LIBANGLE_VERSION_H_

src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp → src/common/win32/NativeWindow.cpp

@@ -6,8 +6,7 @@
 
 // NativeWindow.cpp: Handler for managing HWND native window types.
 
-#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
-
+#include "common/NativeWindow.h"
 #include "common/debug.h"
 
 namespace rx

src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp → src/common/winrt/CoreWindowNativeWindow.cpp

@@ -6,10 +6,8 @@
 
 // CoreWindowNativeWindow.cpp: NativeWindow for managing ICoreWindow native window types.
 
-#include "libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h"
-
 #include <windows.graphics.display.h>
-
+#include "common/winrt/CoreWindowNativeWindow.h"
 using namespace ABI::Windows::Foundation::Collections;
 
 namespace rx

src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h → src/common/winrt/CoreWindowNativeWindow.h

@@ -6,11 +6,10 @@
 
 // CoreWindowNativeWindow.h: NativeWindow for managing ICoreWindow native window types.
 
-#ifndef LIBANGLE_RENDERER_D3D_D3D11_WINRT_COREWINDOWNATIVEWINDOW_H_
-#define LIBANGLE_RENDERER_D3D_D3D11_WINRT_COREWINDOWNATIVEWINDOW_H_
-
-#include "libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h"
+#ifndef COMMON_WINRT_COREWINDOWNATIVEWINDOW_H_
+#define COMMON_WINRT_COREWINDOWNATIVEWINDOW_H_
 
+#include "common/winrt/InspectableNativeWindow.h"
 #include <memory>
 
 typedef ABI::Windows::Foundation::__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowSizeChangedEventArgs_t IWindowSizeChangedEventHandler;
@@ -75,4 +74,4 @@ class CoreWindowSizeChangedHandler :
 HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWindow>& coreWindow, RECT *windowSize);
 }
 
-#endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_COREWINDOWNATIVEWINDOW_H_
+#endif // COMMON_WINRT_COREWINDOWNATIVEWINDOW_H_

src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp → src/common/winrt/InspectableNativeWindow.cpp

@@ -6,8 +6,8 @@
 
 // InspectableNativeWindow.cpp: NativeWindow base class for managing IInspectable native window types.
 
-#include "libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h"
-#include "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h"
+#include "common/winrt/CoreWindowNativeWindow.h"
+#include "common/winrt/SwapChainPanelNativeWindow.h"
 
 namespace rx
 {

src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h → src/common/winrt/InspectableNativeWindow.h

@@ -7,13 +7,11 @@
 // InspectableNativeWindow.h: Host specific implementation interface for
 // managing IInspectable native window types.
 
-#ifndef LIBANGLE_RENDERER_D3D_D3D11_WINRT_INSPECTABLENATIVEWINDOW_H_
-#define LIBANGLE_RENDERER_D3D_D3D11_WINRT_INSPECTABLENATIVEWINDOW_H_
-
-#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
+#ifndef COMMON_WINRT_INSPECTABLENATIVEWINDOW_H_
+#define COMMON_WINRT_INSPECTABLENATIVEWINDOW_H_
 
 #include "common/platform.h"
-
+#include "common/NativeWindow.h"
 #include "angle_windowsstore.h"
 
 #include <windows.ui.xaml.h>
@@ -86,7 +84,5 @@ bool IsCoreWindow(EGLNativeWindowType window, ComPtr<ABI::Windows::UI::Core::ICo
 bool IsSwapChainPanel(EGLNativeWindowType window, ComPtr<ABI::Windows::UI::Xaml::Controls::ISwapChainPanel> *swapChainPanel = nullptr);
 bool IsEGLConfiguredPropertySet(EGLNativeWindowType window, ABI::Windows::Foundation::Collections::IPropertySet **propertySet = nullptr, IInspectable **inspectable = nullptr);
 HRESULT GetOptionalSizePropertyValue(const ComPtr<ABI::Windows::Foundation::Collections::IMap<HSTRING, IInspectable*>>& propertyMap, const wchar_t *propertyName, SIZE *value, bool *valueExists);
-
 }
-
-#endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_INSPECTABLENATIVEWINDOW_H_
+#endif // COMMON_WINRT_INSPECTABLENATIVEWINDOW_H_

src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp → src/common/winrt/SwapChainPanelNativeWindow.cpp

@@ -6,11 +6,9 @@
 
 // SwapChainPanelNativeWindow.cpp: NativeWindow for managing ISwapChainPanel native window types.
 
-#include "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h"
-
+#include "common/winrt/SwapChainPanelNativeWindow.h"
 #include <algorithm>
 #include <math.h>
-
 using namespace ABI::Windows::Foundation::Collections;
 
 namespace rx

src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h → src/common/winrt/SwapChainPanelNativeWindow.h

@@ -6,10 +6,10 @@
 
 // SwapChainPanelNativeWindow.h: NativeWindow for managing ISwapChainPanel native window types.
 
-#ifndef LIBANGLE_RENDERER_D3D_D3D11_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
-#define LIBANGLE_RENDERER_D3D_D3D11_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
+#ifndef COMMON_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
+#define COMMON_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
 
-#include "libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h"
+#include "common/winrt/InspectableNativeWindow.h"
 
 namespace rx
 {
@@ -76,4 +76,4 @@ class SwapChainPanelSizeChangedHandler :
 
 HRESULT GetSwapChainPanelSize(const ComPtr<ABI::Windows::UI::Xaml::Controls::ISwapChainPanel> &swapChainPanel, RECT *windowSize);
 }
-#endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
+#endif // COMMON_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_

src/compiler.gypi

@@ -21,6 +21,8 @@
             '../include/GLSLANG/ShaderVars.h',
             '../include/KHR/khrplatform.h',
             '../include/angle_gl.h',
+            'common/RefCountObject.cpp',
+            'common/RefCountObject.h',
             'common/angleutils.h',
             'common/angleutils.cpp',
             'common/blocklayout.cpp',
@@ -36,6 +38,7 @@
             'common/tls.h',
             'common/utilities.cpp',
             'common/utilities.h',
+            'common/version.h',
             'compiler/translator/BaseTypes.h',
             'compiler/translator/BuiltInFunctionEmulator.cpp',
             'compiler/translator/BuiltInFunctionEmulator.h',

src/libANGLE/Buffer.h

@@ -12,10 +12,10 @@
 #define LIBANGLE_BUFFER_H_
 
 #include "libANGLE/Error.h"
-#include "libANGLE/RefCountObject.h"
-#include "libANGLE/renderer/IndexRangeCache.h"
 
 #include "common/angleutils.h"
+#include "common/RefCountObject.h"
+#include "libANGLE/renderer/IndexRangeCache.h"
 
 namespace rx
 {

src/libANGLE/Context.h

@@ -11,7 +11,7 @@
 #define LIBANGLE_CONTEXT_H_
 
 #include "common/angleutils.h"
-#include "libANGLE/RefCountObject.h"
+#include "common/RefCountObject.h"
 #include "libANGLE/Caps.h"
 #include "libANGLE/Constants.h"
 #include "libANGLE/Data.h"

src/libANGLE/Fence.h

@@ -11,9 +11,9 @@
 #define LIBANGLE_FENCE_H_
 
 #include "libANGLE/Error.h"
-#include "libANGLE/RefCountObject.h"
 
 #include "common/angleutils.h"
+#include "common/RefCountObject.h"
 
 namespace rx
 {

src/libANGLE/Framebuffer.h

@@ -11,10 +11,10 @@
 #define LIBANGLE_FRAMEBUFFER_H_
 
 #include "libANGLE/Error.h"
-#include "libANGLE/RefCountObject.h"
-#include "libANGLE/Constants.h"
 
 #include "common/angleutils.h"
+#include "common/RefCountObject.h"
+#include "Constants.h"
 
 #include <vector>
 

src/libANGLE/FramebufferAttachment.h

@@ -11,9 +11,9 @@
 #define LIBANGLE_FRAMEBUFFERATTACHMENT_H_
 
 #include "libANGLE/Texture.h"
-#include "libANGLE/RefCountObject.h"
 
 #include "common/angleutils.h"
+#include "common/RefCountObject.h"
 
 #include "angle_gl.h"
 

src/libANGLE/Program.h

@@ -11,7 +11,7 @@
 #define LIBANGLE_PROGRAM_H_
 
 #include "common/angleutils.h"
-#include "libANGLE/RefCountObject.h"
+#include "common/RefCountObject.h"
 #include "libANGLE/Constants.h"
 #include "libANGLE/ProgramBinary.h"
 

src/libANGLE/ProgramBinary.cpp

@@ -14,19 +14,19 @@
 #include "libANGLE/Renderbuffer.h"
 #include "libANGLE/renderer/ShaderExecutable.h"
 
+#include "common/debug.h"
+#include "common/version.h"
+#include "common/utilities.h"
+#include "common/platform.h"
+
 #include "libANGLE/Shader.h"
 #include "libANGLE/Program.h"
 #include "libANGLE/renderer/ProgramImpl.h"
 #include "libANGLE/renderer/d3d/ShaderD3D.h"
 #include "libANGLE/Context.h"
 #include "libANGLE/Buffer.h"
-#include "libANGLE/features.h"
-#include "libANGLE/version.h"
-
 #include "common/blocklayout.h"
-#include "common/debug.h"
-#include "common/utilities.h"
-#include "common/platform.h"
+#include "common/features.h"
 
 namespace gl
 {

src/libANGLE/ProgramBinary.h

@@ -10,9 +10,9 @@
 #ifndef LIBANGLE_PROGRAM_BINARY_H_
 #define LIBANGLE_PROGRAM_BINARY_H_
 
+#include "common/RefCountObject.h"
+#include "angletypes.h"
 #include "common/mathutil.h"
-#include "libANGLE/angletypes.h"
-#include "libANGLE/RefCountObject.h"
 #include "libANGLE/Uniform.h"
 #include "libANGLE/Shader.h"
 #include "libANGLE/Constants.h"

src/libANGLE/Query.h

@@ -10,8 +10,8 @@
 #define LIBANGLE_QUERY_H_
 
 #include "libANGLE/Error.h"
-#include "libANGLE/RefCountObject.h"
 #include "common/angleutils.h"
+#include "common/RefCountObject.h"
 
 #include "angle_gl.h"
 

src/libANGLE/Renderbuffer.h

@@ -14,9 +14,9 @@
 #include "angle_gl.h"
 
 #include "libANGLE/Error.h"
-#include "libANGLE/RefCountObject.h"
 
 #include "common/angleutils.h"
+#include "common/RefCountObject.h"
 
 namespace rx
 {

src/libANGLE/Sampler.h

@@ -10,7 +10,7 @@
 #ifndef LIBANGLE_SAMPLER_H_
 #define LIBANGLE_SAMPLER_H_
 
-#include "libANGLE/RefCountObject.h"
+#include "common/RefCountObject.h"
 
 namespace gl
 {

src/libANGLE/State.h

@@ -10,7 +10,7 @@
 #define LIBANGLE_STATE_H_
 
 #include "common/angleutils.h"
-#include "libANGLE/RefCountObject.h"
+#include "common/RefCountObject.h"
 #include "libANGLE/angletypes.h"
 #include "libANGLE/VertexAttribute.h"
 #include "libANGLE/Renderbuffer.h"

src/libANGLE/Surface.cpp

@@ -20,6 +20,8 @@
 
 #include "libANGLE/Display.h"
 
+#include "common/NativeWindow.h"
+
 //TODO(jmadill): phase this out
 #include "libANGLE/renderer/d3d/RendererD3D.h"
 

src/libANGLE/Surface.h

@@ -13,12 +13,10 @@
 
 #include "libANGLE/Error.h"
 
-// TODO: don't expose this to egl::Surface
-#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
-
 #include <EGL/egl.h>
 
 #include "common/angleutils.h"
+#include "common/NativeWindow.h"
 
 namespace gl
 {

src/libANGLE/Texture.h

@@ -12,7 +12,7 @@
 #define LIBANGLE_TEXTURE_H_
 
 #include "common/debug.h"
-#include "libANGLE/RefCountObject.h"
+#include "common/RefCountObject.h"
 #include "libANGLE/angletypes.h"
 #include "libANGLE/Constants.h"
 #include "libANGLE/renderer/TextureImpl.h"

src/libANGLE/TransformFeedback.h

@@ -7,9 +7,8 @@
 #ifndef LIBANGLE_TRANSFORM_FEEDBACK_H_
 #define LIBANGLE_TRANSFORM_FEEDBACK_H_
 
-#include "libANGLE/RefCountObject.h"
-
 #include "common/angleutils.h"
+#include "common/RefCountObject.h"
 
 #include "angle_gl.h"
 

src/libANGLE/Uniform.h

@@ -8,10 +8,10 @@
 #define LIBANGLE_UNIFORM_H_
 
 #include "common/debug.h"
-#include "libANGLE/angletypes.h"
-
 #include "common/blocklayout.h"
 
+#include "libANGLE/angletypes.h"
+
 #include "angle_gl.h"
 
 #include <string>

src/libANGLE/VertexArray.h

@@ -13,7 +13,7 @@
 #ifndef LIBANGLE_VERTEXARRAY_H_
 #define LIBANGLE_VERTEXARRAY_H_
 
-#include "libANGLE/RefCountObject.h"
+#include "common/RefCountObject.h"
 #include "libANGLE/Constants.h"
 #include "libANGLE/VertexAttribute.h"
 

src/libANGLE/angletypes.h

@@ -10,7 +10,7 @@
 #define LIBANGLE_ANGLETYPES_H_
 
 #include "libANGLE/Constants.h"
-#include "libANGLE/RefCountObject.h"
+#include "common/RefCountObject.h"
 
 namespace gl
 {

src/libANGLE/renderer/Renderer.h

@@ -15,6 +15,7 @@
 #include "libANGLE/Uniform.h"
 #include "libANGLE/angletypes.h"
 #include "libANGLE/renderer/Workarounds.h"
+#include "common/NativeWindow.h"
 #include "common/mathutil.h"
 
 #include <cstdint>

src/libANGLE/renderer/SwapChain.h

@@ -10,10 +10,8 @@
 #ifndef LIBANGLE_RENDERER_SWAPCHAIN_H_
 #define LIBANGLE_RENDERER_SWAPCHAIN_H_
 
-// TODO: move SwapChain to be d3d only
-#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
-
 #include "common/angleutils.h"
+#include "common/NativeWindow.h"
 #include "common/platform.h"
 
 #include <GLES2/gl2.h>

src/libANGLE/renderer/d3d/HLSLCompiler.cpp

@@ -6,8 +6,8 @@
 
 #include "libANGLE/renderer/d3d/HLSLCompiler.h"
 #include "libANGLE/Program.h"
-#include "libANGLE/features.h"
 
+#include "common/features.h"
 #include "common/utilities.h"
 
 #include "third_party/trace_event/trace_event.h"

src/libANGLE/renderer/d3d/ProgramD3D.cpp

@@ -7,7 +7,9 @@
 // ProgramD3D.cpp: Defines the rx::ProgramD3D class which implements rx::ProgramImpl.
 
 #include "libANGLE/renderer/d3d/ProgramD3D.h"
-#include "libANGLE/features.h"
+
+#include "common/features.h"
+#include "common/utilities.h"
 #include "libANGLE/Framebuffer.h"
 #include "libANGLE/FramebufferAttachment.h"
 #include "libANGLE/Program.h"
@@ -17,8 +19,6 @@
 #include "libANGLE/renderer/d3d/RendererD3D.h"
 #include "libANGLE/renderer/d3d/ShaderD3D.h"
 
-#include "common/utilities.h"
-
 namespace rx
 {
 

src/libANGLE/renderer/d3d/RendererD3D.h

@@ -10,7 +10,6 @@
 #define LIBANGLE_RENDERER_D3D_RENDERERD3D_H_
 
 #include "libANGLE/renderer/Renderer.h"
-#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
 #include "libANGLE/Data.h"
 
 //FIXME(jmadill): std::array is currently prohibited by Chromium style guide

src/libANGLE/renderer/d3d/ShaderD3D.cpp

@@ -9,8 +9,8 @@
 #include "libANGLE/Shader.h"
 #include "libANGLE/renderer/d3d/RendererD3D.h"
 #include "libANGLE/renderer/d3d/ShaderD3D.h"
-#include "libANGLE/features.h"
 
+#include "common/features.h"
 #include "common/utilities.h"
 
 // Definitions local to the translation unit

src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp

@@ -10,13 +10,13 @@
 #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
 #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
 #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
-#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
-#include "libANGLE/features.h"
 
 // Precompiled shaders
 #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h"
 #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h"
 
+#include "common/features.h"
+#include "common/NativeWindow.h"
 
 namespace rx
 {

src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp

@@ -36,10 +36,11 @@
 #include "libANGLE/ProgramBinary.h"
 #include "libANGLE/State.h"
 #include "libANGLE/angletypes.h"
+
 #include "libANGLE/Display.h"
 #include "libANGLE/Surface.h"
-#include "libANGLE/features.h"
 
+#include "common/features.h"
 #include "common/utilities.h"
 
 #include "third_party/trace_event/trace_event.h"

src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp

@@ -10,7 +10,8 @@
 #include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
 #include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
 #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
-#include "libANGLE/features.h"
+
+#include "common/features.h"
 
 namespace rx
 {

src/libEGL/libEGL.cpp

@@ -17,13 +17,11 @@
 #include "libANGLE/Texture.h"
 #include "libANGLE/Surface.h"
 #include "libANGLE/renderer/SwapChain.h"
-#include "libANGLE/version.h"
-
-// TODO: don't reference this from here, use a method on DisplayImpl to validate windows
-#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
 
 #include "common/debug.h"
+#include "common/version.h"
 
+#include "common/NativeWindow.h"
 
 bool validateDisplay(egl::Display *display)
 {

src/libEGL/libEGL.rc

@@ -8,7 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include <windows.h>
-#include "../libANGLE/version.h"
+#include "../common/version.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

src/libGLESv2.gypi

@@ -6,8 +6,23 @@
     'variables':
     {
         # These file lists are shared with the GN build.
-        'libangle_common_sources':
+        'angle_libangle_sources':
         [
+            '../include/EGL/egl.h',
+            '../include/EGL/eglext.h',
+            '../include/EGL/eglplatform.h',
+            '../include/GLES2/gl2.h',
+            '../include/GLES2/gl2ext.h',
+            '../include/GLES2/gl2platform.h',
+            '../include/GLES3/gl3.h',
+            '../include/GLES3/gl3ext.h',
+            '../include/GLES3/gl3platform.h',
+            '../include/GLSLANG/ShaderLang.h',
+            '../include/GLSLANG/ShaderVars.h',
+            '../include/KHR/khrplatform.h',
+            '../include/angle_gl.h',
+            'common/RefCountObject.cpp',
+            'common/RefCountObject.h',
             'common/angleutils.cpp',
             'common/angleutils.h',
             'common/blocklayout.cpp',
@@ -16,32 +31,16 @@
             'common/debug.h',
             'common/event_tracer.cpp',
             'common/event_tracer.h',
+            'common/features.h',
             'common/mathutil.cpp',
             'common/mathutil.h',
             'common/platform.h',
+            'common/NativeWindow.h',
             'common/tls.cpp',
             'common/tls.h',
             'common/utilities.cpp',
             'common/utilities.h',
-        ],
-        'libangle_includes':
-        [
-            '../include/EGL/egl.h',
-            '../include/EGL/eglext.h',
-            '../include/EGL/eglplatform.h',
-            '../include/GLES2/gl2.h',
-            '../include/GLES2/gl2ext.h',
-            '../include/GLES2/gl2platform.h',
-            '../include/GLES3/gl3.h',
-            '../include/GLES3/gl3ext.h',
-            '../include/GLES3/gl3platform.h',
-            '../include/GLSLANG/ShaderLang.h',
-            '../include/GLSLANG/ShaderVars.h',
-            '../include/KHR/khrplatform.h',
-            '../include/angle_gl.h',
-        ],
-        'libangle_sources':
-        [
+            'common/version.h',
             'libANGLE/AttributeMap.cpp',
             'libANGLE/AttributeMap.h',
             'libANGLE/BinaryStream.h',
@@ -60,7 +59,6 @@
             'libANGLE/Display.h',
             'libANGLE/Error.cpp',
             'libANGLE/Error.h',
-            'libANGLE/features.h',
             'libANGLE/Fence.cpp',
             'libANGLE/Fence.h',
             'libANGLE/Float16ToFloat32.cpp',
@@ -78,8 +76,6 @@
             'libANGLE/ProgramBinary.h',
             'libANGLE/Query.cpp',
             'libANGLE/Query.h',
-            'libANGLE/RefCountObject.cpp',
-            'libANGLE/RefCountObject.h',
             'libANGLE/Renderbuffer.cpp',
             'libANGLE/Renderbuffer.h',
             'libANGLE/ResourceManager.cpp',
@@ -98,7 +94,6 @@
             'libANGLE/TransformFeedback.h',
             'libANGLE/Uniform.cpp',
             'libANGLE/Uniform.h',
-            'libANGLE/version.h',
             'libANGLE/VertexArray.cpp',
             'libANGLE/VertexArray.h',
             'libANGLE/VertexAttribute.cpp',
@@ -156,7 +151,21 @@
             'third_party/systeminfo/SystemInfo.cpp',
             'third_party/systeminfo/SystemInfo.h',
         ],
-        'libangle_d3d_shared_sources':
+        'angle_libangle_win_sources':
+        [
+            # TODO(kbr): port NativeWindow to other EGL platforms.
+            'common/win32/NativeWindow.cpp',
+        ],
+        'angle_libangle_winrt_sources':
+        [
+            'common/winrt/SwapChainPanelNativeWindow.cpp',
+            'common/winrt/SwapChainPanelNativeWindow.h',
+            'common/winrt/CoreWindowNativeWindow.cpp',
+            'common/winrt/CoreWindowNativeWindow.h',
+            'common/winrt/InspectableNativeWindow.cpp',
+            'common/winrt/InspectableNativeWindow.h',
+        ],
+        'angle_d3d_shared_sources':
         [
             'libANGLE/renderer/d3d/BufferD3D.cpp',
             'libANGLE/renderer/d3d/BufferD3D.h',
@@ -193,7 +202,7 @@
             'libANGLE/renderer/d3d/VertexDataManager.cpp',
             'libANGLE/renderer/d3d/VertexDataManager.h',
         ],
-        'libangle_d3d9_sources':
+        'angle_d3d9_sources':
         [
             'libANGLE/renderer/d3d/d3d9/Blit9.cpp',
             'libANGLE/renderer/d3d/d3d9/Blit9.h',
@@ -233,7 +242,7 @@
             'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp',
             'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h',
         ],
-        'libangle_d3d11_sources':
+        'angle_d3d11_sources':
         [
             'libANGLE/renderer/d3d/d3d11/Blit11.cpp',
             'libANGLE/renderer/d3d/d3d11/Blit11.h',
@@ -251,7 +260,6 @@
             'libANGLE/renderer/d3d/d3d11/IndexBuffer11.h',
             'libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp',
             'libANGLE/renderer/d3d/d3d11/InputLayoutCache.h',
-            'libANGLE/renderer/d3d/d3d11/NativeWindow.h',
             'libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp',
             'libANGLE/renderer/d3d/d3d11/PixelTransfer11.h',
             'libANGLE/renderer/d3d/d3d11/Query11.cpp',
@@ -327,20 +335,7 @@
             'libANGLE/renderer/d3d/d3d11/VertexArray11.h',
             'libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp',
             'libANGLE/renderer/d3d/d3d11/VertexBuffer11.h',
-        ],
-        'libangle_d3d11_win32_sources':
-        [
-            'libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp',
-        ],
-        'libangle_d3d11_winrt_sources':
-        [
-            'libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp',
-            'libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h',
-            'libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp',
-            'libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h',
-            'libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp',
-            'libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h',
-        ],
+        ]
     },
     # Everything below this is duplicated in the GN build. If you change
     # anything also change angle/BUILD.gn
@@ -361,9 +356,7 @@
             ],
             'sources':
             [
-                '<@(libangle_sources)',
-                '<@(libangle_common_sources)',
-                '<@(libangle_includes)',
+                '<@(angle_libangle_sources)',
             ],
             'defines':
             [
@@ -421,14 +414,14 @@
                 {
                     'sources':
                     [
-                        '<@(libangle_d3d_shared_sources)',
+                        '<@(angle_d3d_shared_sources)',
                     ],
                 }],
                 ['angle_enable_d3d9==1',
                 {
                     'sources':
                     [
-                        '<@(libangle_d3d9_sources)',
+                        '<@(angle_d3d9_sources)',
                     ],
                     'defines':
                     [
@@ -452,7 +445,7 @@
                 {
                     'sources':
                     [
-                        '<@(libangle_d3d11_sources)',
+                        '<@(angle_d3d11_sources)',
                     ],
                     'defines':
                     [
@@ -486,25 +479,13 @@
                             }
                         },
                     },
-                    'conditions':
-                    [
-                        ['angle_build_winrt==1',
-                        {
-                            'sources':
-                            [
-                                '<@(libangle_d3d11_winrt_sources)',
-                            ],
-                        },
-                        { # win32
-                            'sources':
-                            [
-                                '<@(libangle_d3d11_win32_sources)',
-                            ],
-                        }],
-                    ],
                 }],
                 ['angle_build_winrt==0 and OS=="win"',
                 {
+                    'sources':
+                    [
+                        '<@(angle_libangle_win_sources)',
+                    ],
                     'dependencies':
                     [
                         'copy_compiler_dll'
@@ -512,6 +493,10 @@
                 }],
                 ['angle_build_winrt==1',
                 {
+                    'sources':
+                    [
+                        '<@(angle_libangle_winrt_sources)',
+                    ],
                     'defines':
                     [
                         'NTDDI_VERSION=NTDDI_WINBLUE',

src/libGLESv2/libGLESv2.cpp

@@ -27,8 +27,8 @@
 #include "libANGLE/validationES2.h"
 #include "libANGLE/validationES3.h"
 #include "libANGLE/queryconversions.h"
-#include "libANGLE/version.h"
 
+#include "common/version.h"
 #include "common/utilities.h"
 
 extern "C"

src/libGLESv2/libGLESv2.rc

@@ -8,7 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include <windows.h>
-#include "../libANGLE/version.h"
+#include "../common/version.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

src/libGLESv2/main.h

@@ -9,6 +9,8 @@
 #ifndef LIBGLESV2_MAIN_H_
 #define LIBGLESV2_MAIN_H_
 
+#include "common/debug.h"
+
 #include <GLES2/gl2.h>
 #include <EGL/egl.h>
 

tests/angle_implementation_unit_tests/CoreWindowNativeWindow_unittest.cpp

@@ -11,11 +11,11 @@
 // to ensure that the proper defines are set when including additional
 // headers which rely on Windows Store specific configuration.
 // This would normally be defined already but this unittest exe is compiled
-// as a desktop application which results in WINAPI_FAMILY being
+// as a desktop application which results in WINAPI_FAMILY being 
 // set to WINAPI_FAMILY_DESKTOP_APP
 #undef WINAPI_FAMILY
 #define WINAPI_FAMILY WINAPI_FAMILY_PC_APP
-#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
+#include "common/nativewindow.h"
 #include <angle_windowsstore.h>
 
 using namespace rx;

tests/angle_implementation_unit_tests/SwapChainPanelNativeWindow_unittest.cpp

@@ -11,11 +11,11 @@
 // to ensure that the proper defines are set when including additional
 // headers which rely on Windows Store specific configuration.
 // This would normally be defined already but this unittest exe is compiled
-// as a desktop application which results in WINAPI_FAMILY being
+// as a desktop application which results in WINAPI_FAMILY being 
 // set to WINAPI_FAMILY_DESKTOP_APP
 #undef WINAPI_FAMILY
 #define WINAPI_FAMILY WINAPI_FAMILY_PC_APP
-#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
+#include "common/nativewindow.h"
 #include <angle_windowsstore.h>
 #include <windows.ui.xaml.h>
 #include <windows.ui.xaml.media.dxinterop.h>