Move as many files as possible from common to libANGLE.
BUG=angle:733
Change-Id: I40cee6e2e305ac493acbc8649f858785c0569aed
Reviewed-on: https://chromium-review.googlesource.com/231051
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/common/angleutils.cpp b/src/common/angleutils.cpp
index c1367c4..af5eb6c 100644
--- a/src/common/angleutils.cpp
+++ b/src/common/angleutils.cpp
@@ -5,7 +5,8 @@
//
#include "common/angleutils.h"
-#include "debug.h"
+#include "common/debug.h"
+
#include <stdio.h>
#include <vector>
diff --git a/src/common/version.h b/src/common/version.h
deleted file mode 100644
index d9148d1..0000000
--- a/src/common/version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "id/commit.h"
-
-#define ANGLE_MAJOR_VERSION 2
-#define ANGLE_MINOR_VERSION 1
-
-#define ANGLE_STRINGIFY(x) #x
-#define ANGLE_MACRO_STRINGIFY(x) ANGLE_STRINGIFY(x)
-
-#define ANGLE_VERSION_STRING \
- ANGLE_MACRO_STRINGIFY(ANGLE_MAJOR_VERSION) "." \
- ANGLE_MACRO_STRINGIFY(ANGLE_MINOR_VERSION) "." \
- ANGLE_COMMIT_HASH
diff --git a/src/compiler.gypi b/src/compiler.gypi
index b8a1d4d..db7200e 100644
--- a/src/compiler.gypi
+++ b/src/compiler.gypi
@@ -21,8 +21,6 @@
'../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',
@@ -38,7 +36,6 @@
'common/tls.h',
'common/utilities.cpp',
'common/utilities.h',
- 'common/version.h',
'compiler/translator/BaseTypes.h',
'compiler/translator/BuiltInFunctionEmulator.cpp',
'compiler/translator/BuiltInFunctionEmulator.h',
diff --git a/src/libANGLE/Buffer.h b/src/libANGLE/Buffer.h
index 76776c0..03388a0 100644
--- a/src/libANGLE/Buffer.h
+++ b/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
{
diff --git a/src/libANGLE/Context.h b/src/libANGLE/Context.h
index 8b22048..39d455b 100644
--- a/src/libANGLE/Context.h
+++ b/src/libANGLE/Context.h
@@ -11,7 +11,7 @@
#define LIBANGLE_CONTEXT_H_
#include "common/angleutils.h"
-#include "common/RefCountObject.h"
+#include "libANGLE/RefCountObject.h"
#include "libANGLE/Caps.h"
#include "libANGLE/Constants.h"
#include "libANGLE/Data.h"
diff --git a/src/libANGLE/Fence.h b/src/libANGLE/Fence.h
index 97c59ad..8a85fa5 100644
--- a/src/libANGLE/Fence.h
+++ b/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
{
diff --git a/src/libANGLE/Framebuffer.h b/src/libANGLE/Framebuffer.h
index 4934533..11f7e86 100644
--- a/src/libANGLE/Framebuffer.h
+++ b/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>
diff --git a/src/libANGLE/FramebufferAttachment.h b/src/libANGLE/FramebufferAttachment.h
index 2650bae..75aec79 100644
--- a/src/libANGLE/FramebufferAttachment.h
+++ b/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"
diff --git a/src/libANGLE/Program.h b/src/libANGLE/Program.h
index d736b11..1884c54 100644
--- a/src/libANGLE/Program.h
+++ b/src/libANGLE/Program.h
@@ -11,7 +11,7 @@
#define LIBANGLE_PROGRAM_H_
#include "common/angleutils.h"
-#include "common/RefCountObject.h"
+#include "libANGLE/RefCountObject.h"
#include "libANGLE/Constants.h"
#include "libANGLE/ProgramBinary.h"
diff --git a/src/libANGLE/ProgramBinary.cpp b/src/libANGLE/ProgramBinary.cpp
index d53a3de..e852d2f 100644
--- a/src/libANGLE/ProgramBinary.cpp
+++ b/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/features.h"
+#include "common/debug.h"
+#include "common/utilities.h"
+#include "common/platform.h"
namespace gl
{
diff --git a/src/libANGLE/ProgramBinary.h b/src/libANGLE/ProgramBinary.h
index 0360b19..4320362 100644
--- a/src/libANGLE/ProgramBinary.h
+++ b/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"
diff --git a/src/libANGLE/Query.h b/src/libANGLE/Query.h
index 9d085d0..2c3606b 100644
--- a/src/libANGLE/Query.h
+++ b/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"
diff --git a/src/common/RefCountObject.cpp b/src/libANGLE/RefCountObject.cpp
similarity index 100%
rename from src/common/RefCountObject.cpp
rename to src/libANGLE/RefCountObject.cpp
diff --git a/src/common/RefCountObject.h b/src/libANGLE/RefCountObject.h
similarity index 95%
rename from src/common/RefCountObject.h
rename to src/libANGLE/RefCountObject.h
index 6eeaee1..39c0e22 100644
--- a/src/common/RefCountObject.h
+++ b/src/libANGLE/RefCountObject.h
@@ -9,8 +9,8 @@
// that need to be reference counted for correct cross-context deletion.
// (Concretely, textures, buffers and renderbuffers.)
-#ifndef COMMON_REFCOUNTOBJECT_H_
-#define COMMON_REFCOUNTOBJECT_H_
+#ifndef LIBANGLE_REFCOUNTOBJECT_H_
+#define LIBANGLE_REFCOUNTOBJECT_H_
#include "common/debug.h"
@@ -92,4 +92,4 @@
GLsizeiptr mSize;
};
-#endif // COMMON_REFCOUNTOBJECT_H_
+#endif // LIBANGLE_REFCOUNTOBJECT_H_
diff --git a/src/libANGLE/Renderbuffer.h b/src/libANGLE/Renderbuffer.h
index a7e9ae0..80e55f6 100644
--- a/src/libANGLE/Renderbuffer.h
+++ b/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
{
diff --git a/src/libANGLE/Sampler.h b/src/libANGLE/Sampler.h
index fbd3f67..d33798f 100644
--- a/src/libANGLE/Sampler.h
+++ b/src/libANGLE/Sampler.h
@@ -10,7 +10,7 @@
#ifndef LIBANGLE_SAMPLER_H_
#define LIBANGLE_SAMPLER_H_
-#include "common/RefCountObject.h"
+#include "libANGLE/RefCountObject.h"
namespace gl
{
diff --git a/src/libANGLE/State.h b/src/libANGLE/State.h
index effa4e8..cf896c4 100644
--- a/src/libANGLE/State.h
+++ b/src/libANGLE/State.h
@@ -10,7 +10,7 @@
#define LIBANGLE_STATE_H_
#include "common/angleutils.h"
-#include "common/RefCountObject.h"
+#include "libANGLE/RefCountObject.h"
#include "libANGLE/angletypes.h"
#include "libANGLE/VertexAttribute.h"
#include "libANGLE/Renderbuffer.h"
diff --git a/src/libANGLE/Surface.cpp b/src/libANGLE/Surface.cpp
index 68ace7d..1c6f12e 100644
--- a/src/libANGLE/Surface.cpp
+++ b/src/libANGLE/Surface.cpp
@@ -20,8 +20,6 @@
#include "libANGLE/Display.h"
-#include "common/NativeWindow.h"
-
//TODO(jmadill): phase this out
#include "libANGLE/renderer/d3d/RendererD3D.h"
diff --git a/src/libANGLE/Surface.h b/src/libANGLE/Surface.h
index eff839d..290c9e4 100644
--- a/src/libANGLE/Surface.h
+++ b/src/libANGLE/Surface.h
@@ -13,10 +13,12 @@
#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
{
diff --git a/src/libANGLE/Texture.h b/src/libANGLE/Texture.h
index 4d453a9..9a70708 100644
--- a/src/libANGLE/Texture.h
+++ b/src/libANGLE/Texture.h
@@ -12,7 +12,7 @@
#define LIBANGLE_TEXTURE_H_
#include "common/debug.h"
-#include "common/RefCountObject.h"
+#include "libANGLE/RefCountObject.h"
#include "libANGLE/angletypes.h"
#include "libANGLE/Constants.h"
#include "libANGLE/renderer/TextureImpl.h"
diff --git a/src/libANGLE/TransformFeedback.h b/src/libANGLE/TransformFeedback.h
index d75fabe..b14b1b0 100644
--- a/src/libANGLE/TransformFeedback.h
+++ b/src/libANGLE/TransformFeedback.h
@@ -7,8 +7,9 @@
#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"
diff --git a/src/libANGLE/Uniform.h b/src/libANGLE/Uniform.h
index c70d084..1407e30 100644
--- a/src/libANGLE/Uniform.h
+++ b/src/libANGLE/Uniform.h
@@ -8,10 +8,10 @@
#define LIBANGLE_UNIFORM_H_
#include "common/debug.h"
-#include "common/blocklayout.h"
-
#include "libANGLE/angletypes.h"
+#include "common/blocklayout.h"
+
#include "angle_gl.h"
#include <string>
diff --git a/src/libANGLE/VertexArray.h b/src/libANGLE/VertexArray.h
index f8c9770..abef72a 100644
--- a/src/libANGLE/VertexArray.h
+++ b/src/libANGLE/VertexArray.h
@@ -13,7 +13,7 @@
#ifndef LIBANGLE_VERTEXARRAY_H_
#define LIBANGLE_VERTEXARRAY_H_
-#include "common/RefCountObject.h"
+#include "libANGLE/RefCountObject.h"
#include "libANGLE/Constants.h"
#include "libANGLE/VertexAttribute.h"
diff --git a/src/libANGLE/angletypes.h b/src/libANGLE/angletypes.h
index ec49771..3e6820c 100644
--- a/src/libANGLE/angletypes.h
+++ b/src/libANGLE/angletypes.h
@@ -10,7 +10,7 @@
#define LIBANGLE_ANGLETYPES_H_
#include "libANGLE/Constants.h"
-#include "common/RefCountObject.h"
+#include "libANGLE/RefCountObject.h"
namespace gl
{
diff --git a/src/common/features.h b/src/libANGLE/features.h
similarity index 90%
rename from src/common/features.h
rename to src/libANGLE/features.h
index 19cf0e2..fbe013f 100644
--- a/src/common/features.h
+++ b/src/libANGLE/features.h
@@ -4,8 +4,8 @@
// found in the LICENSE file.
//
-#ifndef COMMON_FEATURES_H_
-#define COMMON_FEATURES_H_
+#ifndef LIBANGLE_FEATURES_H_
+#define LIBANGLE_FEATURES_H_
#define ANGLE_DISABLED 0
#define ANGLE_ENABLED 1
@@ -37,4 +37,4 @@
#define ANGLE_SHADER_DEBUG_INFO ANGLE_DISABLED
#endif
-#endif // COMMON_FEATURES_H_
+#endif // LIBANGLE_FEATURES_H_
diff --git a/src/libANGLE/renderer/Renderer.h b/src/libANGLE/renderer/Renderer.h
index d4f6d79..a62b273 100644
--- a/src/libANGLE/renderer/Renderer.h
+++ b/src/libANGLE/renderer/Renderer.h
@@ -15,7 +15,6 @@
#include "libANGLE/Uniform.h"
#include "libANGLE/angletypes.h"
#include "libANGLE/renderer/Workarounds.h"
-#include "common/NativeWindow.h"
#include "common/mathutil.h"
#include <cstdint>
diff --git a/src/libANGLE/renderer/SwapChain.h b/src/libANGLE/renderer/SwapChain.h
index 535d5d9..4ab806f 100644
--- a/src/libANGLE/renderer/SwapChain.h
+++ b/src/libANGLE/renderer/SwapChain.h
@@ -10,8 +10,10 @@
#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>
diff --git a/src/libANGLE/renderer/d3d/HLSLCompiler.cpp b/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
index 0a5ae5b..c22ae89 100644
--- a/src/libANGLE/renderer/d3d/HLSLCompiler.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
index ef7e11c..05707a8 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -7,9 +7,7 @@
// ProgramD3D.cpp: Defines the rx::ProgramD3D class which implements rx::ProgramImpl.
#include "libANGLE/renderer/d3d/ProgramD3D.h"
-
-#include "common/features.h"
-#include "common/utilities.h"
+#include "libANGLE/features.h"
#include "libANGLE/Framebuffer.h"
#include "libANGLE/FramebufferAttachment.h"
#include "libANGLE/Program.h"
@@ -19,6 +17,8 @@
#include "libANGLE/renderer/d3d/RendererD3D.h"
#include "libANGLE/renderer/d3d/ShaderD3D.h"
+#include "common/utilities.h"
+
namespace rx
{
diff --git a/src/libANGLE/renderer/d3d/RendererD3D.h b/src/libANGLE/renderer/d3d/RendererD3D.h
index d2fa4c7..135a83b 100644
--- a/src/libANGLE/renderer/d3d/RendererD3D.h
+++ b/src/libANGLE/renderer/d3d/RendererD3D.h
@@ -10,6 +10,7 @@
#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
diff --git a/src/libANGLE/renderer/d3d/ShaderD3D.cpp b/src/libANGLE/renderer/d3d/ShaderD3D.cpp
index b0fbdc7..116c683 100644
--- a/src/libANGLE/renderer/d3d/ShaderD3D.cpp
+++ b/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
diff --git a/src/common/NativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/NativeWindow.h
similarity index 91%
rename from src/common/NativeWindow.h
rename to src/libANGLE/renderer/d3d/d3d11/NativeWindow.h
index dc5fc8f..95a5140 100644
--- a/src/common/NativeWindow.h
+++ b/src/libANGLE/renderer/d3d/d3d11/NativeWindow.h
@@ -9,8 +9,8 @@
// It is used for HWND (Desktop Windows) and IInspectable objects
//(Windows Store Applications).
-#ifndef COMMON_NATIVEWINDOW_H_
-#define COMMON_NATIVEWINDOW_H_
+#ifndef LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_
+#define LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_
#include <EGL/eglplatform.h>
#include "common/debug.h"
@@ -71,4 +71,4 @@
bool IsValidEGLNativeWindowType(EGLNativeWindowType window);
}
-#endif // COMMON_NATIVEWINDOW_H_
+#endif // LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_
diff --git a/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp b/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
index cb4f97c..079f811 100644
--- a/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
+++ b/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
{
diff --git a/src/common/win32/NativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
similarity index 96%
rename from src/common/win32/NativeWindow.cpp
rename to src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
index aa2bfa4..32e92d1 100644
--- a/src/common/win32/NativeWindow.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
@@ -6,7 +6,8 @@
// NativeWindow.cpp: Handler for managing HWND native window types.
-#include "common/NativeWindow.h"
+#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
+
#include "common/debug.h"
namespace rx
diff --git a/src/common/winrt/CoreWindowNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
similarity index 98%
rename from src/common/winrt/CoreWindowNativeWindow.cpp
rename to src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
index 0de16f4..e2340c2 100644
--- a/src/common/winrt/CoreWindowNativeWindow.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
@@ -6,8 +6,10 @@
// 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
diff --git a/src/common/winrt/CoreWindowNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
similarity index 89%
rename from src/common/winrt/CoreWindowNativeWindow.h
rename to src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
index 0c6222d..c230c84 100644
--- a/src/common/winrt/CoreWindowNativeWindow.h
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
@@ -6,10 +6,11 @@
// CoreWindowNativeWindow.h: NativeWindow for managing ICoreWindow native window types.
-#ifndef COMMON_WINRT_COREWINDOWNATIVEWINDOW_H_
-#define COMMON_WINRT_COREWINDOWNATIVEWINDOW_H_
+#ifndef LIBANGLE_RENDERER_D3D_D3D11_WINRT_COREWINDOWNATIVEWINDOW_H_
+#define LIBANGLE_RENDERER_D3D_D3D11_WINRT_COREWINDOWNATIVEWINDOW_H_
-#include "common/winrt/InspectableNativeWindow.h"
+#include "libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h"
+
#include <memory>
typedef ABI::Windows::Foundation::__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowSizeChangedEventArgs_t IWindowSizeChangedEventHandler;
@@ -74,4 +75,4 @@
HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWindow>& coreWindow, RECT *windowSize);
}
-#endif // COMMON_WINRT_COREWINDOWNATIVEWINDOW_H_
+#endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_COREWINDOWNATIVEWINDOW_H_
diff --git a/src/common/winrt/InspectableNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
similarity index 97%
rename from src/common/winrt/InspectableNativeWindow.cpp
rename to src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
index c062a48..cb0b939 100644
--- a/src/common/winrt/InspectableNativeWindow.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
@@ -6,8 +6,8 @@
// InspectableNativeWindow.cpp: NativeWindow base class for managing IInspectable native window types.
-#include "common/winrt/CoreWindowNativeWindow.h"
-#include "common/winrt/SwapChainPanelNativeWindow.h"
+#include "libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h"
+#include "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h"
namespace rx
{
diff --git a/src/common/winrt/InspectableNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
similarity index 91%
rename from src/common/winrt/InspectableNativeWindow.h
rename to src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
index c625348..b420352 100644
--- a/src/common/winrt/InspectableNativeWindow.h
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
@@ -7,11 +7,13 @@
// InspectableNativeWindow.h: Host specific implementation interface for
// managing IInspectable native window types.
-#ifndef COMMON_WINRT_INSPECTABLENATIVEWINDOW_H_
-#define COMMON_WINRT_INSPECTABLENATIVEWINDOW_H_
+#ifndef LIBANGLE_RENDERER_D3D_D3D11_WINRT_INSPECTABLENATIVEWINDOW_H_
+#define LIBANGLE_RENDERER_D3D_D3D11_WINRT_INSPECTABLENATIVEWINDOW_H_
+
+#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
#include "common/platform.h"
-#include "common/NativeWindow.h"
+
#include "angle_windowsstore.h"
#include <windows.ui.xaml.h>
@@ -84,5 +86,7 @@
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 // COMMON_WINRT_INSPECTABLENATIVEWINDOW_H_
+
+#endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_INSPECTABLENATIVEWINDOW_H_
diff --git a/src/common/winrt/SwapChainPanelNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
similarity index 98%
rename from src/common/winrt/SwapChainPanelNativeWindow.cpp
rename to src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
index 4e4fb6d..53899db 100644
--- a/src/common/winrt/SwapChainPanelNativeWindow.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
@@ -6,9 +6,11 @@
// SwapChainPanelNativeWindow.cpp: NativeWindow for managing ISwapChainPanel native window types.
-#include "common/winrt/SwapChainPanelNativeWindow.h"
+#include "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h"
+
#include <algorithm>
#include <math.h>
+
using namespace ABI::Windows::Foundation::Collections;
namespace rx
diff --git a/src/common/winrt/SwapChainPanelNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
similarity index 90%
rename from src/common/winrt/SwapChainPanelNativeWindow.h
rename to src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
index e88f554..caf327d 100644
--- a/src/common/winrt/SwapChainPanelNativeWindow.h
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
@@ -6,10 +6,10 @@
// SwapChainPanelNativeWindow.h: NativeWindow for managing ISwapChainPanel native window types.
-#ifndef COMMON_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
-#define COMMON_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
+#ifndef LIBANGLE_RENDERER_D3D_D3D11_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
+#define LIBANGLE_RENDERER_D3D_D3D11_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
-#include "common/winrt/InspectableNativeWindow.h"
+#include "libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h"
namespace rx
{
@@ -76,4 +76,4 @@
HRESULT GetSwapChainPanelSize(const ComPtr<ABI::Windows::UI::Xaml::Controls::ISwapChainPanel> &swapChainPanel, RECT *windowSize);
}
-#endif // COMMON_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
+#endif // LIBANGLE_RENDERER_D3D_D3D11_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
diff --git a/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp b/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
index c5d621c..b403a0a 100644
--- a/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
+++ b/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
@@ -36,11 +36,10 @@
#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"
diff --git a/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp b/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
index 08392f8..64050af 100644
--- a/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
+++ b/src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
@@ -10,8 +10,7 @@
#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
#include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
#include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
-
-#include "common/features.h"
+#include "libANGLE/features.h"
namespace rx
{
diff --git a/src/libANGLE/version.h b/src/libANGLE/version.h
new file mode 100644
index 0000000..b814d79
--- /dev/null
+++ b/src/libANGLE/version.h
@@ -0,0 +1,23 @@
+//
+// 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
+#define ANGLE_MINOR_VERSION 1
+
+#define ANGLE_STRINGIFY(x) #x
+#define ANGLE_MACRO_STRINGIFY(x) ANGLE_STRINGIFY(x)
+
+#define ANGLE_VERSION_STRING \
+ ANGLE_MACRO_STRINGIFY(ANGLE_MAJOR_VERSION) "." \
+ ANGLE_MACRO_STRINGIFY(ANGLE_MINOR_VERSION) "." \
+ ANGLE_COMMIT_HASH
+
+#endif // LIBANGLE_VERSION_H_
diff --git a/src/libEGL/libEGL.cpp b/src/libEGL/libEGL.cpp
index b0d1a72..e1987da 100644
--- a/src/libEGL/libEGL.cpp
+++ b/src/libEGL/libEGL.cpp
@@ -17,11 +17,13 @@
#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)
{
diff --git a/src/libEGL/libEGL.rc b/src/libEGL/libEGL.rc
index 65e0aa5..0100f25 100644
--- a/src/libEGL/libEGL.rc
+++ b/src/libEGL/libEGL.rc
@@ -8,7 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include <windows.h>
-#include "../common/version.h"
+#include "../libANGLE/version.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
diff --git a/src/libGLESv2.gypi b/src/libGLESv2.gypi
index 78f5adc..a44f658 100644
--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -6,7 +6,25 @@
'variables':
{
# These file lists are shared with the GN build.
- 'angle_libangle_sources':
+ 'libangle_common_sources':
+ [
+ 'common/angleutils.cpp',
+ 'common/angleutils.h',
+ 'common/blocklayout.cpp',
+ 'common/blocklayout.h',
+ 'common/debug.cpp',
+ 'common/debug.h',
+ 'common/event_tracer.cpp',
+ 'common/event_tracer.h',
+ 'common/mathutil.cpp',
+ 'common/mathutil.h',
+ 'common/platform.h',
+ 'common/tls.cpp',
+ 'common/tls.h',
+ 'common/utilities.cpp',
+ 'common/utilities.h',
+ ],
+ 'libangle_includes':
[
'../include/EGL/egl.h',
'../include/EGL/eglext.h',
@@ -21,26 +39,9 @@
'../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',
- 'common/blocklayout.h',
- 'common/debug.cpp',
- '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',
- 'common/version.h',
+ ],
+ 'libangle_sources':
+ [
'libANGLE/AttributeMap.cpp',
'libANGLE/AttributeMap.h',
'libANGLE/BinaryStream.h',
@@ -59,6 +60,7 @@
'libANGLE/Display.h',
'libANGLE/Error.cpp',
'libANGLE/Error.h',
+ 'libANGLE/features.h',
'libANGLE/Fence.cpp',
'libANGLE/Fence.h',
'libANGLE/Float16ToFloat32.cpp',
@@ -76,6 +78,8 @@
'libANGLE/ProgramBinary.h',
'libANGLE/Query.cpp',
'libANGLE/Query.h',
+ 'libANGLE/RefCountObject.cpp',
+ 'libANGLE/RefCountObject.h',
'libANGLE/Renderbuffer.cpp',
'libANGLE/Renderbuffer.h',
'libANGLE/ResourceManager.cpp',
@@ -94,6 +98,7 @@
'libANGLE/TransformFeedback.h',
'libANGLE/Uniform.cpp',
'libANGLE/Uniform.h',
+ 'libANGLE/version.h',
'libANGLE/VertexArray.cpp',
'libANGLE/VertexArray.h',
'libANGLE/VertexAttribute.cpp',
@@ -151,21 +156,7 @@
'third_party/systeminfo/SystemInfo.cpp',
'third_party/systeminfo/SystemInfo.h',
],
- '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_d3d_shared_sources':
[
'libANGLE/renderer/d3d/BufferD3D.cpp',
'libANGLE/renderer/d3d/BufferD3D.h',
@@ -202,7 +193,7 @@
'libANGLE/renderer/d3d/VertexDataManager.cpp',
'libANGLE/renderer/d3d/VertexDataManager.h',
],
- 'angle_d3d9_sources':
+ 'libangle_d3d9_sources':
[
'libANGLE/renderer/d3d/d3d9/Blit9.cpp',
'libANGLE/renderer/d3d/d3d9/Blit9.h',
@@ -242,7 +233,7 @@
'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp',
'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h',
],
- 'angle_d3d11_sources':
+ 'libangle_d3d11_sources':
[
'libANGLE/renderer/d3d/d3d11/Blit11.cpp',
'libANGLE/renderer/d3d/d3d11/Blit11.h',
@@ -260,6 +251,7 @@
'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',
@@ -335,7 +327,20 @@
'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
@@ -356,7 +361,9 @@
],
'sources':
[
- '<@(angle_libangle_sources)',
+ '<@(libangle_sources)',
+ '<@(libangle_common_sources)',
+ '<@(libangle_includes)',
],
'defines':
[
@@ -414,14 +421,14 @@
{
'sources':
[
- '<@(angle_d3d_shared_sources)',
+ '<@(libangle_d3d_shared_sources)',
],
}],
['angle_enable_d3d9==1',
{
'sources':
[
- '<@(angle_d3d9_sources)',
+ '<@(libangle_d3d9_sources)',
],
'defines':
[
@@ -445,7 +452,7 @@
{
'sources':
[
- '<@(angle_d3d11_sources)',
+ '<@(libangle_d3d11_sources)',
],
'defines':
[
@@ -479,13 +486,25 @@
}
},
},
+ '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'
@@ -493,10 +512,6 @@
}],
['angle_build_winrt==1',
{
- 'sources':
- [
- '<@(angle_libangle_winrt_sources)',
- ],
'defines':
[
'NTDDI_VERSION=NTDDI_WINBLUE',
diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 0c243bc..0139245 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/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"
diff --git a/src/libGLESv2/libGLESv2.rc b/src/libGLESv2/libGLESv2.rc
index 76cd055..c32bbc7 100644
--- a/src/libGLESv2/libGLESv2.rc
+++ b/src/libGLESv2/libGLESv2.rc
@@ -8,7 +8,7 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include <windows.h>
-#include "../common/version.h"
+#include "../libANGLE/version.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
diff --git a/src/libGLESv2/main.h b/src/libGLESv2/main.h
index 8619e77..d3e2f46 100644
--- a/src/libGLESv2/main.h
+++ b/src/libGLESv2/main.h
@@ -9,8 +9,6 @@
#ifndef LIBGLESV2_MAIN_H_
#define LIBGLESV2_MAIN_H_
-#include "common/debug.h"
-
#include <GLES2/gl2.h>
#include <EGL/egl.h>