From a2e3cab78e5d405ffe10226d6f36090df34d609f Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Sun, 10 May 2020 04:33:56 -0400 Subject: [PATCH] Fixes, tweaks and updates to work with MSVS 2019 and HoloLens 2 --- src/common/mathutil.h | 2 +- src/common/platform.h | 2 +- src/libANGLE/Config.cpp | 3 +- src/libANGLE/Shader.cpp | 16 +- src/libANGLE/renderer/d3d/SurfaceD3D.cpp | 12 +- src/libANGLE/renderer/d3d/SwapChainD3D.h | 2 +- src/libANGLE/renderer/d3d/d3d11/Clear11.cpp | 6 +- .../renderer/d3d/d3d11/Renderer11.cpp | 22 +- src/libANGLE/renderer/d3d/d3d11/SwapChain11.h | 2 +- .../d3d11/winrt/CoreWindowNativeWindow.cpp | 3 +- .../DepthBufferPlaneFinder/LeastSquaresData.h | 5 +- .../ReadBufferForLeastSquaresFit.h | 2 + .../d3d11/winrt/HolographicNativeWindow.cpp | 28 +- .../d3d/d3d11/winrt/HolographicNativeWindow.h | 32 +-- .../d3d11/winrt/HolographicSwapChain11.cpp | 60 ++--- .../d3d/d3d11/winrt/HolographicSwapChain11.h | 2 +- src/libANGLE/renderer/d3d/d3d9/SwapChain9.h | 2 +- winrt/10/src/angle.sln | 241 +++++++++++------- winrt/10/src/angle_common.vcxproj | 104 +++++++- winrt/10/src/commit_id.vcxproj | 121 +++++++-- winrt/10/src/commit_id.vcxproj.filters | 8 +- winrt/10/src/copy_compiler_dll.vcxproj | 118 ++++++++- winrt/10/src/copy_scripts.vcxproj | 124 +++++++-- winrt/10/src/libANGLE.vcxproj | 106 +++++++- winrt/10/src/libEGL.vcxproj | 112 +++++++- winrt/10/src/libGLESv2.vcxproj | 112 +++++++- winrt/10/src/preprocessor.vcxproj | 176 ++++++++++--- winrt/10/src/translator.vcxproj | 130 ++++++++-- winrt/10/src/translator_lib.vcxproj | 106 +++++++- winrt/10/src/translator_static.vcxproj | 130 ++++++++-- 30 files changed, 1452 insertions(+), 337 deletions(-) diff --git a/src/common/mathutil.h b/src/common/mathutil.h index 3de62aef105..059862daca6 100644 --- a/src/common/mathutil.h +++ b/src/common/mathutil.h @@ -127,7 +127,7 @@ inline unsigned int unorm(float x) inline bool supportsSSE2() { -#if defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM) +#if defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64) static bool checked = false; static bool supports = false; diff --git a/src/common/platform.h b/src/common/platform.h index 4e6a51bd3c8..4e79f5f1b87 100644 --- a/src/common/platform.h +++ b/src/common/platform.h @@ -93,7 +93,7 @@ # undef far #endif -#if !defined(_M_ARM) && !defined(ANGLE_PLATFORM_ANDROID) +#if !defined(_M_ARM) && !defined(ANGLE_PLATFORM_ANDROID) && !defined(_M_ARM64) # define ANGLE_USE_SSE #endif diff --git a/src/libANGLE/Config.cpp b/src/libANGLE/Config.cpp index d511df3a69a..4157dc37558 100644 --- a/src/libANGLE/Config.cpp +++ b/src/libANGLE/Config.cpp @@ -271,7 +271,8 @@ std::vector ConfigSet::filter(const AttributeMap &attributeMap) c } // Sort the result - std::sort(result.begin(), result.end(), ConfigSorter(attributeMap)); + // TOCHECK: Was this crashing? + //std::sort(result.begin(), result.end(), ConfigSorter(attributeMap)); return result; } diff --git a/src/libANGLE/Shader.cpp b/src/libANGLE/Shader.cpp index 8472be5f4e1..18fb2ec7639 100644 --- a/src/libANGLE/Shader.cpp +++ b/src/libANGLE/Shader.cpp @@ -265,7 +265,7 @@ void Shader::compile(Compiler *compiler) #ifdef ANGLE_ENABLE_WINDOWS_HOLOGRAPHIC if (rx::HolographicNativeWindow::IsInitialized() && rx::HolographicSwapChain11::getIsAutomaticStereoRenderingEnabled()) { - // On Windows Holographic, update the shader version to 3, if it is less than that, and + // On Windows Holographic, update the shader version to 3, if it is less than that, and // apply our stereo instancing modification - which requires gl_InstanceID, which is only // available on shader version 3 or higher. bool isGlslesVersion3 = false; @@ -294,14 +294,14 @@ void Shader::compile(Compiler *compiler) } sourceString = modifiedSourceString; } - + std::string firstStringAlwaysStart = "#version 3"; std::string firstStringAlwaysEnd = "\n"; size_t index0 = sourceString.find(firstStringAlwaysStart); size_t index1 = sourceString.find(firstStringAlwaysEnd, index0 + 1) + firstStringAlwaysEnd.size(); size_t index2 = sourceString.find_last_of('}'); - std::string modifiedSourceString = - sourceString.substr(0, index1) + + std::string modifiedSourceString = + sourceString.substr(0, index1) + "uniform mat4 uHolographicViewMatrix[2];\n uniform mat4 uHolographicProjectionMatrix[2];\n uniform mat4 uHolographicViewProjectionMatrix[2];\n uniform mat4 uUndoMidViewMatrix;\n out float vRenderTargetArrayIndex;\n " + sourceString.substr(index1, index2-index1) + " int index = gl_InstanceIDUnmodified - (gl_InstanceID*2);\n vRenderTargetArrayIndex = float(index);\n gl_Position = uHolographicProjectionMatrix[index] * uHolographicViewMatrix[index] * uUndoMidViewMatrix * gl_Position;\n " + @@ -315,8 +315,8 @@ void Shader::compile(Compiler *compiler) if (!isGlslesVersion3) { // Translate the shader to GLSL version 300 syntax. - std::string modifiedSourceString = - std::string("#version 300 es\n ") + + std::string modifiedSourceString = + std::string("#version 300 es\n ") + "precision mediump float;\n " + sourceString; size_t varyingPos = 0; @@ -345,8 +345,8 @@ void Shader::compile(Compiler *compiler) size_t index1 = sourceString.find("void"); size_t index2 = sourceString.find_last_of('}'); - std::string modifiedSourceString = - sourceString.substr(0, index1) + + std::string modifiedSourceString = + sourceString.substr(0, index1) + (!isGlslesVersion3 ? "out vec4 fragColor;\n " : "") + "in float vRenderTargetArrayIndex;\n " + sourceString.substr(index1, index2-index1) + diff --git a/src/libANGLE/renderer/d3d/SurfaceD3D.cpp b/src/libANGLE/renderer/d3d/SurfaceD3D.cpp index eac01fda430..1f185be8826 100644 --- a/src/libANGLE/renderer/d3d/SurfaceD3D.cpp +++ b/src/libANGLE/renderer/d3d/SurfaceD3D.cpp @@ -314,16 +314,16 @@ egl::Error SurfaceD3D::swapRect(EGLint x, EGLint y, EGLint width, EGLint height) #ifdef ANGLE_ENABLE_WINDOWS_HOLOGRAPHIC if (mNativeWindow.isHolographic()) { - // An error was encountered. In this case, we don't have a swap chain to + // An error was encountered. In this case, we don't have a swap chain to // present, and that is normally where the holographic native window would // be reset in preparation of acquiring a new holographic frame next time - // the holographic FBO is cleared. So, we reset it here instead to ensure + // the holographic FBO is cleared. So, we reset it here instead to ensure // that the next frame is still going to be acquired. HolographicNativeWindow* holographicNativeWindow = reinterpret_cast(mNativeWindow.GetImpl()); holographicNativeWindow->ResetFrame(); } #endif - return egl::Error(EGL_SUCCESS); + //return egl::Error(EGL_SUCCESS); } if (x + width > mWidth) @@ -378,7 +378,7 @@ bool SurfaceD3D::checkForOutOfDateSwapChain() RECT client; int clientWidth = getWidth(); int clientHeight = getHeight(); - bool sizeDirty = false; + bool sizeDirty = false; #ifndef ANGLE_ENABLE_WINDOWS_HOLOGRAPHIC if (!mFixedSize && !mNativeWindow.isIconic()) #else @@ -481,7 +481,7 @@ gl::Error SurfaceD3D::getAttachmentRenderTarget(const gl::FramebufferAttachment: #ifdef ANGLE_ENABLE_WINDOWS_HOLOGRAPHIC // In holographic mode, the swap chain is provided by the system via a HolographicCamera. HRESULT hr = S_OK; - + // Create/upkeep the holographic swap chain if (mNativeWindow.isHolographic()) { @@ -508,7 +508,7 @@ gl::Error SurfaceD3D::getAttachmentRenderTarget(const gl::FramebufferAttachment: { if (i++ == 0) { - // For now, we make the first holographic camera the "primary" + // For now, we make the first holographic camera the "primary" // swap chain. mSwapChain = swapChain; } diff --git a/src/libANGLE/renderer/d3d/SwapChainD3D.h b/src/libANGLE/renderer/d3d/SwapChainD3D.h index 1ef6611f8a9..38f9edacda4 100644 --- a/src/libANGLE/renderer/d3d/SwapChainD3D.h +++ b/src/libANGLE/renderer/d3d/SwapChainD3D.h @@ -38,7 +38,7 @@ class SwapChainD3D : angle::NonCopyable virtual ~SwapChainD3D() {}; virtual EGLint resize(EGLint backbufferWidth, EGLint backbufferSize) = 0; - virtual EGLint reset(EGLint backbufferWidth, EGLint backbufferHeight, EGLint swapInterval) = 0; + virtual EGLint reset(int backbufferWidth, int backbufferHeight, EGLint swapInterval) = 0; virtual EGLint swapRect(EGLint x, EGLint y, EGLint width, EGLint height) = 0; virtual void recreate() = 0; diff --git a/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp b/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp index 0d01715d62a..31cad8735c8 100644 --- a/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp +++ b/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp @@ -245,7 +245,7 @@ gl::Error Clear11::clearFramebuffer(const ClearParameters &clearParams, const gl return gl::Error(GL_INVALID_OPERATION); } - if (clearParams.scissorEnabled && (clearParams.scissor.x >= framebufferSize.width || + if (clearParams.scissorEnabled && (clearParams.scissor.x >= framebufferSize.width || clearParams.scissor.y >= framebufferSize.height || clearParams.scissor.x + clearParams.scissor.width <= 0 || clearParams.scissor.y + clearParams.scissor.height <= 0)) @@ -320,7 +320,7 @@ gl::Error Clear11::clearFramebuffer(const ClearParameters &clearParams, const gl else { // ID3D11DeviceContext::ClearRenderTargetView or ID3D11DeviceContext1::ClearView is possible - + ID3D11RenderTargetView *framebufferRTV = renderTarget->getRenderTargetView(); if (!framebufferRTV) { @@ -420,7 +420,7 @@ gl::Error Clear11::clearFramebuffer(const ClearParameters &clearParams, const gl (clearParams.clearStencil ? D3D11_CLEAR_STENCIL : 0); FLOAT depthClear = gl::clamp01(clearParams.depthClearValue); UINT8 stencilClear = clearParams.stencilClearValue & 0xFF; - + #ifdef ANGLE_ENABLE_WINDOWS_HOLOGRAPHIC if (renderTarget->isHolographic()) { diff --git a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp index ef285bf4a40..9def9286910 100644 --- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp @@ -844,7 +844,7 @@ egl::Error Renderer11::initializeD3DDevice() static_cast(mAvailableFeatureLevels.size()), D3D11_SDK_VERSION, &mDevice, &(mRenderer11DeviceCaps.featureLevel), &mDeviceContext); - + // Cleanup done by destructor if (!mDevice || FAILED(result)) { @@ -2013,11 +2013,11 @@ gl::Error Renderer11::drawInstancedToCamerasIfHolographic( { return gl::Error(GL_NO_ERROR); } - + #ifdef ANGLE_ENABLE_WINDOWS_HOLOGRAPHIC if (renderTarget11->isHolographic()) { - // For Windows Holographic, we repeat the draw call for each of the holographic cameras that + // For Windows Holographic, we repeat the draw call for each of the holographic cameras that // are provided by the system. // Note that system view and projection matrices will be applied to each camera; the @@ -2028,8 +2028,8 @@ gl::Error Renderer11::drawInstancedToCamerasIfHolographic( // Acquire the holographic native window. HolographicSwapChain11* holographicSwapChain11 = renderTarget11->getHolographicSwapChain11(); auto holographicNativeWindow = holographicSwapChain11->getHolographicNativeWindow(); - - // For each active camera ID, set the viewport, view and projection matrics, and render target + + // For each active camera ID, set the viewport, view and projection matrics, and render target // and draw in stereo using an instanced draw call. for each (auto const& cameraId in holographicNativeWindow->GetCameraIds()) { @@ -2056,7 +2056,7 @@ gl::Error Renderer11::drawInstancedToCamerasIfHolographic( mDeviceContext->DrawIndexedInstanced(count, instances, 0, baseVertexLocation, 0); } } - + // Note that the viewport in mStateManager cannot be read back, so we do not // bother resetting it to what it was before we looped over the holographic // cameras. @@ -2352,7 +2352,7 @@ gl::Error Renderer11::applyShadersImpl(const gl::Data &data, GLenum drawMode) #ifdef ANGLE_ENABLE_WINDOWS_HOLOGRAPHIC // On devices that support setting the render target array index from any shader stage, we // can use a more optimal shader pipeline. - // In this pipeline, we can eliminate the geometry shader stage - which is normally required + // In this pipeline, we can eliminate the geometry shader stage - which is normally required // to set the render target array index. Avoiding the extra pipeline stage eliminates a step // in the rendering pipeline, and it may also allow the graphics driver to better optimize for // the draw call. @@ -3477,9 +3477,9 @@ gl::Error Renderer11::loadExecutable(const void *function, } catch (_com_error /*err*/) { - // The shader that uses the optional Direct3D 11.3 feature to set the render - // target array index from any shader stage will always fail to compile on - // machines that don't support the optional Direct3D 11.3 feature to set the + // The shader that uses the optional Direct3D 11.3 feature to set the render + // target array index from any shader stage will always fail to compile on + // machines that don't support the optional Direct3D 11.3 feature to set the // render target array index. // So, we do not assert here - instead, we catch a COM exception and return an // error that indicates to the calling class that it should use the geometry @@ -3489,7 +3489,7 @@ gl::Error Renderer11::loadExecutable(const void *function, } #else HRESULT result = mDevice->CreateVertexShader(function, length, NULL, &vertexShader); - ASSERT(SUCCEEDED(result)); + ASSERT(SUCCEEDED(result)); #endif if (FAILED(result)) { diff --git a/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h b/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h index 583e29c3c81..dce9a9762b9 100644 --- a/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h +++ b/src/libANGLE/renderer/d3d/d3d11/SwapChain11.h @@ -29,7 +29,7 @@ class SwapChain11 : public SwapChainD3D virtual ~SwapChain11(); EGLint resize(EGLint backbufferWidth, EGLint backbufferHeight); - virtual EGLint reset(EGLint backbufferWidth, EGLint backbufferHeight, EGLint swapInterval); + virtual EGLint reset(int backbufferWidth, int backbufferHeight, EGLint swapInterval); virtual EGLint swapRect(EGLint x, EGLint y, EGLint width, EGLint height); virtual void recreate(); diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp index 71f0e4208db..654529ea489 100644 --- a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp +++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp @@ -215,6 +215,7 @@ HRESULT GetCoreWindowSizeInPixels(const ComPtr displayProperties; if (SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(), displayProperties.GetAddressOf()))) @@ -225,7 +226,7 @@ static float GetLogicalDpi() return dpi; } } - + */ // Return 96 dpi as a default if display properties cannot be obtained. return 96.0f; } diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/DepthBufferPlaneFinder/LeastSquaresData.h b/src/libANGLE/renderer/d3d/d3d11/winrt/DepthBufferPlaneFinder/LeastSquaresData.h index a8366ccbce7..acc6e0f1dca 100644 --- a/src/libANGLE/renderer/d3d/d3d11/winrt/DepthBufferPlaneFinder/LeastSquaresData.h +++ b/src/libANGLE/renderer/d3d/d3d11/winrt/DepthBufferPlaneFinder/LeastSquaresData.h @@ -27,9 +27,10 @@ namespace HolographicDepthBasedImageStabilization double sumWeights = 0; }; } - +#if !defined(_M_ARM64) inline float __vectorcall VectorHorizontalSum(__m128 x) { __m128 temp = _mm_hadd_ps(x, x); return _mm_cvtss_f32(_mm_hadd_ps(temp, temp)); -} \ No newline at end of file +} +#endif diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/DepthBufferPlaneFinder/ReadBufferForLeastSquaresFit.h b/src/libANGLE/renderer/d3d/d3d11/winrt/DepthBufferPlaneFinder/ReadBufferForLeastSquaresFit.h index 9e1dae24ba3..5206b456502 100644 --- a/src/libANGLE/renderer/d3d/d3d11/winrt/DepthBufferPlaneFinder/ReadBufferForLeastSquaresFit.h +++ b/src/libANGLE/renderer/d3d/d3d11/winrt/DepthBufferPlaneFinder/ReadBufferForLeastSquaresFit.h @@ -36,6 +36,7 @@ namespace HolographicDepthBasedImageStabilization { unsigned int const& outHeight, unsigned short const& invalidDepthValue) { +#if !defined(_M_ARM) && !defined(_M_ARM64) using namespace DirectX; uint16_t* depthRow = reinterpret_cast(pData); @@ -124,5 +125,6 @@ namespace HolographicDepthBasedImageStabilization { depthRow = reinterpret_cast(reinterpret_cast(depthRow) + rowPitch); } +#endif } } \ No newline at end of file diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicNativeWindow.cpp index c092ada9f5c..7c16037419a 100644 --- a/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicNativeWindow.cpp +++ b/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicNativeWindow.cpp @@ -6,21 +6,21 @@ // HolographicNativeWindow.cpp: NativeWindow for managing windows based on Windows Holographic app views. // -// This implementation uses the frame of reference provided by the app to render a stereo version of -// the scene. It can provide a view matrix midway between both eye positions of the holographic camera -// for the app to use, and in this case the app is expected to use a projection matrix that is the -// identity matrix (or no projection matrix at all). Internally to ANGLE, the stereo rendering will -// double the number of instances provided to the shader - which is hidden from the shader by halving -// the value set for gl_InstanceID - and apply the left and right view matrices to each eye, after +// This implementation uses the frame of reference provided by the app to render a stereo version of +// the scene. It can provide a view matrix midway between both eye positions of the holographic camera +// for the app to use, and in this case the app is expected to use a projection matrix that is the +// identity matrix (or no projection matrix at all). Internally to ANGLE, the stereo rendering will +// double the number of instances provided to the shader - which is hidden from the shader by halving +// the value set for gl_InstanceID - and apply the left and right view matrices to each eye, after // undoing the midview matrix. // -// Alternatively, the app can use its own instanced draw calls and access the holographic view/projection -// matrix provided by ANGLE by using odd and even instance IDs for left and right views. In this case, the +// Alternatively, the app can use its own instanced draw calls and access the holographic view/projection +// matrix provided by ANGLE by using odd and even instance IDs for left and right views. In this case, the // shader program is not modified. // -// This implementation can also use automatic depth-based image stabilization. This feature determines a -// best-fit plane for the scene geometry by processing geometry data from the depth buffer, and then sets -// the focus point and plane for Windows Holographic image stabilization. To take advantage of this +// This implementation can also use automatic depth-based image stabilization. This feature determines a +// best-fit plane for the scene geometry by processing geometry data from the depth buffer, and then sets +// the focus point and plane for Windows Holographic image stabilization. To take advantage of this // feature, make sure to apply the following rules when drawing content: // * All information in the depth buffer should be for hologram geometry that is visible // to the user. @@ -468,7 +468,7 @@ HRESULT HolographicNativeWindow::getPreferredDeviceFeatureSupport() // Check for device support for the optional feature that allows setting the render target array index from the vertex shader stage. D3D11_FEATURE_DATA_D3D11_OPTIONS3 options; HRESULT hr = mPreferredD3DDevice->CheckFeatureSupport(D3D11_FEATURE_D3D11_OPTIONS3, &options, sizeof(options)); - + if (SUCCEEDED(hr)) { if (options.VPAndRTArrayIndexFromAnyShaderFeedingRasterizer) @@ -612,10 +612,10 @@ HRESULT HolographicNativeWindow::UpdateHolographicResources() return E_UNEXPECTED; } } - + ComPtr holographicFrame; HRESULT hr = mHolographicSpace->CreateNextFrame(holographicFrame.GetAddressOf()); - + if (SUCCEEDED(hr)) { mHolographicFrame = holographicFrame; diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicNativeWindow.h index a69bf61c122..a09af615505 100644 --- a/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicNativeWindow.h +++ b/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicNativeWindow.h @@ -6,21 +6,21 @@ // HolographicNativeWindow.h: NativeWindow for managing windows based on Windows Holographic app views. // -// This implementation uses the frame of reference provided by the app to render a stereo version of -// the scene. It can provide a view matrix midway between both eye positions of the holographic camera -// for the app to use, and in this case the app is expected to use a projection matrix that is the -// identity matrix (or no projection matrix at all). Internally to ANGLE, the stereo rendering will -// double the number of instances provided to the shader - which is hidden from the shader by halving -// the value set for gl_InstanceID - and apply the left and right view matrices to each eye, after +// This implementation uses the frame of reference provided by the app to render a stereo version of +// the scene. It can provide a view matrix midway between both eye positions of the holographic camera +// for the app to use, and in this case the app is expected to use a projection matrix that is the +// identity matrix (or no projection matrix at all). Internally to ANGLE, the stereo rendering will +// double the number of instances provided to the shader - which is hidden from the shader by halving +// the value set for gl_InstanceID - and apply the left and right view matrices to each eye, after // undoing the midview matrix. // -// Alternatively, the app can use its own instanced draw calls and access the holographic view/projection -// matrix provided by ANGLE by using odd and even instance IDs for left and right views. In this case, the +// Alternatively, the app can use its own instanced draw calls and access the holographic view/projection +// matrix provided by ANGLE by using odd and even instance IDs for left and right views. In this case, the // shader program is not modified. // -// This implementation can also use automatic depth-based image stabilization. This feature determines a -// best-fit plane for the scene geometry by processing geometry data from the depth buffer, and then sets -// the focus point and plane for Windows Holographic image stabilization. To take advantage of this +// This implementation can also use automatic depth-based image stabilization. This feature determines a +// best-fit plane for the scene geometry by processing geometry data from the depth buffer, and then sets +// the focus point and plane for Windows Holographic image stabilization. To take advantage of this // feature, make sure to apply the following rules when drawing content: // * All information in the depth buffer should be for hologram geometry that is visible // to the user. @@ -82,7 +82,7 @@ class HolographicNativeWindow : public InspectableNativeWindow, public std::enab DXGISwapChain **swapChain) override; static bool IsInitialized() { return mInitialized; } - + void setRenderer11(Renderer11* renderer) { mRenderer = renderer; }; HRESULT setD3DDevice(ID3D11Device *device); @@ -104,9 +104,9 @@ class HolographicNativeWindow : public InspectableNativeWindow, public std::enab HRESULT GetHolographicCameraPose(UINT32 id, ABI::Windows::Graphics::Holographic::IHolographicCameraPose** outPose); ABI::Windows::Graphics::Holographic::IHolographicFrame* GetHolographicFrame() { return mHolographicFrame.Get(); }; ABI::Windows::Perception::Spatial::ISpatialCoordinateSystem* GetCoordinateSystem() { return mCoordinateSystem.Get(); }; - + bool HasHolographicCameraListChanged() - { + { bool holographicCameraListChangedReturnValue = false; UseHolographicCameraResources( [&, this](std::map>& cameraResourceMap) @@ -143,7 +143,7 @@ class HolographicNativeWindow : public InspectableNativeWindow, public std::enab ComPtr> mHolographicCameraPoses; ComPtr mHolographicFrame; ComPtr mHolographicSpace; - + ComPtr mCoordinateSystem; @@ -190,7 +190,7 @@ class CameraAddedEventHandler : } // IHolographicSpaceCameraAddedEventArgs - IFACEMETHOD(Invoke)(ABI::Windows::Graphics::Holographic::IHolographicSpace *sender, + IFACEMETHOD(Invoke)(ABI::Windows::Graphics::Holographic::IHolographicSpace *sender, ABI::Windows::Graphics::Holographic::IHolographicSpaceCameraAddedEventArgs *cameraAddedEventArgs) { std::shared_ptr host = mHost.lock(); diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicSwapChain11.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicSwapChain11.cpp index 3270d42f6a1..3443ef7d694 100644 --- a/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicSwapChain11.cpp +++ b/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicSwapChain11.cpp @@ -126,7 +126,7 @@ void HolographicSwapChain11::release() // Release references to the back buffer mBackBufferRTView.Reset(); mBackBufferSRView.Reset(); - + // Force the back buffer to be released entirely mBackBufferTexture.Reset(); @@ -281,7 +281,7 @@ EGLint HolographicSwapChain11::resetOffscreenDepthBuffer(int backbufferWidth, in DXGI_FORMAT_R16_UNORM, 0, numPixels); - + if (SUCCEEDED(result)) { result = device->CreateUnorderedAccessView( @@ -300,23 +300,23 @@ EGLint HolographicSwapChain11::resetOffscreenDepthBuffer(int backbufferWidth, in 0, 0, structureByteStride); - + if (SUCCEEDED(result)) { result = device->CreateBuffer(&depthResolvedDesc, nullptr, &mResolvedDepthBuffer); } - + CD3D11_UNORDERED_ACCESS_VIEW_DESC depthResolvedUAVDesc( D3D11_UAV_DIMENSION_BUFFER, DXGI_FORMAT_R16_UNORM, 0, numPixels); - + if (SUCCEEDED(result)) { result = device->CreateUnorderedAccessView( - mResolvedDepthBuffer, - &depthResolvedUAVDesc, + mResolvedDepthBuffer, + &depthResolvedUAVDesc, &mResolvedDepthView); } @@ -327,12 +327,12 @@ EGLint HolographicSwapChain11::resetOffscreenDepthBuffer(int backbufferWidth, in D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE, 0, structureByteStride); - + if (SUCCEEDED(result)) { result = device->CreateBuffer( - &depthResolvedCPUDesc, - nullptr, + &depthResolvedCPUDesc, + nullptr, &mCPUResolvedDepthTexture); } } @@ -373,7 +373,7 @@ void HolographicSwapChain11::ComputeMidViewMatrix( XMVECTOR rightScale, rightRotationQuat, rightTranslation; success = success && XMMatrixDecompose(&rightScale, &rightRotationQuat, &rightTranslation, right); - + // Only proceed if the decomposition was successful. if (success) { @@ -387,9 +387,9 @@ void HolographicSwapChain11::ComputeMidViewMatrix( const XMVECTOR resultRotationQuat = XMQuaternionSlerp(leftRotationQuat, rightRotationQuat, 0.5f); // Compose the result transform. - auto midViewMatrix = - XMMatrixScalingFromVector(resultScale) * - XMMatrixRotationQuaternion(resultRotationQuat) * + auto midViewMatrix = + XMMatrixScalingFromVector(resultScale) * + XMMatrixRotationQuaternion(resultRotationQuat) * XMMatrixTranslationFromVector(resultTranslation); // Store the result transform. @@ -524,7 +524,7 @@ EGLint HolographicSwapChain11::updateHolographicRenderingParameters( } // A new depth stencil view is also needed. - return resetOffscreenBuffers( + result = /*return*/ resetOffscreenBuffers( static_cast(mRenderTargetSize.Width), static_cast(mRenderTargetSize.Height)); } @@ -533,7 +533,7 @@ EGLint HolographicSwapChain11::updateHolographicRenderingParameters( // Update holographic view/projection matrices. if (SUCCEEDED(result)) { - ComPtr spCoordinateSystem = + ComPtr spCoordinateSystem = mHolographicNativeWindow->GetCoordinateSystem(); if (spCoordinateSystem != nullptr) @@ -567,7 +567,7 @@ EGLint HolographicSwapChain11::updateHolographicRenderingParameters( DirectX::XMFLOAT4X4 viewProj[2]; DirectX::XMStoreFloat4x4( &viewProj[0], - DirectX::XMLoadFloat4x4(reinterpret_cast(&viewTransform.Left)) * + DirectX::XMLoadFloat4x4(reinterpret_cast(&viewTransform.Left)) * DirectX::XMLoadFloat4x4(reinterpret_cast(&projectionTransform.Left)) ); DirectX::XMStoreFloat4x4( @@ -579,14 +579,14 @@ EGLint HolographicSwapChain11::updateHolographicRenderingParameters( // get view matrix const auto leftViewMatrix = DirectX::XMLoadFloat4x4(reinterpret_cast(&viewTransform.Left)); const auto rightViewMatrix = DirectX::XMLoadFloat4x4(reinterpret_cast(&viewTransform.Right)); - + // interpolate view matrix if (mHolographicCameraId == 0) { ComputeMidViewMatrix(leftViewMatrix, rightViewMatrix); } - - // TODO: The display was being mirrored, so for now we hack these values to + + // TODO: The display was being mirrored, so for now we hack these values to // negative as far as the app is concerned. viewTransform.Left.M11 = -viewTransform.Left.M11; viewTransform.Left.M12 = -viewTransform.Left.M12; @@ -608,7 +608,7 @@ EGLint HolographicSwapChain11::updateHolographicRenderingParameters( &view[1], DirectX::XMLoadFloat4x4(reinterpret_cast(&viewTransform.Right)) ); - + // invert view matrix XMVECTOR determinant; auto leftViewInverse = XMMatrixInverse(&determinant, leftViewMatrix); @@ -784,7 +784,7 @@ EGLint HolographicSwapChain11::reset(int backbufferWidth, int backbufferHeight, ); } } - + HRESULT hr = S_OK; ComPtr spParameters; @@ -797,7 +797,7 @@ EGLint HolographicSwapChain11::reset(int backbufferWidth, int backbufferHeight, if (SUCCEEDED(hr)) { EGLint result = updateHolographicRenderingParameters(spParameters); - + if (result != EGL_SUCCESS) { return result; @@ -837,7 +837,7 @@ EGLint HolographicSwapChain11::swapRect(IHolographicFrame* pHolographicFrame) // This function uses the depth buffer for the first holographic camera to determine a best- // fit plane for the scene geometry. It uses that plane, and a projected position, to set up -// the focus point and plane for Windows Holographic image stabilization. To take advantage +// the focus point and plane for Windows Holographic image stabilization. To take advantage // of this feature, make sure to apply the following rules when drawing content: // * All information in the depth buffer should be for hologram geometry that is visible // to the user. @@ -861,15 +861,15 @@ void HolographicSwapChain11::SetStabilizationPlane(IHolographicFrame* pFrame) float distanceToPointInMeters = 2.0f - mNearPlaneDistance; assert(mDepthBufferPlaneFinder != nullptr); const bool estimationSuccess = mDepthBufferPlaneFinder->TryFindPlaneNormalAndDistance( - this, - planeNormalInCameraSpace, + this, + planeNormalInCameraSpace, distanceToPointInMeters); //#define ENABLE_DEBUG_OUTPUT #ifdef ENABLE_DEBUG_OUTPUT OutputDebugStringA(( - "Distance from near plane to point: " + - std::to_string(distanceToPointInMeters) + + "Distance from near plane to point: " + + std::to_string(distanceToPointInMeters) + "\n").c_str()); #endif @@ -897,7 +897,7 @@ void HolographicSwapChain11::SetStabilizationPlane(IHolographicFrame* pFrame) planeNormalInWorldSpace4.z }; - ComPtr spCoordinateSystem = + ComPtr spCoordinateSystem = mHolographicNativeWindow->GetCoordinateSystem(); // Set the focus point for the current camera. @@ -936,7 +936,7 @@ EGLint HolographicSwapChain11::present(IHolographicFrame* pFrame) HolographicFramePresentWaitBehavior_WaitForFrameToFinish : HolographicFramePresentWaitBehavior_DoNotWaitForFrameToFinish, &presentResult); - + if (SUCCEEDED(result)) { // Some swapping mechanisms such as DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL unbind the current render diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicSwapChain11.h b/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicSwapChain11.h index 164accf2a01..a925ddb6aad 100644 --- a/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicSwapChain11.h +++ b/src/libANGLE/renderer/d3d/d3d11/winrt/HolographicSwapChain11.h @@ -49,7 +49,7 @@ class HolographicSwapChain11 : public SwapChainD3D EGLint resize(EGLint backbufferWidth, EGLint backbufferHeight); EGLint updateHolographicRenderingParameters(ComPtr& cameraRenderingParameters); - virtual EGLint reset(EGLint backbufferWidth, EGLint backbufferHeight, EGLint swapInterval); + virtual EGLint reset(int backbufferWidth, int backbufferHeight, EGLint swapInterval); virtual EGLint swapRect(EGLint x, EGLint y, EGLint width, EGLint height); EGLint swapRect(ABI::Windows::Graphics::Holographic::IHolographicFrame* pHolographicFrame); virtual void recreate(); diff --git a/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h b/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h index 55a700c2d64..f18050303ac 100644 --- a/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h +++ b/src/libANGLE/renderer/d3d/d3d9/SwapChain9.h @@ -29,7 +29,7 @@ class SwapChain9 : public SwapChainD3D virtual ~SwapChain9(); EGLint resize(EGLint backbufferWidth, EGLint backbufferHeight); - virtual EGLint reset(EGLint backbufferWidth, EGLint backbufferHeight, EGLint swapInterval); + virtual EGLint reset(int backbufferWidth, int backbufferHeight, EGLint swapInterval); virtual EGLint swapRect(EGLint x, EGLint y, EGLint width, EGLint height); virtual void recreate(); diff --git a/winrt/10/src/angle.sln b/winrt/10/src/angle.sln index 13b7b53f81d..a063126c5f5 100644 --- a/winrt/10/src/angle.sln +++ b/winrt/10/src/angle.sln @@ -1,5 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2015 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29911.84 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "angle_common", "angle_common.vcxproj", "{7E3E300C-E43E-45E3-7AFE-6C728B705A32}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "commit_id.vcxproj", "{CC680B1E-4E12-511E-0BB1-98AC96D57E45}" @@ -50,148 +52,197 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_static", "transl EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Debug|ARM = Debug|ARM Release|ARM = Release|ARM - Release|x64 = Release|x64 + Release|ARM64 = Release|ARM64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|Win32.ActiveCfg = Debug|Win32 - {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|Win32.Build.0 = Debug|Win32 - {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|x64.ActiveCfg = Debug|x64 - {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|x64.Build.0 = Debug|x64 - {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|ARM.ActiveCfg = Debug|ARM - {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|ARM.Build.0 = Debug|ARM - {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|ARM.ActiveCfg = Release|ARM - {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|ARM.Build.0 = Release|ARM - {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|x64.ActiveCfg = Release|x64 - {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|x64.Build.0 = Release|x64 - {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|Win32.ActiveCfg = Release|Win32 - {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|Win32.Build.0 = Release|Win32 - {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|Win32.ActiveCfg = Debug|Win32 - {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|Win32.Build.0 = Debug|Win32 - {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|x64.ActiveCfg = Debug|x64 - {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|x64.Build.0 = Debug|x64 - {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|ARM.ActiveCfg = Debug|ARM - {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|ARM.Build.0 = Debug|ARM - {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|ARM.ActiveCfg = Release|ARM - {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|ARM.Build.0 = Release|ARM - {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|x64.ActiveCfg = Release|x64 - {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|x64.Build.0 = Release|x64 - {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|Win32.ActiveCfg = Release|Win32 - {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|Win32.Build.0 = Release|Win32 - {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|Win32.ActiveCfg = Debug|Win32 - {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|Win32.Build.0 = Debug|Win32 - {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|x64.ActiveCfg = Debug|x64 - {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|x64.Build.0 = Debug|x64 - {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|ARM.ActiveCfg = Debug|ARM - {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|ARM.Build.0 = Debug|ARM - {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|ARM.ActiveCfg = Release|ARM - {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|ARM.Build.0 = Release|ARM - {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|x64.ActiveCfg = Release|x64 - {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|x64.Build.0 = Release|x64 - {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|Win32.ActiveCfg = Release|Win32 - {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|Win32.Build.0 = Release|Win32 + {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Debug|ARM.ActiveCfg = Debug|ARM + {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Debug|ARM.Build.0 = Debug|ARM + {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Debug|ARM64.Build.0 = Debug|ARM64 {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Debug|Win32.ActiveCfg = Debug|Win32 {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Debug|Win32.Build.0 = Debug|Win32 {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Debug|x64.ActiveCfg = Debug|x64 {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Debug|x64.Build.0 = Debug|x64 - {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Debug|ARM.ActiveCfg = Debug|ARM - {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Debug|ARM.Build.0 = Debug|ARM {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Release|ARM.ActiveCfg = Release|ARM {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Release|ARM.Build.0 = Release|ARM - {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Release|x64.ActiveCfg = Release|x64 - {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Release|x64.Build.0 = Release|x64 + {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Release|ARM64.ActiveCfg = Release|ARM64 + {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Release|ARM64.Build.0 = Release|ARM64 {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Release|Win32.ActiveCfg = Release|Win32 {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Release|Win32.Build.0 = Release|Win32 + {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Release|x64.ActiveCfg = Release|x64 + {7E3E300C-E43E-45E3-7AFE-6C728B705A32}.Release|x64.Build.0 = Release|x64 + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|ARM.ActiveCfg = Debug|ARM + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|ARM.Build.0 = Debug|ARM + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|ARM64.Build.0 = Debug|ARM64 + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|Win32.ActiveCfg = Debug|Win32 + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|Win32.Build.0 = Debug|Win32 + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|x64.ActiveCfg = Debug|x64 + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|x64.Build.0 = Debug|x64 + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|ARM.ActiveCfg = Release|ARM + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|ARM.Build.0 = Release|ARM + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|ARM64.ActiveCfg = Release|ARM64 + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|ARM64.Build.0 = Release|ARM64 + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|Win32.ActiveCfg = Release|Win32 + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|Win32.Build.0 = Release|Win32 + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|x64.ActiveCfg = Release|x64 + {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|x64.Build.0 = Release|x64 + {827D9088-EBF8-F3E0-55C8-7221677654F2}.Debug|ARM.ActiveCfg = Debug|ARM + {827D9088-EBF8-F3E0-55C8-7221677654F2}.Debug|ARM.Build.0 = Debug|ARM + {827D9088-EBF8-F3E0-55C8-7221677654F2}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {827D9088-EBF8-F3E0-55C8-7221677654F2}.Debug|ARM64.Build.0 = Debug|ARM64 {827D9088-EBF8-F3E0-55C8-7221677654F2}.Debug|Win32.ActiveCfg = Debug|Win32 {827D9088-EBF8-F3E0-55C8-7221677654F2}.Debug|Win32.Build.0 = Debug|Win32 {827D9088-EBF8-F3E0-55C8-7221677654F2}.Debug|x64.ActiveCfg = Debug|x64 {827D9088-EBF8-F3E0-55C8-7221677654F2}.Debug|x64.Build.0 = Debug|x64 - {827D9088-EBF8-F3E0-55C8-7221677654F2}.Debug|ARM.ActiveCfg = Debug|ARM - {827D9088-EBF8-F3E0-55C8-7221677654F2}.Debug|ARM.Build.0 = Debug|ARM {827D9088-EBF8-F3E0-55C8-7221677654F2}.Release|ARM.ActiveCfg = Release|ARM {827D9088-EBF8-F3E0-55C8-7221677654F2}.Release|ARM.Build.0 = Release|ARM - {827D9088-EBF8-F3E0-55C8-7221677654F2}.Release|x64.ActiveCfg = Release|x64 - {827D9088-EBF8-F3E0-55C8-7221677654F2}.Release|x64.Build.0 = Release|x64 + {827D9088-EBF8-F3E0-55C8-7221677654F2}.Release|ARM64.ActiveCfg = Release|ARM64 + {827D9088-EBF8-F3E0-55C8-7221677654F2}.Release|ARM64.Build.0 = Release|ARM64 {827D9088-EBF8-F3E0-55C8-7221677654F2}.Release|Win32.ActiveCfg = Release|Win32 {827D9088-EBF8-F3E0-55C8-7221677654F2}.Release|Win32.Build.0 = Release|Win32 + {827D9088-EBF8-F3E0-55C8-7221677654F2}.Release|x64.ActiveCfg = Release|x64 + {827D9088-EBF8-F3E0-55C8-7221677654F2}.Release|x64.Build.0 = Release|x64 + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|ARM.ActiveCfg = Debug|ARM + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|ARM.Build.0 = Debug|ARM + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|ARM64.Build.0 = Debug|ARM64 + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|Win32.ActiveCfg = Debug|Win32 + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|Win32.Build.0 = Debug|Win32 + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|x64.ActiveCfg = Debug|x64 + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|x64.Build.0 = Debug|x64 + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|ARM.ActiveCfg = Release|ARM + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|ARM.Build.0 = Release|ARM + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|ARM64.ActiveCfg = Release|ARM64 + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|ARM64.Build.0 = Release|ARM64 + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|Win32.ActiveCfg = Release|Win32 + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|Win32.Build.0 = Release|Win32 + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|x64.ActiveCfg = Release|x64 + {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|x64.Build.0 = Release|x64 + {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Debug|ARM.ActiveCfg = Debug|ARM + {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Debug|ARM.Build.0 = Debug|ARM + {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Debug|ARM64.Build.0 = Debug|ARM64 {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Debug|Win32.ActiveCfg = Debug|Win32 {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Debug|Win32.Build.0 = Debug|Win32 {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Debug|x64.ActiveCfg = Debug|x64 {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Debug|x64.Build.0 = Debug|x64 - {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Debug|ARM.ActiveCfg = Debug|ARM - {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Debug|ARM.Build.0 = Debug|ARM {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Release|ARM.ActiveCfg = Release|ARM {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Release|ARM.Build.0 = Release|ARM - {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Release|x64.ActiveCfg = Release|x64 - {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Release|x64.Build.0 = Release|x64 + {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Release|ARM64.ActiveCfg = Release|ARM64 + {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Release|ARM64.Build.0 = Release|ARM64 {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Release|Win32.ActiveCfg = Release|Win32 {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Release|Win32.Build.0 = Release|Win32 - {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|Win32.ActiveCfg = Debug|Win32 - {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|Win32.Build.0 = Debug|Win32 - {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|x64.ActiveCfg = Debug|x64 - {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|x64.Build.0 = Debug|x64 - {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|ARM.ActiveCfg = Debug|ARM - {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Debug|ARM.Build.0 = Debug|ARM - {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|ARM.ActiveCfg = Release|ARM - {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|ARM.Build.0 = Release|ARM - {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|x64.ActiveCfg = Release|x64 - {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|x64.Build.0 = Release|x64 - {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|Win32.ActiveCfg = Release|Win32 - {CC680B1E-4E12-511E-0BB1-98AC96D57E45}.Release|Win32.Build.0 = Release|Win32 + {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Release|x64.ActiveCfg = Release|x64 + {ABEF057D-44A3-6E92-15DC-03A220AF6AFC}.Release|x64.Build.0 = Release|x64 + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|ARM.ActiveCfg = Debug|ARM + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|ARM.Build.0 = Debug|ARM + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|ARM64.Build.0 = Debug|ARM64 + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|Win32.ActiveCfg = Debug|Win32 + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|Win32.Build.0 = Debug|Win32 + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|x64.ActiveCfg = Debug|x64 + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Debug|x64.Build.0 = Debug|x64 + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|ARM.ActiveCfg = Release|ARM + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|ARM.Build.0 = Release|ARM + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|ARM64.ActiveCfg = Release|ARM64 + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|ARM64.Build.0 = Release|ARM64 + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|Win32.ActiveCfg = Release|Win32 + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|Win32.Build.0 = Release|Win32 + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|x64.ActiveCfg = Release|x64 + {229C8CCC-D35C-ECDB-2B0C-27EE2CAC295B}.Release|x64.Build.0 = Release|x64 + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|ARM.ActiveCfg = Debug|ARM + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|ARM.Build.0 = Debug|ARM + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|ARM64.Build.0 = Debug|ARM64 + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|Win32.ActiveCfg = Debug|Win32 + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|Win32.Build.0 = Debug|Win32 + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|x64.ActiveCfg = Debug|x64 + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Debug|x64.Build.0 = Debug|x64 + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|ARM.ActiveCfg = Release|ARM + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|ARM.Build.0 = Release|ARM + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|ARM64.ActiveCfg = Release|ARM64 + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|ARM64.Build.0 = Release|ARM64 + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|Win32.ActiveCfg = Release|Win32 + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|Win32.Build.0 = Release|Win32 + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|x64.ActiveCfg = Release|x64 + {5CF061C0-EA5A-323E-2FFB-145A0C3D60A5}.Release|x64.Build.0 = Release|x64 + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|ARM.ActiveCfg = Debug|ARM + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|ARM.Build.0 = Debug|ARM + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|ARM64.Build.0 = Debug|ARM64 + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|Win32.ActiveCfg = Debug|Win32 + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|Win32.Build.0 = Debug|Win32 + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|x64.ActiveCfg = Debug|x64 + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|x64.Build.0 = Debug|x64 + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|ARM.ActiveCfg = Release|ARM + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|ARM.Build.0 = Release|ARM + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|ARM64.ActiveCfg = Release|ARM64 + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|ARM64.Build.0 = Release|ARM64 + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|Win32.ActiveCfg = Release|Win32 + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|Win32.Build.0 = Release|Win32 + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|x64.ActiveCfg = Release|x64 + {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|x64.Build.0 = Release|x64 + {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Debug|ARM.ActiveCfg = Debug|ARM + {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Debug|ARM.Build.0 = Debug|ARM + {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Debug|ARM64.Build.0 = Debug|ARM64 {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Debug|Win32.ActiveCfg = Debug|Win32 {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Debug|Win32.Build.0 = Debug|Win32 {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Debug|x64.ActiveCfg = Debug|x64 {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Debug|x64.Build.0 = Debug|x64 - {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Debug|ARM.ActiveCfg = Debug|ARM - {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Debug|ARM.Build.0 = Debug|ARM {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Release|ARM.ActiveCfg = Release|ARM {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Release|ARM.Build.0 = Release|ARM - {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Release|x64.ActiveCfg = Release|x64 - {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Release|x64.Build.0 = Release|x64 + {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Release|ARM64.ActiveCfg = Release|ARM64 + {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Release|ARM64.Build.0 = Release|ARM64 {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Release|Win32.ActiveCfg = Release|Win32 {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Release|Win32.Build.0 = Release|Win32 + {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Release|x64.ActiveCfg = Release|x64 + {CCB5F260-9E5D-B51E-07AC-61B3052C6A9F}.Release|x64.Build.0 = Release|x64 + {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Debug|ARM.ActiveCfg = Debug|ARM + {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Debug|ARM.Build.0 = Debug|ARM + {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Debug|ARM64.Build.0 = Debug|ARM64 {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Debug|Win32.ActiveCfg = Debug|Win32 {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Debug|Win32.Build.0 = Debug|Win32 {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Debug|x64.ActiveCfg = Debug|x64 {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Debug|x64.Build.0 = Debug|x64 - {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Debug|ARM.ActiveCfg = Debug|ARM - {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Debug|ARM.Build.0 = Debug|ARM {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Release|ARM.ActiveCfg = Release|ARM {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Release|ARM.Build.0 = Release|ARM - {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Release|x64.ActiveCfg = Release|x64 - {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Release|x64.Build.0 = Release|x64 + {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Release|ARM64.ActiveCfg = Release|ARM64 + {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Release|ARM64.Build.0 = Release|ARM64 {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Release|Win32.ActiveCfg = Release|Win32 {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Release|Win32.Build.0 = Release|Win32 - {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|Win32.ActiveCfg = Debug|Win32 - {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|Win32.Build.0 = Debug|Win32 - {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|x64.ActiveCfg = Debug|x64 - {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|x64.Build.0 = Debug|x64 - {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|ARM.ActiveCfg = Debug|ARM - {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Debug|ARM.Build.0 = Debug|ARM - {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|ARM.ActiveCfg = Release|ARM - {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|ARM.Build.0 = Release|ARM - {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|x64.ActiveCfg = Release|x64 - {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|x64.Build.0 = Release|x64 - {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|Win32.ActiveCfg = Release|Win32 - {DBFED762-09FA-6D74-851D-9BB6E20584F6}.Release|Win32.Build.0 = Release|Win32 - {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|Win32.ActiveCfg = Debug|Win32 - {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|Win32.Build.0 = Debug|Win32 - {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|x64.ActiveCfg = Debug|x64 - {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|x64.Build.0 = Debug|x64 - {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|ARM.ActiveCfg = Debug|ARM - {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Debug|ARM.Build.0 = Debug|ARM - {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|ARM.ActiveCfg = Release|ARM - {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|ARM.Build.0 = Release|ARM - {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|x64.ActiveCfg = Release|x64 - {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|x64.Build.0 = Release|x64 - {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|Win32.ActiveCfg = Release|Win32 - {DC6C63FF-C15C-68A1-5864-FB597D75B2B3}.Release|Win32.Build.0 = Release|Win32 + {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Release|x64.ActiveCfg = Release|x64 + {D42E649A-16F0-F02E-C9E0-4700295D3C78}.Release|x64.Build.0 = Release|x64 + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|ARM.ActiveCfg = Debug|ARM + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|ARM.Build.0 = Debug|ARM + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|ARM64.Build.0 = Debug|ARM64 + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|Win32.ActiveCfg = Debug|Win32 + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|Win32.Build.0 = Debug|Win32 + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|x64.ActiveCfg = Debug|x64 + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Debug|x64.Build.0 = Debug|x64 + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|ARM.ActiveCfg = Release|ARM + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|ARM.Build.0 = Release|ARM + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|ARM64.ActiveCfg = Release|ARM64 + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|ARM64.Build.0 = Release|ARM64 + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|Win32.ActiveCfg = Release|Win32 + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|Win32.Build.0 = Release|Win32 + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|x64.ActiveCfg = Release|x64 + {195002A7-E979-7387-6C9C-CFFF03DB1775}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {01D533A5-D147-406E-9E2D-63182FB21710} + EndGlobalSection EndGlobal diff --git a/winrt/10/src/angle_common.vcxproj b/winrt/10/src/angle_common.vcxproj index 5c3817cbd2b..fc61ac0c78c 100644 --- a/winrt/10/src/angle_common.vcxproj +++ b/winrt/10/src/angle_common.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,8 +43,8 @@ en-US true 10.0 - 10.0.10586.0 - 10.0.10586.0 + 10.0 + 10.0.18362.0 Windows Store @@ -44,7 +52,7 @@ StaticLibrary - v140 + v142 @@ -59,9 +67,11 @@ $(OutDir)obj\$(ProjectName)\ false false + false false true true + true true $(ProjectName) $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -85,6 +95,7 @@ true true TurnOffAllWarnings + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -128,6 +139,7 @@ true true TurnOffAllWarnings + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -152,6 +164,49 @@ ANGLE_STANDALONE_BUILD;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + + + ..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + EnableFastChecks + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + true + false + Disabled + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + TurnOffAllWarnings + Guard + + + $(OutDir)lib\$(ProjectName)$(TargetExt) + MachineARM64 + + + %(AdditionalDependencies);uuid.lib;dxgi.lib + /guard:cf %(AdditionalOptions) + false + false + true + $(OutDir)lib\$(TargetName).lib + $(OutDir)$(TargetName).map + false + Console + true + + + ..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) + 0x0409 + ANGLE_STANDALONE_BUILD;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + + ..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) @@ -171,6 +226,7 @@ true true TurnOffAllWarnings + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -281,6 +337,48 @@ ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + + + ..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + Size + true + false + MinSpace + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + TurnOffAllWarnings + true + + + $(OutDir)lib\$(ProjectName)$(TargetExt) + MachineARM64 + + + %(AdditionalDependencies);uuid.lib + /guard:cf /cgthreads:8 %(AdditionalOptions) + false + true + $(OutDir)lib\$(TargetName).lib + UseLinkTimeCodeGeneration + $(OutDir)$(TargetName).map + Console + true + + + ..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) + 0x0409 + ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + + ..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) diff --git a/winrt/10/src/commit_id.vcxproj b/winrt/10/src/commit_id.vcxproj index 643a25cdd0f..40a4db0f496 100644 --- a/winrt/10/src/commit_id.vcxproj +++ b/winrt/10/src/commit_id.vcxproj @@ -1,6 +1,10 @@ + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,33 +43,35 @@ en-US true 10.0 - 10.0.10240.0 - 10.0.10240.0 + 10.0 + 10.0.18362.0 Windows Store - + DynamicLibrary - v140 + v142 - - - + + + - + - + $(ExecutablePath);$(MSBuildProjectDirectory)\..\..\..\third_party\cygwin\bin\;$(MSBuildProjectDirectory)\..\..\..\third_party\python_26\ $(SolutionDir)$(Configuration)_$(Platform)\ $(OutDir)obj\$(ProjectName)\ false false + false false true true + true true $(ProjectName) $(OutDir)\$(ProjectName)$(TargetExt) @@ -148,6 +158,46 @@ ANGLE_STANDALONE_BUILD;_DEBUG;%(PreprocessorDefinitions) + + + /MP /d2guard4 %(AdditionalOptions) + EnableFastChecks + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + true + false + Disabled + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + Level4 + + + MachineARM + + + %(AdditionalDependencies);uuid.lib;dxgi.lib + /guard:cf %(AdditionalOptions) + false + false + true + $(OutDir)lib\$(TargetName).lib + $(OutDir)$(TargetName).map + false + $(OutDir)$(ProjectName)$(TargetExt) + Console + true + + + 0x0409 + ANGLE_STANDALONE_BUILD;_DEBUG;%(PreprocessorDefinitions) + + /MP /d2guard4 %(AdditionalOptions) @@ -271,6 +321,46 @@ ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + + + /MP /d2guard4 %(AdditionalOptions) + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + Size + true + false + MinSpace + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + Level4 + true + + + MachineARM + + + %(AdditionalDependencies);uuid.lib + /guard:cf /cgthreads:8 %(AdditionalOptions) + false + true + $(OutDir)lib\$(TargetName).lib + UseLinkTimeCodeGeneration + $(OutDir)$(TargetName).map + $(OutDir)$(ProjectName)$(TargetExt) + Console + true + + + 0x0409 + ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + + /MP /d2guard4 %(AdditionalOptions) @@ -313,7 +403,7 @@ - + true @@ -321,7 +411,8 @@ Document - call call "$(OutDir)obj\global_intermediate\angle\commit_id.bat" "..\..\..\src\gen" "..\..\.." "$(OutDir)obj\global_intermediate\angle\id\commit.h" if %errorlevel% neq 0 exit /b %errorlevel% + call call "$(OutDir)obj\global_intermediate\angle\commit_id.bat" "..\..\..\src\gen" "..\..\.." "$(OutDir)obj\global_intermediate\angle\id\commit.h" +if %errorlevel% neq 0 exit /b %errorlevel% Generating ANGLE Commit ID $(OutDir)obj\global_intermediate\angle\id\commit.h ..\..\..\.git\index @@ -333,7 +424,7 @@ false - - - - + + + + \ No newline at end of file diff --git a/winrt/10/src/commit_id.vcxproj.filters b/winrt/10/src/commit_id.vcxproj.filters index 74499390aab..ed73fc92f16 100644 --- a/winrt/10/src/commit_id.vcxproj.filters +++ b/winrt/10/src/commit_id.vcxproj.filters @@ -45,11 +45,11 @@ ..\..\..\src - - $(OutDir)obj\global_intermediate\angle\_excluded_files - ..\..\..\.git\_excluded_files - + + + + \ No newline at end of file diff --git a/winrt/10/src/copy_compiler_dll.vcxproj b/winrt/10/src/copy_compiler_dll.vcxproj index 17d8b6eed78..52d87664037 100644 --- a/winrt/10/src/copy_compiler_dll.vcxproj +++ b/winrt/10/src/copy_compiler_dll.vcxproj @@ -1,6 +1,10 @@ + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,33 +43,35 @@ en-US true 10.0 - 10.0.10240.0 - 10.0.10240.0 + 10.0 + 10.0.18362.0 Windows Store - + DynamicLibrary - v140 + v142 - - - + + + - + - + $(ExecutablePath);$(MSBuildProjectDirectory)\..\..\..\third_party\cygwin\bin\;$(MSBuildProjectDirectory)\..\..\..\third_party\python_26\ $(SolutionDir)$(Configuration)_$(Platform)\ $(OutDir)obj\$(ProjectName)\ false false + false false true true + true true $(ProjectName) $(OutDir)\$(ProjectName)$(TargetExt) @@ -148,6 +158,46 @@ ANGLE_STANDALONE_BUILD;_DEBUG;%(PreprocessorDefinitions) + + + /MP /d2guard4 %(AdditionalOptions) + EnableFastChecks + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + true + false + Disabled + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + Level4 + + + MachineARM + + + %(AdditionalDependencies);uuid.lib;dxgi.lib + /guard:cf %(AdditionalOptions) + false + false + true + $(OutDir)lib\$(TargetName).lib + $(OutDir)$(TargetName).map + false + $(OutDir)$(ProjectName)$(TargetExt) + Console + true + + + 0x0409 + ANGLE_STANDALONE_BUILD;_DEBUG;%(PreprocessorDefinitions) + + /MP /d2guard4 %(AdditionalOptions) @@ -271,6 +321,46 @@ ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + + + /MP /d2guard4 %(AdditionalOptions) + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + Size + true + false + MinSpace + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + Level4 + true + + + MachineARM + + + %(AdditionalDependencies);uuid.lib + /guard:cf /cgthreads:8 %(AdditionalOptions) + false + true + $(OutDir)lib\$(TargetName).lib + UseLinkTimeCodeGeneration + $(OutDir)$(TargetName).map + $(OutDir)$(ProjectName)$(TargetExt) + Console + true + + + 0x0409 + ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + + /MP /d2guard4 %(AdditionalOptions) @@ -313,7 +403,7 @@ - + @@ -321,7 +411,7 @@ false - - - - + + + + \ No newline at end of file diff --git a/winrt/10/src/copy_scripts.vcxproj b/winrt/10/src/copy_scripts.vcxproj index 41bccc3b3a3..a98c7bd6967 100644 --- a/winrt/10/src/copy_scripts.vcxproj +++ b/winrt/10/src/copy_scripts.vcxproj @@ -1,6 +1,10 @@ + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,33 +43,35 @@ en-US true 10.0 - 10.0.10240.0 - 10.0.10240.0 + 10.0 + 10.0.18362.0 Windows Store - + DynamicLibrary - v140 + v142 - - - + + + - + - + $(ExecutablePath);$(MSBuildProjectDirectory)\..\..\..\third_party\cygwin\bin\;$(MSBuildProjectDirectory)\..\..\..\third_party\python_26\ $(SolutionDir)$(Configuration)_$(Platform)\ $(OutDir)obj\$(ProjectName)\ false false + false false true true + true true $(ProjectName) $(OutDir)\$(ProjectName)$(TargetExt) @@ -148,6 +158,46 @@ ANGLE_STANDALONE_BUILD;_DEBUG;%(PreprocessorDefinitions) + + + /MP /d2guard4 %(AdditionalOptions) + EnableFastChecks + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + true + false + Disabled + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + Level4 + + + MachineARM + + + %(AdditionalDependencies);uuid.lib;dxgi.lib + /guard:cf %(AdditionalOptions) + false + false + true + $(OutDir)lib\$(TargetName).lib + $(OutDir)$(TargetName).map + false + $(OutDir)$(ProjectName)$(TargetExt) + Console + true + + + 0x0409 + ANGLE_STANDALONE_BUILD;_DEBUG;%(PreprocessorDefinitions) + + /MP /d2guard4 %(AdditionalOptions) @@ -271,6 +321,46 @@ ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + + + /MP /d2guard4 %(AdditionalOptions) + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + Size + true + false + MinSpace + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + Level4 + true + + + MachineARM + + + %(AdditionalDependencies);uuid.lib + /guard:cf /cgthreads:8 %(AdditionalOptions) + false + true + $(OutDir)lib\$(TargetName).lib + UseLinkTimeCodeGeneration + $(OutDir)$(TargetName).map + $(OutDir)$(ProjectName)$(TargetExt) + Console + true + + + 0x0409 + ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + + /MP /d2guard4 %(AdditionalOptions) @@ -313,23 +403,25 @@ - + Document - call mkdir "$(OutDir)obj\global_intermediate\angle" 2>nul & set ERRORLEVEL=0 & copy /Y "..\..\..\src\commit_id.bat" "$(OutDir)obj\global_intermediate\angle\commit_id.bat" if %errorlevel% neq 0 exit /b %errorlevel% + call mkdir "$(OutDir)obj\global_intermediate\angle" 2>nul & set ERRORLEVEL=0 & copy /Y "..\..\..\src\commit_id.bat" "$(OutDir)obj\global_intermediate\angle\commit_id.bat" +if %errorlevel% neq 0 exit /b %errorlevel% Copying commit_id.bat to $(OutDir)obj/global_intermediate/angle\commit_id.bat $(OutDir)obj\global_intermediate\angle\commit_id.bat Document - call mkdir "$(OutDir)obj\global_intermediate\angle" 2>nul & set ERRORLEVEL=0 & copy /Y "..\..\..\src\copy_compiler_dll.bat" "$(OutDir)obj\global_intermediate\angle\copy_compiler_dll.bat" if %errorlevel% neq 0 exit /b %errorlevel% + call mkdir "$(OutDir)obj\global_intermediate\angle" 2>nul & set ERRORLEVEL=0 & copy /Y "..\..\..\src\copy_compiler_dll.bat" "$(OutDir)obj\global_intermediate\angle\copy_compiler_dll.bat" +if %errorlevel% neq 0 exit /b %errorlevel% Copying copy_compiler_dll.bat to $(OutDir)obj/global_intermediate/angle\copy_compiler_dll.bat $(OutDir)obj\global_intermediate\angle\copy_compiler_dll.bat - - - - + + + + \ No newline at end of file diff --git a/winrt/10/src/libANGLE.vcxproj b/winrt/10/src/libANGLE.vcxproj index ceef4c31c5c..bef8ab4781a 100644 --- a/winrt/10/src/libANGLE.vcxproj +++ b/winrt/10/src/libANGLE.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,8 +43,8 @@ en-US true 10.0 - 10.0.10586.0 - 10.0.10586.0 + 10.0 + 10.0.18362.0 Windows Store @@ -44,7 +52,7 @@ StaticLibrary - v140 + v142 @@ -60,9 +68,11 @@ $(OutDir)obj\$(ProjectName)\ false false + false false true true + true true $(ProjectName) $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -86,6 +96,7 @@ true true TurnOffAllWarnings + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -129,6 +140,7 @@ true true TurnOffAllWarnings + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -153,7 +165,7 @@ LIBANGLE_IMPLEMENTATION;ANGLE_ENABLE_D3D11;ANGLE_STANDALONE_BUILD;ANGLE_TRANSLATOR_STATIC;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) - + ..\..\..\src;..\..\..\include;..\..\..\src\third_party\khronos;$(OutDir)obj\global_intermediate\angle;..\..\..\src;%(AdditionalIncludeDirectories) /MP /d2guard4 %(AdditionalOptions) @@ -172,6 +184,50 @@ true true TurnOffAllWarnings + Guard + + + $(OutDir)lib\$(ProjectName)$(TargetExt) + MachineARM64 + + + %(AdditionalDependencies);uuid.lib;dxgi.lib + /guard:cf %(AdditionalOptions) + false + false + true + $(OutDir)lib\$(TargetName).lib + $(OutDir)$(TargetName).map + false + Console + true + + + ..\..\..\src;..\..\..\include;..\..\..\src\third_party\khronos;$(OutDir)obj\global_intermediate\angle;..\..\..\src;%(AdditionalIncludeDirectories) + 0x0409 + LIBANGLE_IMPLEMENTATION;ANGLE_ENABLE_D3D11;ANGLE_STANDALONE_BUILD;ANGLE_TRANSLATOR_STATIC;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + + + + + ..\..\..\src;..\..\..\include;..\..\..\src\third_party\khronos;$(OutDir)obj\global_intermediate\angle;..\..\..\src;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + EnableFastChecks + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + true + false + Disabled + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;LIBANGLE_IMPLEMENTATION;ANGLE_ENABLE_D3D11;ANGLE_STANDALONE_BUILD;ANGLE_TRANSLATOR_STATIC;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + false + TurnOffAllWarnings + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -282,6 +338,48 @@ LIBANGLE_IMPLEMENTATION;ANGLE_ENABLE_D3D11;ANGLE_STANDALONE_BUILD;ANGLE_TRANSLATOR_STATIC;NDEBUG;%(PreprocessorDefinitions) + + + ..\..\..\src;..\..\..\include;..\..\..\src\third_party\khronos;$(OutDir)obj\global_intermediate\angle;..\..\..\src;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + Size + true + false + MinSpace + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;LIBANGLE_IMPLEMENTATION;ANGLE_ENABLE_D3D11;ANGLE_STANDALONE_BUILD;ANGLE_TRANSLATOR_STATIC;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + TurnOffAllWarnings + true + + + $(OutDir)lib\$(ProjectName)$(TargetExt) + MachineARM64 + + + %(AdditionalDependencies);uuid.lib + /guard:cf /cgthreads:8 %(AdditionalOptions) + false + true + $(OutDir)lib\$(TargetName).lib + UseLinkTimeCodeGeneration + $(OutDir)$(TargetName).map + Console + true + + + ..\..\..\src;..\..\..\include;..\..\..\src\third_party\khronos;$(OutDir)obj\global_intermediate\angle;..\..\..\src;%(AdditionalIncludeDirectories) + 0x0409 + LIBANGLE_IMPLEMENTATION;ANGLE_ENABLE_D3D11;ANGLE_STANDALONE_BUILD;ANGLE_TRANSLATOR_STATIC;NDEBUG;%(PreprocessorDefinitions) + + ..\..\..\src;..\..\..\include;..\..\..\src\third_party\khronos;$(OutDir)obj\global_intermediate\angle;..\..\..\src;%(AdditionalIncludeDirectories) diff --git a/winrt/10/src/libEGL.vcxproj b/winrt/10/src/libEGL.vcxproj index 797a296b768..43cb199a63f 100644 --- a/winrt/10/src/libEGL.vcxproj +++ b/winrt/10/src/libEGL.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,8 +43,8 @@ en-US true 10.0 - 10.0.10586.0 - 10.0.10586.0 + 10.0 + 10.0.18362.0 Windows Store @@ -44,7 +52,7 @@ DynamicLibrary - v140 + v142 @@ -60,9 +68,11 @@ $(OutDir)obj\$(ProjectName)\ false false + false false true true + true true $(ProjectName) $(OutDir)\$(ProjectName)$(TargetExt) @@ -73,7 +83,7 @@ /MP /d2guard4 %(AdditionalOptions) EnableFastChecks true - false + true ProgramDatabase 4100;4127;4702;4718;%(DisableSpecificWarnings) false @@ -86,6 +96,7 @@ true true TurnOffAllWarnings + Guard MachineX86 @@ -117,7 +128,7 @@ /MP /d2guard4 %(AdditionalOptions) EnableFastChecks true - false + true ProgramDatabase 4100;4127;4702;4718;%(DisableSpecificWarnings) false @@ -130,6 +141,7 @@ true true TurnOffAllWarnings + Guard MachineARM @@ -155,13 +167,57 @@ ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" };GL_APICALL=;EGLAPI=;ANGLE_ENABLE_D3D11;_DEBUG;%(PreprocessorDefinitions) + + + ..\..\..\src;..\..\..\include;$(OutDir)obj\global_intermediate\angle;..\..\..\src;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + EnableFastChecks + true + true + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + true + false + Disabled + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" };GL_APICALL=;EGLAPI=;ANGLE_ENABLE_D3D11;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + TurnOffAllWarnings + Guard + + + MachineARM + + + %(AdditionalDependencies);uuid.lib;dxguid.lib;d3d11.lib;d3dcompiler.lib;dxgi.lib + /guard:cf %(AdditionalOptions) + false + false + true + $(OutDir)lib\$(TargetName).lib + $(OutDir)$(TargetName).map + ..\..\..\src\libEGL\libEGL.def + false + $(OutDir)$(ProjectName)$(TargetExt) + Console + true + + + ..\..\..\src;..\..\..\include;$(OutDir)obj\global_intermediate\angle;..\..\..\src;%(AdditionalIncludeDirectories) + 0x0409 + ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" };GL_APICALL=;EGLAPI=;ANGLE_ENABLE_D3D11;_DEBUG;%(PreprocessorDefinitions) + + ..\..\..\src;..\..\..\include;$(OutDir)obj\global_intermediate\angle;..\..\..\src;%(AdditionalIncludeDirectories) /MP /d2guard4 %(AdditionalOptions) EnableFastChecks true - false + true ProgramDatabase 4100;4127;4702;4718;%(DisableSpecificWarnings) false @@ -174,6 +230,7 @@ true true TurnOffAllWarnings + Guard MachineX64 @@ -287,6 +344,49 @@ ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" };GL_APICALL=;EGLAPI=;ANGLE_ENABLE_D3D11;NDEBUG;%(PreprocessorDefinitions) + + + ..\..\..\src;..\..\..\include;$(OutDir)obj\global_intermediate\angle;..\..\..\src;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + Size + true + false + MinSpace + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" };GL_APICALL=;EGLAPI=;ANGLE_ENABLE_D3D11;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + TurnOffAllWarnings + true + + + MachineARM + + + %(AdditionalDependencies);uuid.lib;dxguid.lib;d3d11.lib;d3dcompiler.lib + /guard:cf /cgthreads:8 %(AdditionalOptions) + false + true + $(OutDir)lib\$(TargetName).lib + UseLinkTimeCodeGeneration + $(OutDir)$(TargetName).map + ..\..\..\src\libEGL\libEGL.def + $(OutDir)$(ProjectName)$(TargetExt) + Console + true + + + ..\..\..\src;..\..\..\include;$(OutDir)obj\global_intermediate\angle;..\..\..\src;%(AdditionalIncludeDirectories) + 0x0409 + ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" };GL_APICALL=;EGLAPI=;ANGLE_ENABLE_D3D11;NDEBUG;%(PreprocessorDefinitions) + + ..\..\..\src;..\..\..\include;$(OutDir)obj\global_intermediate\angle;..\..\..\src;%(AdditionalIncludeDirectories) diff --git a/winrt/10/src/libGLESv2.vcxproj b/winrt/10/src/libGLESv2.vcxproj index 04b5f14f858..e92538ab824 100644 --- a/winrt/10/src/libGLESv2.vcxproj +++ b/winrt/10/src/libGLESv2.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,8 +43,8 @@ en-US true 10.0 - 10.0.10586.0 - 10.0.10586.0 + 10.0 + 10.0.18362.0 Windows Store @@ -44,7 +52,7 @@ DynamicLibrary - v140 + v142 @@ -60,9 +68,11 @@ $(OutDir)obj\$(ProjectName)\ false false + false false true true + true true $(ProjectName) $(OutDir)\$(ProjectName)$(TargetExt) @@ -73,7 +83,7 @@ /MP /d2guard4 %(AdditionalOptions) EnableFastChecks true - false + true ProgramDatabase 4100;4127;4702;4718;%(DisableSpecificWarnings) false @@ -86,6 +96,7 @@ true true TurnOffAllWarnings + Guard MachineX86 @@ -117,7 +128,7 @@ /MP /d2guard4 %(AdditionalOptions) EnableFastChecks true - false + true ProgramDatabase 4100;4127;4702;4718;%(DisableSpecificWarnings) false @@ -130,6 +141,7 @@ true true TurnOffAllWarnings + Guard MachineARM @@ -155,13 +167,57 @@ LIBGLESV2_IMPLEMENTATION;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" };GL_APICALL=;EGLAPI=;ANGLE_ENABLE_D3D11;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + + + $(OutDir)obj\global_intermediate\angle;..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + EnableFastChecks + true + true + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + true + false + Disabled + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;LIBGLESV2_IMPLEMENTATION;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" };GL_APICALL=;EGLAPI=;ANGLE_ENABLE_D3D11;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + TurnOffAllWarnings + Guard + + + MachineARM + + + %(AdditionalDependencies);uuid.lib;dxguid.lib;d3d11.lib;d3dcompiler.lib;dxgi.lib + /guard:cf %(AdditionalOptions) + false + false + true + $(OutDir)lib\$(TargetName).lib + $(OutDir)$(TargetName).map + ..\..\..\src\libGLESv2\libGLESv2.def + false + $(OutDir)$(ProjectName)$(TargetExt) + Console + true + + + $(OutDir)obj\global_intermediate\angle;..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) + 0x0409 + LIBGLESV2_IMPLEMENTATION;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" };GL_APICALL=;EGLAPI=;ANGLE_ENABLE_D3D11;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + + $(OutDir)obj\global_intermediate\angle;..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) /MP /d2guard4 %(AdditionalOptions) EnableFastChecks true - false + true ProgramDatabase 4100;4127;4702;4718;%(DisableSpecificWarnings) false @@ -174,6 +230,7 @@ true true TurnOffAllWarnings + Guard MachineX64 @@ -287,6 +344,49 @@ LIBGLESV2_IMPLEMENTATION;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" };GL_APICALL=;EGLAPI=;ANGLE_ENABLE_D3D11;NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)obj\global_intermediate\angle;..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + Size + true + false + MinSpace + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;LIBGLESV2_IMPLEMENTATION;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" };GL_APICALL=;EGLAPI=;ANGLE_ENABLE_D3D11;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + TurnOffAllWarnings + true + + + MachineARM + + + %(AdditionalDependencies);uuid.lib;dxguid.lib;d3d11.lib;d3dcompiler.lib + /guard:cf /cgthreads:8 %(AdditionalOptions) + false + true + $(OutDir)lib\$(TargetName).lib + UseLinkTimeCodeGeneration + $(OutDir)$(TargetName).map + ..\..\..\src\libGLESv2\libGLESv2.def + $(OutDir)$(ProjectName)$(TargetExt) + Console + true + + + $(OutDir)obj\global_intermediate\angle;..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) + 0x0409 + LIBGLESV2_IMPLEMENTATION;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" };GL_APICALL=;EGLAPI=;ANGLE_ENABLE_D3D11;NDEBUG;%(PreprocessorDefinitions) + + $(OutDir)obj\global_intermediate\angle;..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) diff --git a/winrt/10/src/preprocessor.vcxproj b/winrt/10/src/preprocessor.vcxproj index bc038def016..cfc0130f348 100644 --- a/winrt/10/src/preprocessor.vcxproj +++ b/winrt/10/src/preprocessor.vcxproj @@ -1,6 +1,10 @@ + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,33 +43,35 @@ en-US true 10.0 - 10.0.10240.0 - 10.0.10240.0 + 10.0 + 10.0.18362.0 Windows Store - + StaticLibrary - v140 + v142 - - - + + + - + - + $(ExecutablePath);$(MSBuildProjectDirectory)\..\..\..\third_party\cygwin\bin\;$(MSBuildProjectDirectory)\..\..\..\third_party\python_26\ $(SolutionDir)$(Configuration)_$(Platform)\ $(OutDir)obj\$(ProjectName)\ false false + false false true true + true true $(ProjectName) $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -84,6 +94,7 @@ true true Level4 + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -125,6 +136,7 @@ true true Level4 + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -148,6 +160,47 @@ ANGLE_STANDALONE_BUILD;_DEBUG;%(PreprocessorDefinitions) + + + /MP /d2guard4 %(AdditionalOptions) + EnableFastChecks + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + true + false + Disabled + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + Level4 + Guard + + + $(OutDir)lib\$(ProjectName)$(TargetExt) + MachineARM64 + + + %(AdditionalDependencies);uuid.lib;dxgi.lib + /guard:cf %(AdditionalOptions) + false + false + true + $(OutDir)lib\$(TargetName).lib + $(OutDir)$(TargetName).map + false + Console + true + + + 0x0409 + ANGLE_STANDALONE_BUILD;_DEBUG;%(PreprocessorDefinitions) + + /MP /d2guard4 %(AdditionalOptions) @@ -166,6 +219,7 @@ true true Level4 + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -271,6 +325,46 @@ ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + + + /MP /d2guard4 %(AdditionalOptions) + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + Size + true + false + MinSpace + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + Level4 + true + + + $(OutDir)lib\$(ProjectName)$(TargetExt) + MachineARM64 + + + %(AdditionalDependencies);uuid.lib + /guard:cf /cgthreads:8 %(AdditionalOptions) + false + true + $(OutDir)lib\$(TargetName).lib + UseLinkTimeCodeGeneration + $(OutDir)$(TargetName).map + Console + true + + + 0x0409 + ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + + /MP /d2guard4 %(AdditionalOptions) @@ -313,40 +407,40 @@ - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + \ No newline at end of file diff --git a/winrt/10/src/translator.vcxproj b/winrt/10/src/translator.vcxproj index b68196b39bd..04a75d6407f 100644 --- a/winrt/10/src/translator.vcxproj +++ b/winrt/10/src/translator.vcxproj @@ -1,6 +1,10 @@ + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,33 +43,35 @@ en-US true 10.0 - 10.0.10240.0 - 10.0.10240.0 + 10.0 + 10.0.18362.0 Windows Store - + StaticLibrary - v140 + v142 - - - + + + - + - + $(ExecutablePath);$(MSBuildProjectDirectory)\..\..\..\third_party\cygwin\bin\;$(MSBuildProjectDirectory)\..\..\..\third_party\python_26\ $(SolutionDir)$(Configuration)_$(Platform)\ $(OutDir)obj\$(ProjectName)\ false false + false false true true + true true $(ProjectName) $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -85,6 +95,7 @@ true true Level4 + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -128,6 +139,7 @@ true true Level4 + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -152,6 +164,49 @@ ANGLE_TRANSLATOR_IMPLEMENTATION;ANGLE_STANDALONE_BUILD;ANGLE_ENABLE_HLSL;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + + + ..\..\..\src;..\..\..\include;..\..\..\src;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + EnableFastChecks + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + true + false + Disabled + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_TRANSLATOR_IMPLEMENTATION;ANGLE_STANDALONE_BUILD;ANGLE_ENABLE_HLSL;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + Level4 + Guard + + + $(OutDir)lib\$(ProjectName)$(TargetExt) + MachineARM64 + + + %(AdditionalDependencies);uuid.lib;dxgi.lib + /guard:cf %(AdditionalOptions) + false + false + true + $(OutDir)lib\$(TargetName).lib + $(OutDir)$(TargetName).map + false + Console + true + + + ..\..\..\src;..\..\..\include;..\..\..\src;%(AdditionalIncludeDirectories) + 0x0409 + ANGLE_TRANSLATOR_IMPLEMENTATION;ANGLE_STANDALONE_BUILD;ANGLE_ENABLE_HLSL;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + + ..\..\..\src;..\..\..\include;..\..\..\src;%(AdditionalIncludeDirectories) @@ -171,6 +226,7 @@ true true Level4 + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -281,6 +337,48 @@ ANGLE_TRANSLATOR_IMPLEMENTATION;ANGLE_STANDALONE_BUILD;ANGLE_ENABLE_HLSL;NDEBUG;%(PreprocessorDefinitions) + + + ..\..\..\src;..\..\..\include;..\..\..\src;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + Size + true + false + MinSpace + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_TRANSLATOR_IMPLEMENTATION;ANGLE_STANDALONE_BUILD;ANGLE_ENABLE_HLSL;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + Level4 + true + + + $(OutDir)lib\$(ProjectName)$(TargetExt) + MachineARM64 + + + %(AdditionalDependencies);uuid.lib + /guard:cf /cgthreads:8 %(AdditionalOptions) + false + true + $(OutDir)lib\$(TargetName).lib + UseLinkTimeCodeGeneration + $(OutDir)$(TargetName).map + Console + true + + + ..\..\..\src;..\..\..\include;..\..\..\src;%(AdditionalIncludeDirectories) + 0x0409 + ANGLE_TRANSLATOR_IMPLEMENTATION;ANGLE_STANDALONE_BUILD;ANGLE_ENABLE_HLSL;NDEBUG;%(PreprocessorDefinitions) + + ..\..\..\src;..\..\..\include;..\..\..\src;%(AdditionalIncludeDirectories) @@ -325,13 +423,13 @@ - + - - + + - - - - + + + + \ No newline at end of file diff --git a/winrt/10/src/translator_lib.vcxproj b/winrt/10/src/translator_lib.vcxproj index 5396728429f..d1acde7f5b9 100644 --- a/winrt/10/src/translator_lib.vcxproj +++ b/winrt/10/src/translator_lib.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,8 +43,8 @@ en-US true 10.0 - 10.0.10240.0 - 10.0.10240.0 + 10.0 + 10.0.18362.0 Windows Store @@ -44,7 +52,7 @@ StaticLibrary - v140 + v142 @@ -59,9 +67,11 @@ $(OutDir)obj\$(ProjectName)\ false false + false false true true + true true $(ProjectName) $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -85,6 +95,7 @@ true true Level4 + Guard /ignore:4221 %(AdditionalOptions) @@ -129,6 +140,7 @@ true true Level4 + Guard /ignore:4221 %(AdditionalOptions) @@ -154,6 +166,50 @@ ANGLE_TRANSLATOR_STATIC;ANGLE_ENABLE_HLSL;ANGLE_STANDALONE_BUILD;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + + + ..\..\..\src;..\..\..\include;..\..\..\src;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + EnableFastChecks + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + true + false + Disabled + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_TRANSLATOR_STATIC;ANGLE_ENABLE_HLSL;ANGLE_STANDALONE_BUILD;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + Level4 + Guard + + + /ignore:4221 %(AdditionalOptions) + $(OutDir)lib\$(ProjectName)$(TargetExt) + MachineARM64 + + + %(AdditionalDependencies);uuid.lib;dxgi.lib + /guard:cf %(AdditionalOptions) + false + false + true + $(OutDir)lib\$(TargetName).lib + $(OutDir)$(TargetName).map + false + Console + true + + + ..\..\..\src;..\..\..\include;..\..\..\src;%(AdditionalIncludeDirectories) + 0x0409 + ANGLE_TRANSLATOR_STATIC;ANGLE_ENABLE_HLSL;ANGLE_STANDALONE_BUILD;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions) + + ..\..\..\src;..\..\..\include;..\..\..\src;%(AdditionalIncludeDirectories) @@ -173,6 +229,7 @@ true true Level4 + Guard /ignore:4221 %(AdditionalOptions) @@ -286,6 +343,49 @@ ANGLE_TRANSLATOR_STATIC;ANGLE_ENABLE_HLSL;ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + + + ..\..\..\src;..\..\..\include;..\..\..\src;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + Size + true + false + MinSpace + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_TRANSLATOR_STATIC;ANGLE_ENABLE_HLSL;ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + Level4 + true + + + /ignore:4221 %(AdditionalOptions) + $(OutDir)lib\$(ProjectName)$(TargetExt) + MachineARM64 + + + %(AdditionalDependencies);uuid.lib + /guard:cf /cgthreads:8 %(AdditionalOptions) + false + true + $(OutDir)lib\$(TargetName).lib + UseLinkTimeCodeGeneration + $(OutDir)$(TargetName).map + Console + true + + + ..\..\..\src;..\..\..\include;..\..\..\src;%(AdditionalIncludeDirectories) + 0x0409 + ANGLE_TRANSLATOR_STATIC;ANGLE_ENABLE_HLSL;ANGLE_STANDALONE_BUILD;NDEBUG;%(PreprocessorDefinitions) + + ..\..\..\src;..\..\..\include;..\..\..\src;%(AdditionalIncludeDirectories) diff --git a/winrt/10/src/translator_static.vcxproj b/winrt/10/src/translator_static.vcxproj index 93e7c3018c0..07e375660c3 100644 --- a/winrt/10/src/translator_static.vcxproj +++ b/winrt/10/src/translator_static.vcxproj @@ -1,6 +1,10 @@ + + Debug + ARM64 + Debug Win32 @@ -13,6 +17,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,33 +43,35 @@ en-US true 10.0 - 10.0.10240.0 - 10.0.10240.0 + 10.0 + 10.0.18362.0 Windows Store - + StaticLibrary - v140 + v142 - - - + + + - + - + $(ExecutablePath);$(MSBuildProjectDirectory)\..\..\..\third_party\cygwin\bin\;$(MSBuildProjectDirectory)\..\..\..\third_party\python_26\ $(SolutionDir)$(Configuration)_$(Platform)\ $(OutDir)obj\$(ProjectName)\ false false + false false true true + true true $(ProjectName) $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -85,6 +95,7 @@ true true Level4 + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -128,6 +139,7 @@ true true Level4 + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -152,6 +164,49 @@ ANGLE_TRANSLATOR_STATIC;ANGLE_STANDALONE_BUILD;ANGLE_ENABLE_HLSL;_DEBUG;%(PreprocessorDefinitions) + + + ..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + EnableFastChecks + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + true + false + Disabled + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_TRANSLATOR_STATIC;ANGLE_STANDALONE_BUILD;ANGLE_ENABLE_HLSL;_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + Level4 + Guard + + + $(OutDir)lib\$(ProjectName)$(TargetExt) + MachineARM64 + + + %(AdditionalDependencies);uuid.lib;dxgi.lib + /guard:cf %(AdditionalOptions) + false + false + true + $(OutDir)lib\$(TargetName).lib + $(OutDir)$(TargetName).map + false + Console + true + + + ..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) + 0x0409 + ANGLE_TRANSLATOR_STATIC;ANGLE_STANDALONE_BUILD;ANGLE_ENABLE_HLSL;_DEBUG;%(PreprocessorDefinitions) + + ..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) @@ -171,6 +226,7 @@ true true Level4 + Guard $(OutDir)lib\$(ProjectName)$(TargetExt) @@ -281,6 +337,48 @@ ANGLE_TRANSLATOR_STATIC;ANGLE_STANDALONE_BUILD;ANGLE_ENABLE_HLSL;NDEBUG;%(PreprocessorDefinitions) + + + ..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) + /MP /d2guard4 %(AdditionalOptions) + true + false + ProgramDatabase + 4100;4127;4702;4718;%(DisableSpecificWarnings) + false + Size + true + false + MinSpace + NotUsing + _CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_TRANSLATOR_STATIC;ANGLE_STANDALONE_BUILD;ANGLE_ENABLE_HLSL;NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + Level4 + true + + + $(OutDir)lib\$(ProjectName)$(TargetExt) + MachineARM64 + + + %(AdditionalDependencies);uuid.lib + /guard:cf /cgthreads:8 %(AdditionalOptions) + false + true + $(OutDir)lib\$(TargetName).lib + UseLinkTimeCodeGeneration + $(OutDir)$(TargetName).map + Console + true + + + ..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) + 0x0409 + ANGLE_TRANSLATOR_STATIC;ANGLE_STANDALONE_BUILD;ANGLE_ENABLE_HLSL;NDEBUG;%(PreprocessorDefinitions) + + ..\..\..\src;..\..\..\include;%(AdditionalIncludeDirectories) @@ -325,13 +423,13 @@ - + - - + + - - - - + + + + \ No newline at end of file