Skip to content

A
angle
Commit 2207213b by Geoff Lang
Options

Move as many files as possible from common to libANGLE.

BUG=angle:733 Change-Id: If01c91cd52ac5c2102276a9fdc4b68ebc13e47f9 Reviewed-on: https://chromium-review.googlesource.com/231850Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 5ce48e21
Showing with 169 additions and 136 deletions
BUILD.gn
...@@ -166,26 +166,25 @@ if (is_win) { ...@@ -166,26 +166,25 @@ if (is_win) {
} }
static_library("libANGLE") { static_library("libANGLE") {
sources = rebase_path(gles_gypi.angle_libangle_sources, ".", "src") sources = rebase_path(gles_gypi.libangle_sources, ".", "src")
sources += rebase_path(gles_gypi.libangle_common_sources, ".", "src")
libs = [] libs = []
defines = [] defines = []
# Windows-specific sources.
sources += rebase_path(gles_gypi.angle_libangle_win_sources, ".", "src")
# Shared D3dD sources. # Shared D3dD sources.
if (angle_enable_d3d9 || angle_enable_d3d11) { if (angle_enable_d3d9 || angle_enable_d3d11) {
sources += rebase_path(gles_gypi.angle_d3d_shared_sources, ".", "src") sources += rebase_path(gles_gypi.libangle_d3d_shared_sources, ".", "src")
} }
if (angle_enable_d3d9) { if (angle_enable_d3d9) {
sources += rebase_path(gles_gypi.angle_d3d9_sources, ".", "src") sources += rebase_path(gles_gypi.libangle_d3d9_sources, ".", "src")
libs += [ "d3d9.lib" ] libs += [ "d3d9.lib" ]
} }
if (angle_enable_d3d11) { if (angle_enable_d3d11) {
sources += rebase_path(gles_gypi.angle_d3d11_sources, ".", "src") sources += rebase_path(gles_gypi.libangle_d3d11_sources, ".", "src")
sources += rebase_path(gles_gypi.libangle_d3d11_win32_sources, ".", "src")
libs += [ "dxguid.lib" ] libs += [ "dxguid.lib" ]
} }
......
src/common/angleutils.cpp
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
// //
#include "common/angleutils.h" #include "common/angleutils.h"
#include "debug.h" #include "common/debug.h"
#include <stdio.h> #include <stdio.h>
#include <vector> #include <vector>
......
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 COMMON_VERSION_H_
#define COMMON_VERSION_H_
#include "id/commit.h" #include "id/commit.h"
#define ANGLE_MAJOR_VERSION 2 #define ANGLE_MAJOR_VERSION 2
...@@ -10,3 +19,5 @@ ...@@ -10,3 +19,5 @@
ANGLE_MACRO_STRINGIFY(ANGLE_MAJOR_VERSION) "." \ ANGLE_MACRO_STRINGIFY(ANGLE_MAJOR_VERSION) "." \
ANGLE_MACRO_STRINGIFY(ANGLE_MINOR_VERSION) "." \ ANGLE_MACRO_STRINGIFY(ANGLE_MINOR_VERSION) "." \
ANGLE_COMMIT_HASH ANGLE_COMMIT_HASH
#endif // COMMON_VERSION_H_
src/compiler.gypi
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
'../include/GLSLANG/ShaderVars.h', '../include/GLSLANG/ShaderVars.h',
'../include/KHR/khrplatform.h', '../include/KHR/khrplatform.h',
'../include/angle_gl.h', '../include/angle_gl.h',
'common/RefCountObject.cpp',
'common/RefCountObject.h',
'common/angleutils.h', 'common/angleutils.h',
'common/angleutils.cpp', 'common/angleutils.cpp',
'common/blocklayout.cpp', 'common/blocklayout.cpp',
...@@ -38,7 +36,6 @@ ...@@ -38,7 +36,6 @@
'common/tls.h', 'common/tls.h',
'common/utilities.cpp', 'common/utilities.cpp',
'common/utilities.h', 'common/utilities.h',
'common/version.h',
'compiler/translator/BaseTypes.h', 'compiler/translator/BaseTypes.h',
'compiler/translator/BuiltInFunctionEmulator.cpp', 'compiler/translator/BuiltInFunctionEmulator.cpp',
'compiler/translator/BuiltInFunctionEmulator.h', 'compiler/translator/BuiltInFunctionEmulator.h',
......
src/libANGLE/Buffer.h
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
#define LIBANGLE_BUFFER_H_ #define LIBANGLE_BUFFER_H_
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/RefCountObject.h"
#include "libANGLE/renderer/IndexRangeCache.h"
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h"
#include "libANGLE/renderer/IndexRangeCache.h"
namespace rx namespace rx
{ {
......
src/libANGLE/Context.h
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#define LIBANGLE_CONTEXT_H_ #define LIBANGLE_CONTEXT_H_
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h" #include "libANGLE/RefCountObject.h"
#include "libANGLE/Caps.h" #include "libANGLE/Caps.h"
#include "libANGLE/Constants.h" #include "libANGLE/Constants.h"
#include "libANGLE/Data.h" #include "libANGLE/Data.h"
......
src/libANGLE/Fence.h
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#define LIBANGLE_FENCE_H_ #define LIBANGLE_FENCE_H_
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/RefCountObject.h"
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h"
namespace rx namespace rx
{ {
......
src/libANGLE/Framebuffer.h
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
#define LIBANGLE_FRAMEBUFFER_H_ #define LIBANGLE_FRAMEBUFFER_H_
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/RefCountObject.h"
#include "libANGLE/Constants.h"
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h"
#include "Constants.h"
#include <vector> #include <vector>
......
src/libANGLE/FramebufferAttachment.h
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#define LIBANGLE_FRAMEBUFFERATTACHMENT_H_ #define LIBANGLE_FRAMEBUFFERATTACHMENT_H_
#include "libANGLE/Texture.h" #include "libANGLE/Texture.h"
#include "libANGLE/RefCountObject.h"
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h"
#include "angle_gl.h" #include "angle_gl.h"
......
src/libANGLE/Program.h
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#define LIBANGLE_PROGRAM_H_ #define LIBANGLE_PROGRAM_H_
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h" #include "libANGLE/RefCountObject.h"
#include "libANGLE/Constants.h" #include "libANGLE/Constants.h"
#include "libANGLE/ProgramBinary.h" #include "libANGLE/ProgramBinary.h"
......
src/libANGLE/ProgramBinary.cpp
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
#include "libANGLE/Renderbuffer.h" #include "libANGLE/Renderbuffer.h"
#include "libANGLE/renderer/ShaderExecutable.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/Shader.h"
#include "libANGLE/Program.h" #include "libANGLE/Program.h"
#include "libANGLE/renderer/ProgramImpl.h" #include "libANGLE/renderer/ProgramImpl.h"
#include "libANGLE/renderer/d3d/ShaderD3D.h" #include "libANGLE/renderer/d3d/ShaderD3D.h"
#include "libANGLE/Context.h" #include "libANGLE/Context.h"
#include "libANGLE/Buffer.h" #include "libANGLE/Buffer.h"
#include "libANGLE/features.h"
#include "common/blocklayout.h" #include "common/blocklayout.h"
#include "common/features.h" #include "common/debug.h"
#include "common/utilities.h"
#include "common/platform.h"
#include "common/version.h"
namespace gl namespace gl
{ {
......
src/libANGLE/ProgramBinary.h
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
#ifndef LIBANGLE_PROGRAM_BINARY_H_ #ifndef LIBANGLE_PROGRAM_BINARY_H_
#define LIBANGLE_PROGRAM_BINARY_H_ #define LIBANGLE_PROGRAM_BINARY_H_
#include "common/RefCountObject.h"
#include "angletypes.h"
#include "common/mathutil.h" #include "common/mathutil.h"
#include "libANGLE/angletypes.h"
#include "libANGLE/RefCountObject.h"
#include "libANGLE/Uniform.h" #include "libANGLE/Uniform.h"
#include "libANGLE/Shader.h" #include "libANGLE/Shader.h"
#include "libANGLE/Constants.h" #include "libANGLE/Constants.h"
......
src/libANGLE/Query.h
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#define LIBANGLE_QUERY_H_ #define LIBANGLE_QUERY_H_
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/RefCountObject.h"
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h"
#include "angle_gl.h" #include "angle_gl.h"
......
src/common/RefCountObject.h → src/libANGLE/RefCountObject.h
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
// that need to be reference counted for correct cross-context deletion. // that need to be reference counted for correct cross-context deletion.
// (Concretely, textures, buffers and renderbuffers.) // (Concretely, textures, buffers and renderbuffers.)
#ifndef COMMON_REFCOUNTOBJECT_H_ #ifndef LIBANGLE_REFCOUNTOBJECT_H_
#define COMMON_REFCOUNTOBJECT_H_ #define LIBANGLE_REFCOUNTOBJECT_H_
#include "common/debug.h" #include "common/debug.h"
...@@ -92,4 +92,4 @@ class OffsetBindingPointer : public RefCountObjectBindingPointer ...@@ -92,4 +92,4 @@ class OffsetBindingPointer : public RefCountObjectBindingPointer
GLsizeiptr mSize; GLsizeiptr mSize;
}; };
#endif // COMMON_REFCOUNTOBJECT_H_ #endif // LIBANGLE_REFCOUNTOBJECT_H_
src/libANGLE/Renderbuffer.h
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include "angle_gl.h" #include "angle_gl.h"
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/RefCountObject.h"
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h"
namespace rx namespace rx
{ {
......
src/libANGLE/Sampler.h
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef LIBANGLE_SAMPLER_H_ #ifndef LIBANGLE_SAMPLER_H_
#define LIBANGLE_SAMPLER_H_ #define LIBANGLE_SAMPLER_H_
#include "common/RefCountObject.h" #include "libANGLE/RefCountObject.h"
namespace gl namespace gl
{ {
......
src/libANGLE/State.h
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#define LIBANGLE_STATE_H_ #define LIBANGLE_STATE_H_
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h" #include "libANGLE/RefCountObject.h"
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
#include "libANGLE/VertexAttribute.h" #include "libANGLE/VertexAttribute.h"
#include "libANGLE/Renderbuffer.h" #include "libANGLE/Renderbuffer.h"
......
src/libANGLE/Surface.cpp
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include "libANGLE/Display.h" #include "libANGLE/Display.h"
#include "common/NativeWindow.h"
//TODO(jmadill): phase this out //TODO(jmadill): phase this out
#include "libANGLE/renderer/d3d/RendererD3D.h" #include "libANGLE/renderer/d3d/RendererD3D.h"
......
src/libANGLE/Surface.h
...@@ -13,10 +13,12 @@ ...@@ -13,10 +13,12 @@
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
// TODO: don't expose this to egl::Surface
#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
#include <EGL/egl.h> #include <EGL/egl.h>
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/NativeWindow.h"
namespace gl namespace gl
{ {
......
src/libANGLE/Texture.h
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define LIBANGLE_TEXTURE_H_ #define LIBANGLE_TEXTURE_H_
#include "common/debug.h" #include "common/debug.h"
#include "common/RefCountObject.h" #include "libANGLE/RefCountObject.h"
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
#include "libANGLE/Constants.h" #include "libANGLE/Constants.h"
#include "libANGLE/renderer/TextureImpl.h" #include "libANGLE/renderer/TextureImpl.h"
......
src/libANGLE/TransformFeedback.h
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
#ifndef LIBANGLE_TRANSFORM_FEEDBACK_H_ #ifndef LIBANGLE_TRANSFORM_FEEDBACK_H_
#define LIBANGLE_TRANSFORM_FEEDBACK_H_ #define LIBANGLE_TRANSFORM_FEEDBACK_H_
#include "libANGLE/RefCountObject.h"
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/RefCountObject.h"
#include "angle_gl.h" #include "angle_gl.h"
......
src/libANGLE/Uniform.h
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
#define LIBANGLE_UNIFORM_H_ #define LIBANGLE_UNIFORM_H_
#include "common/debug.h" #include "common/debug.h"
#include "common/blocklayout.h"
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
#include "common/blocklayout.h"
#include "angle_gl.h" #include "angle_gl.h"
#include <string> #include <string>
......
src/libANGLE/VertexArray.h
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#ifndef LIBANGLE_VERTEXARRAY_H_ #ifndef LIBANGLE_VERTEXARRAY_H_
#define LIBANGLE_VERTEXARRAY_H_ #define LIBANGLE_VERTEXARRAY_H_
#include "common/RefCountObject.h" #include "libANGLE/RefCountObject.h"
#include "libANGLE/Constants.h" #include "libANGLE/Constants.h"
#include "libANGLE/VertexAttribute.h" #include "libANGLE/VertexAttribute.h"
......
src/libANGLE/angletypes.h
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#define LIBANGLE_ANGLETYPES_H_ #define LIBANGLE_ANGLETYPES_H_
#include "libANGLE/Constants.h" #include "libANGLE/Constants.h"
#include "common/RefCountObject.h" #include "libANGLE/RefCountObject.h"
namespace gl namespace gl
{ {
......
src/common/features.h → src/libANGLE/features.h
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
#ifndef COMMON_FEATURES_H_ #ifndef LIBANGLE_FEATURES_H_
#define COMMON_FEATURES_H_ #define LIBANGLE_FEATURES_H_
#define ANGLE_DISABLED 0 #define ANGLE_DISABLED 0
#define ANGLE_ENABLED 1 #define ANGLE_ENABLED 1
...@@ -37,4 +37,4 @@ ...@@ -37,4 +37,4 @@
#define ANGLE_SHADER_DEBUG_INFO ANGLE_DISABLED #define ANGLE_SHADER_DEBUG_INFO ANGLE_DISABLED
#endif #endif
#endif // COMMON_FEATURES_H_ #endif // LIBANGLE_FEATURES_H_
src/libANGLE/renderer/Renderer.h
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "libANGLE/Uniform.h" #include "libANGLE/Uniform.h"
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
#include "libANGLE/renderer/Workarounds.h" #include "libANGLE/renderer/Workarounds.h"
#include "common/NativeWindow.h"
#include "common/mathutil.h" #include "common/mathutil.h"
#include <cstdint> #include <cstdint>
......
src/libANGLE/renderer/SwapChain.h
...@@ -10,8 +10,10 @@ ...@@ -10,8 +10,10 @@
#ifndef LIBANGLE_RENDERER_SWAPCHAIN_H_ #ifndef LIBANGLE_RENDERER_SWAPCHAIN_H_
#define 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/angleutils.h"
#include "common/NativeWindow.h"
#include "common/platform.h" #include "common/platform.h"
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
......
src/libANGLE/renderer/d3d/HLSLCompiler.cpp
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#include "libANGLE/renderer/d3d/HLSLCompiler.h" #include "libANGLE/renderer/d3d/HLSLCompiler.h"
#include "libANGLE/Program.h" #include "libANGLE/Program.h"
#include "libANGLE/features.h"
#include "common/features.h"
#include "common/utilities.h" #include "common/utilities.h"
#include "third_party/trace_event/trace_event.h" #include "third_party/trace_event/trace_event.h"
......
src/libANGLE/renderer/d3d/ProgramD3D.cpp
...@@ -7,9 +7,7 @@ ...@@ -7,9 +7,7 @@
// ProgramD3D.cpp: Defines the rx::ProgramD3D class which implements rx::ProgramImpl. // ProgramD3D.cpp: Defines the rx::ProgramD3D class which implements rx::ProgramImpl.
#include "libANGLE/renderer/d3d/ProgramD3D.h" #include "libANGLE/renderer/d3d/ProgramD3D.h"
#include "libANGLE/features.h"
#include "common/features.h"
#include "common/utilities.h"
#include "libANGLE/Framebuffer.h" #include "libANGLE/Framebuffer.h"
#include "libANGLE/FramebufferAttachment.h" #include "libANGLE/FramebufferAttachment.h"
#include "libANGLE/Program.h" #include "libANGLE/Program.h"
...@@ -19,6 +17,8 @@ ...@@ -19,6 +17,8 @@
#include "libANGLE/renderer/d3d/RendererD3D.h" #include "libANGLE/renderer/d3d/RendererD3D.h"
#include "libANGLE/renderer/d3d/ShaderD3D.h" #include "libANGLE/renderer/d3d/ShaderD3D.h"
#include "common/utilities.h"
namespace rx namespace rx
{ {
......
src/libANGLE/renderer/d3d/RendererD3D.h
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#define LIBANGLE_RENDERER_D3D_RENDERERD3D_H_ #define LIBANGLE_RENDERER_D3D_RENDERERD3D_H_
#include "libANGLE/renderer/Renderer.h" #include "libANGLE/renderer/Renderer.h"
#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
#include "libANGLE/Data.h" #include "libANGLE/Data.h"
//FIXME(jmadill): std::array is currently prohibited by Chromium style guide //FIXME(jmadill): std::array is currently prohibited by Chromium style guide
......
src/libANGLE/renderer/d3d/ShaderD3D.cpp
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include "libANGLE/Shader.h" #include "libANGLE/Shader.h"
#include "libANGLE/renderer/d3d/RendererD3D.h" #include "libANGLE/renderer/d3d/RendererD3D.h"
#include "libANGLE/renderer/d3d/ShaderD3D.h" #include "libANGLE/renderer/d3d/ShaderD3D.h"
#include "libANGLE/features.h"
#include "common/features.h"
#include "common/utilities.h" #include "common/utilities.h"
// Definitions local to the translation unit // Definitions local to the translation unit
......
src/common/NativeWindow.h → src/libANGLE/renderer/d3d/d3d11/NativeWindow.h
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
// It is used for HWND (Desktop Windows) and IInspectable objects // It is used for HWND (Desktop Windows) and IInspectable objects
//(Windows Store Applications). //(Windows Store Applications).
#ifndef COMMON_NATIVEWINDOW_H_ #ifndef LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_
#define COMMON_NATIVEWINDOW_H_ #define LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_
#include <EGL/eglplatform.h> #include <EGL/eglplatform.h>
#include "common/debug.h" #include "common/debug.h"
...@@ -71,4 +71,4 @@ class NativeWindow ...@@ -71,4 +71,4 @@ class NativeWindow
bool IsValidEGLNativeWindowType(EGLNativeWindowType window); bool IsValidEGLNativeWindowType(EGLNativeWindowType window);
} }
#endif // COMMON_NATIVEWINDOW_H_ #endif // LIBANGLE_RENDERER_D3D_D3D11_NATIVEWINDOW_H_
src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h" #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
#include "libANGLE/renderer/d3d/d3d11/formatutils11.h" #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
#include "libANGLE/renderer/d3d/d3d11/Renderer11.h" #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
#include "libANGLE/features.h"
// Precompiled shaders // Precompiled shaders
#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h" #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h"
#include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h" #include "libANGLE/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h"
#include "common/features.h"
#include "common/NativeWindow.h"
namespace rx namespace rx
{ {
......
src/common/win32/NativeWindow.cpp → src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
// NativeWindow.cpp: Handler for managing HWND native window types. // NativeWindow.cpp: Handler for managing HWND native window types.
#include "common/NativeWindow.h" #include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
#include "common/debug.h" #include "common/debug.h"
namespace rx namespace rx
......
src/common/winrt/CoreWindowNativeWindow.cpp → src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
...@@ -6,8 +6,10 @@ ...@@ -6,8 +6,10 @@
// CoreWindowNativeWindow.cpp: NativeWindow for managing ICoreWindow native window types. // CoreWindowNativeWindow.cpp: NativeWindow for managing ICoreWindow native window types.
#include "libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h"
#include <windows.graphics.display.h> #include <windows.graphics.display.h>
#include "common/winrt/CoreWindowNativeWindow.h"
using namespace ABI::Windows::Foundation::Collections; using namespace ABI::Windows::Foundation::Collections;
namespace rx namespace rx
......
src/common/winrt/CoreWindowNativeWindow.h → src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
...@@ -6,10 +6,11 @@ ...@@ -6,10 +6,11 @@
// CoreWindowNativeWindow.h: NativeWindow for managing ICoreWindow native window types. // CoreWindowNativeWindow.h: NativeWindow for managing ICoreWindow native window types.
#ifndef COMMON_WINRT_COREWINDOWNATIVEWINDOW_H_ #ifndef LIBANGLE_RENDERER_D3D_D3D11_WINRT_COREWINDOWNATIVEWINDOW_H_
#define COMMON_WINRT_COREWINDOWNATIVEWINDOW_H_ #define LIBANGLE_RENDERER_D3D_D3D11_WINRT_COREWINDOWNATIVEWINDOW_H_
#include "libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h"
#include "common/winrt/InspectableNativeWindow.h"
#include <memory> #include <memory>
typedef ABI::Windows::Foundation::__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowSizeChangedEventArgs_t IWindowSizeChangedEventHandler; typedef ABI::Windows::Foundation::__FITypedEventHandler_2_Windows__CUI__CCore__CCoreWindow_Windows__CUI__CCore__CWindowSizeChangedEventArgs_t IWindowSizeChangedEventHandler;
...@@ -74,4 +75,4 @@ class CoreWindowSizeChangedHandler : ...@@ -74,4 +75,4 @@ class CoreWindowSizeChangedHandler :
HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWindow>& coreWindow, RECT *windowSize); 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_
src/common/winrt/InspectableNativeWindow.cpp → src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.cpp
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
// InspectableNativeWindow.cpp: NativeWindow base class for managing IInspectable native window types. // InspectableNativeWindow.cpp: NativeWindow base class for managing IInspectable native window types.
#include "common/winrt/CoreWindowNativeWindow.h" #include "libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h"
#include "common/winrt/SwapChainPanelNativeWindow.h" #include "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h"
namespace rx namespace rx
{ {
......
src/common/winrt/InspectableNativeWindow.h → src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
...@@ -7,11 +7,13 @@ ...@@ -7,11 +7,13 @@
// InspectableNativeWindow.h: Host specific implementation interface for // InspectableNativeWindow.h: Host specific implementation interface for
// managing IInspectable native window types. // managing IInspectable native window types.
#ifndef COMMON_WINRT_INSPECTABLENATIVEWINDOW_H_ #ifndef LIBANGLE_RENDERER_D3D_D3D11_WINRT_INSPECTABLENATIVEWINDOW_H_
#define COMMON_WINRT_INSPECTABLENATIVEWINDOW_H_ #define LIBANGLE_RENDERER_D3D_D3D11_WINRT_INSPECTABLENATIVEWINDOW_H_
#include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
#include "common/platform.h" #include "common/platform.h"
#include "common/NativeWindow.h"
#include "angle_windowsstore.h" #include "angle_windowsstore.h"
#include <windows.ui.xaml.h> #include <windows.ui.xaml.h>
...@@ -84,5 +86,7 @@ bool IsCoreWindow(EGLNativeWindowType window, ComPtr<ABI::Windows::UI::Core::ICo ...@@ -84,5 +86,7 @@ bool IsCoreWindow(EGLNativeWindowType window, ComPtr<ABI::Windows::UI::Core::ICo
bool IsSwapChainPanel(EGLNativeWindowType window, ComPtr<ABI::Windows::UI::Xaml::Controls::ISwapChainPanel> *swapChainPanel = nullptr); 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); 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); 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_
src/common/winrt/SwapChainPanelNativeWindow.cpp → src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
...@@ -6,9 +6,11 @@ ...@@ -6,9 +6,11 @@
// SwapChainPanelNativeWindow.cpp: NativeWindow for managing ISwapChainPanel native window types. // 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 <algorithm>
#include <math.h> #include <math.h>
using namespace ABI::Windows::Foundation::Collections; using namespace ABI::Windows::Foundation::Collections;
namespace rx namespace rx
......
src/common/winrt/SwapChainPanelNativeWindow.h → src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
// SwapChainPanelNativeWindow.h: NativeWindow for managing ISwapChainPanel native window types. // SwapChainPanelNativeWindow.h: NativeWindow for managing ISwapChainPanel native window types.
#ifndef COMMON_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_ #ifndef LIBANGLE_RENDERER_D3D_D3D11_WINRT_SWAPCHAINPANELNATIVEWINDOW_H_
#define COMMON_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 namespace rx
{ {
...@@ -76,4 +76,4 @@ class SwapChainPanelSizeChangedHandler : ...@@ -76,4 +76,4 @@ class SwapChainPanelSizeChangedHandler :
HRESULT GetSwapChainPanelSize(const ComPtr<ABI::Windows::UI::Xaml::Controls::ISwapChainPanel> &swapChainPanel, RECT *windowSize); 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_
src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
...@@ -36,11 +36,10 @@ ...@@ -36,11 +36,10 @@
#include "libANGLE/ProgramBinary.h" #include "libANGLE/ProgramBinary.h"
#include "libANGLE/State.h" #include "libANGLE/State.h"
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
#include "libANGLE/Display.h" #include "libANGLE/Display.h"
#include "libANGLE/Surface.h" #include "libANGLE/Surface.h"
#include "libANGLE/features.h"
#include "common/features.h"
#include "common/utilities.h" #include "common/utilities.h"
#include "third_party/trace_event/trace_event.h" #include "third_party/trace_event/trace_event.h"
......
src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
#include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h" #include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"
#include "libANGLE/renderer/d3d/d3d9/formatutils9.h" #include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
#include "libANGLE/renderer/d3d/d3d9/Renderer9.h" #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
#include "libANGLE/features.h"
#include "common/features.h"
namespace rx namespace rx
{ {
......
src/libEGL/libEGL.cpp
...@@ -18,11 +18,12 @@ ...@@ -18,11 +18,12 @@
#include "libANGLE/Surface.h" #include "libANGLE/Surface.h"
#include "libANGLE/renderer/SwapChain.h" #include "libANGLE/renderer/SwapChain.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/debug.h"
#include "common/version.h" #include "common/version.h"
#include "common/NativeWindow.h"
bool validateDisplay(egl::Display *display) bool validateDisplay(egl::Display *display)
{ {
if (display == EGL_NO_DISPLAY) if (display == EGL_NO_DISPLAY)
......
src/libGLESv2.gypi
...@@ -6,23 +6,8 @@ ...@@ -6,23 +6,8 @@
'variables': 'variables':
{ {
# These file lists are shared with the GN build. # These file lists are shared with the GN build.
'angle_libangle_sources': 'libangle_common_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.cpp',
'common/angleutils.h', 'common/angleutils.h',
'common/blocklayout.cpp', 'common/blocklayout.cpp',
...@@ -31,16 +16,33 @@ ...@@ -31,16 +16,33 @@
'common/debug.h', 'common/debug.h',
'common/event_tracer.cpp', 'common/event_tracer.cpp',
'common/event_tracer.h', 'common/event_tracer.h',
'common/features.h',
'common/mathutil.cpp', 'common/mathutil.cpp',
'common/mathutil.h', 'common/mathutil.h',
'common/platform.h', 'common/platform.h',
'common/NativeWindow.h',
'common/tls.cpp', 'common/tls.cpp',
'common/tls.h', 'common/tls.h',
'common/utilities.cpp', 'common/utilities.cpp',
'common/utilities.h', 'common/utilities.h',
'common/version.h', 'common/version.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':
[
'libANGLE/AttributeMap.cpp', 'libANGLE/AttributeMap.cpp',
'libANGLE/AttributeMap.h', 'libANGLE/AttributeMap.h',
'libANGLE/BinaryStream.h', 'libANGLE/BinaryStream.h',
...@@ -59,6 +61,7 @@ ...@@ -59,6 +61,7 @@
'libANGLE/Display.h', 'libANGLE/Display.h',
'libANGLE/Error.cpp', 'libANGLE/Error.cpp',
'libANGLE/Error.h', 'libANGLE/Error.h',
'libANGLE/features.h',
'libANGLE/Fence.cpp', 'libANGLE/Fence.cpp',
'libANGLE/Fence.h', 'libANGLE/Fence.h',
'libANGLE/Float16ToFloat32.cpp', 'libANGLE/Float16ToFloat32.cpp',
...@@ -76,6 +79,8 @@ ...@@ -76,6 +79,8 @@
'libANGLE/ProgramBinary.h', 'libANGLE/ProgramBinary.h',
'libANGLE/Query.cpp', 'libANGLE/Query.cpp',
'libANGLE/Query.h', 'libANGLE/Query.h',
'libANGLE/RefCountObject.cpp',
'libANGLE/RefCountObject.h',
'libANGLE/Renderbuffer.cpp', 'libANGLE/Renderbuffer.cpp',
'libANGLE/Renderbuffer.h', 'libANGLE/Renderbuffer.h',
'libANGLE/ResourceManager.cpp', 'libANGLE/ResourceManager.cpp',
...@@ -151,21 +156,7 @@ ...@@ -151,21 +156,7 @@
'third_party/systeminfo/SystemInfo.cpp', 'third_party/systeminfo/SystemInfo.cpp',
'third_party/systeminfo/SystemInfo.h', 'third_party/systeminfo/SystemInfo.h',
], ],
'angle_libangle_win_sources': 'libangle_d3d_shared_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.cpp',
'libANGLE/renderer/d3d/BufferD3D.h', 'libANGLE/renderer/d3d/BufferD3D.h',
...@@ -202,7 +193,7 @@ ...@@ -202,7 +193,7 @@
'libANGLE/renderer/d3d/VertexDataManager.cpp', 'libANGLE/renderer/d3d/VertexDataManager.cpp',
'libANGLE/renderer/d3d/VertexDataManager.h', 'libANGLE/renderer/d3d/VertexDataManager.h',
], ],
'angle_d3d9_sources': 'libangle_d3d9_sources':
[ [
'libANGLE/renderer/d3d/d3d9/Blit9.cpp', 'libANGLE/renderer/d3d/d3d9/Blit9.cpp',
'libANGLE/renderer/d3d/d3d9/Blit9.h', 'libANGLE/renderer/d3d/d3d9/Blit9.h',
...@@ -242,7 +233,7 @@ ...@@ -242,7 +233,7 @@
'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp', 'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp',
'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h', 'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h',
], ],
'angle_d3d11_sources': 'libangle_d3d11_sources':
[ [
'libANGLE/renderer/d3d/d3d11/Blit11.cpp', 'libANGLE/renderer/d3d/d3d11/Blit11.cpp',
'libANGLE/renderer/d3d/d3d11/Blit11.h', 'libANGLE/renderer/d3d/d3d11/Blit11.h',
...@@ -260,6 +251,7 @@ ...@@ -260,6 +251,7 @@
'libANGLE/renderer/d3d/d3d11/IndexBuffer11.h', 'libANGLE/renderer/d3d/d3d11/IndexBuffer11.h',
'libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp', 'libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp',
'libANGLE/renderer/d3d/d3d11/InputLayoutCache.h', 'libANGLE/renderer/d3d/d3d11/InputLayoutCache.h',
'libANGLE/renderer/d3d/d3d11/NativeWindow.h',
'libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp', 'libANGLE/renderer/d3d/d3d11/PixelTransfer11.cpp',
'libANGLE/renderer/d3d/d3d11/PixelTransfer11.h', 'libANGLE/renderer/d3d/d3d11/PixelTransfer11.h',
'libANGLE/renderer/d3d/d3d11/Query11.cpp', 'libANGLE/renderer/d3d/d3d11/Query11.cpp',
...@@ -335,7 +327,20 @@ ...@@ -335,7 +327,20 @@
'libANGLE/renderer/d3d/d3d11/VertexArray11.h', 'libANGLE/renderer/d3d/d3d11/VertexArray11.h',
'libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp', 'libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp',
'libANGLE/renderer/d3d/d3d11/VertexBuffer11.h', '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 # Everything below this is duplicated in the GN build. If you change
# anything also change angle/BUILD.gn # anything also change angle/BUILD.gn
...@@ -356,7 +361,9 @@ ...@@ -356,7 +361,9 @@
], ],
'sources': 'sources':
[ [
'<@(angle_libangle_sources)', '<@(libangle_sources)',
'<@(libangle_common_sources)',
'<@(libangle_includes)',
], ],
'defines': 'defines':
[ [
...@@ -414,14 +421,14 @@ ...@@ -414,14 +421,14 @@
{ {
'sources': 'sources':
[ [
'<@(angle_d3d_shared_sources)', '<@(libangle_d3d_shared_sources)',
], ],
}], }],
['angle_enable_d3d9==1', ['angle_enable_d3d9==1',
{ {
'sources': 'sources':
[ [
'<@(angle_d3d9_sources)', '<@(libangle_d3d9_sources)',
], ],
'defines': 'defines':
[ [
...@@ -445,7 +452,7 @@ ...@@ -445,7 +452,7 @@
{ {
'sources': 'sources':
[ [
'<@(angle_d3d11_sources)', '<@(libangle_d3d11_sources)',
], ],
'defines': 'defines':
[ [
...@@ -479,13 +486,25 @@ ...@@ -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"', ['angle_build_winrt==0 and OS=="win"',
{ {
'sources':
[
'<@(angle_libangle_win_sources)',
],
'dependencies': 'dependencies':
[ [
'copy_compiler_dll' 'copy_compiler_dll'
...@@ -493,10 +512,6 @@ ...@@ -493,10 +512,6 @@
}], }],
['angle_build_winrt==1', ['angle_build_winrt==1',
{ {
'sources':
[
'<@(angle_libangle_winrt_sources)',
],
'defines': 'defines':
[ [
'NTDDI_VERSION=NTDDI_WINBLUE', 'NTDDI_VERSION=NTDDI_WINBLUE',
......
src/libGLESv2/libGLESv2.cpp
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include "libANGLE/validationES3.h" #include "libANGLE/validationES3.h"
#include "libANGLE/queryconversions.h" #include "libANGLE/queryconversions.h"
#include "common/version.h"
#include "common/utilities.h" #include "common/utilities.h"
#include "common/version.h"
extern "C" extern "C"
{ {
......
src/libGLESv2/main.h
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#ifndef LIBGLESV2_MAIN_H_ #ifndef LIBGLESV2_MAIN_H_
#define LIBGLESV2_MAIN_H_ #define LIBGLESV2_MAIN_H_
#include "common/debug.h"
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <EGL/egl.h> #include <EGL/egl.h>
......
tests/angle_implementation_unit_tests/CoreWindowNativeWindow_unittest.cpp
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
// to ensure that the proper defines are set when including additional // to ensure that the proper defines are set when including additional
// headers which rely on Windows Store specific configuration. // headers which rely on Windows Store specific configuration.
// This would normally be defined already but this unittest exe is compiled // 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 // set to WINAPI_FAMILY_DESKTOP_APP
#undef WINAPI_FAMILY #undef WINAPI_FAMILY
#define WINAPI_FAMILY WINAPI_FAMILY_PC_APP #define WINAPI_FAMILY WINAPI_FAMILY_PC_APP
#include "common/nativewindow.h" #include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
#include <angle_windowsstore.h> #include <angle_windowsstore.h>
using namespace rx; using namespace rx;
......
tests/angle_implementation_unit_tests/SwapChainPanelNativeWindow_unittest.cpp
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
// to ensure that the proper defines are set when including additional // to ensure that the proper defines are set when including additional
// headers which rely on Windows Store specific configuration. // headers which rely on Windows Store specific configuration.
// This would normally be defined already but this unittest exe is compiled // 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 // set to WINAPI_FAMILY_DESKTOP_APP
#undef WINAPI_FAMILY #undef WINAPI_FAMILY
#define WINAPI_FAMILY WINAPI_FAMILY_PC_APP #define WINAPI_FAMILY WINAPI_FAMILY_PC_APP
#include "common/nativewindow.h" #include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
#include <angle_windowsstore.h> #include <angle_windowsstore.h>
#include <windows.ui.xaml.h> #include <windows.ui.xaml.h>
#include <windows.ui.xaml.media.dxinterop.h> #include <windows.ui.xaml.media.dxinterop.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment