diff --git a/include/platform/PlatformMethods.h b/include/platform/PlatformMethods.h index a3233a2cd..b4e684842 100644 --- a/include/platform/PlatformMethods.h +++ b/include/platform/PlatformMethods.h @@ -313,7 +313,7 @@ extern "C" { // The application should set any platform methods it cares about on the returned pointer. // If display is not valid, behaviour is undefined. -ANGLE_PLATFORM_EXPORT bool ANGLE_APIENTRY ANGLEGetDisplayPlatform(angle::EGLDisplayType display, +bool ANGLE_APIENTRY ANGLEGetDisplayPlatform(angle::EGLDisplayType display, const char *const methodNames[], unsigned int methodNameCount, void *context, @@ -321,7 +321,7 @@ ANGLE_PLATFORM_EXPORT bool ANGLE_APIENTRY ANGLEGetDisplayPlatform(angle::EGLDisp // Sets the platform methods back to their defaults. // If display is not valid, behaviour is undefined. -ANGLE_PLATFORM_EXPORT void ANGLE_APIENTRY ANGLEResetDisplayPlatform(angle::EGLDisplayType display); +void ANGLE_APIENTRY ANGLEResetDisplayPlatform(angle::EGLDisplayType display); } // extern "C" namespace angle diff --git a/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp b/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp index 0e64f78d5..17ed63e66 100644 --- a/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp +++ b/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.cpp @@ -38,14 +38,22 @@ bool CompositorNativeWindow11::getClientRect(LPRECT rect) const mHostVisual.As(&visual); ABI::Windows::Foundation::Numerics::Vector2 size; +#if defined(MINGW_ENABLED) + HRESULT hr = visual->get_Size((ABI::Windows::UI::Composition::Vector2*)&size); +#else HRESULT hr = visual->get_Size(&size); +#endif if (FAILED(hr)) { return false; } ABI::Windows::Foundation::Numerics::Vector3 offset; +#if defined(MINGW_ENABLED) + hr = visual->get_Offset((ABI::Windows::UI::Composition::Vector3*)&offset); +#else hr = visual->get_Offset(&offset); +#endif if (FAILED(hr)) { return false; diff --git a/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h b/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h index aec331a76..be9881448 100644 --- a/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h +++ b/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h @@ -12,6 +12,143 @@ #include "libANGLE/renderer/d3d/d3d11/NativeWindow11.h" +#if defined(MINGW_ENABLED) +#ifndef DirectXAlphaMode +enum DirectXAlphaMode { + DirectXAlphaMode_Unspecified = 0, + DirectXAlphaMode_Premultiplied = 1, + DirectXAlphaMode_Straight = 2, + DirectXAlphaMode_Ignore = 3 +}; +#endif + +#ifndef DirectXPixelFormat +enum DirectXPixelFormat { + DirectXPixelFormat_Unknown = 0, + DirectXPixelFormat_R32G32B32A32Typeless = 1, + DirectXPixelFormat_R32G32B32A32Float = 2, + DirectXPixelFormat_R32G32B32A32UInt = 3, + DirectXPixelFormat_R32G32B32A32Int = 4, + DirectXPixelFormat_R32G32B32Typeless = 5, + DirectXPixelFormat_R32G32B32Float = 6, + DirectXPixelFormat_R32G32B32UInt = 7, + DirectXPixelFormat_R32G32B32Int = 8, + DirectXPixelFormat_R16G16B16A16Typeless = 9, + DirectXPixelFormat_R16G16B16A16Float = 10, + DirectXPixelFormat_R16G16B16A16UIntNormalized = 11, + DirectXPixelFormat_R16G16B16A16UInt = 12, + DirectXPixelFormat_R16G16B16A16IntNormalized = 13, + DirectXPixelFormat_R16G16B16A16Int = 14, + DirectXPixelFormat_R32G32Typeless = 15, + DirectXPixelFormat_R32G32Float = 16, + DirectXPixelFormat_R32G32UInt = 17, + DirectXPixelFormat_R32G32Int = 18, + DirectXPixelFormat_R32G8X24Typeless = 19, + DirectXPixelFormat_D32FloatS8X24UInt = 20, + DirectXPixelFormat_R32FloatX8X24Typeless = 21, + DirectXPixelFormat_X32TypelessG8X24UInt = 22, + DirectXPixelFormat_R10G10B10A2Typeless = 23, + DirectXPixelFormat_R10G10B10A2UIntNormalized = 24, + DirectXPixelFormat_R10G10B10A2UInt = 25, + DirectXPixelFormat_R11G11B10Float = 26, + DirectXPixelFormat_R8G8B8A8Typeless = 27, + DirectXPixelFormat_R8G8B8A8UIntNormalized = 28, + DirectXPixelFormat_R8G8B8A8UIntNormalizedSrgb = 29, + DirectXPixelFormat_R8G8B8A8UInt = 30, + DirectXPixelFormat_R8G8B8A8IntNormalized = 31, + DirectXPixelFormat_R8G8B8A8Int = 32, + DirectXPixelFormat_R16G16Typeless = 33, + DirectXPixelFormat_R16G16Float = 34, + DirectXPixelFormat_R16G16UIntNormalized = 35, + DirectXPixelFormat_R16G16UInt = 36, + DirectXPixelFormat_R16G16IntNormalized = 37, + DirectXPixelFormat_R16G16Int = 38, + DirectXPixelFormat_R32Typeless = 39, + DirectXPixelFormat_D32Float = 40, + DirectXPixelFormat_R32Float = 41, + DirectXPixelFormat_R32UInt = 42, + DirectXPixelFormat_R32Int = 43, + DirectXPixelFormat_R24G8Typeless = 44, + DirectXPixelFormat_D24UIntNormalizedS8UInt = 45, + DirectXPixelFormat_R24UIntNormalizedX8Typeless = 46, + DirectXPixelFormat_X24TypelessG8UInt = 47, + DirectXPixelFormat_R8G8Typeless = 48, + DirectXPixelFormat_R8G8UIntNormalized = 49, + DirectXPixelFormat_R8G8UInt = 50, + DirectXPixelFormat_R8G8IntNormalized = 51, + DirectXPixelFormat_R8G8Int = 52, + DirectXPixelFormat_R16Typeless = 53, + DirectXPixelFormat_R16Float = 54, + DirectXPixelFormat_D16UIntNormalized = 55, + DirectXPixelFormat_R16UIntNormalized = 56, + DirectXPixelFormat_R16UInt = 57, + DirectXPixelFormat_R16IntNormalized = 58, + DirectXPixelFormat_R16Int = 59, + DirectXPixelFormat_R8Typeless = 60, + DirectXPixelFormat_R8UIntNormalized = 61, + DirectXPixelFormat_R8UInt = 62, + DirectXPixelFormat_R8IntNormalized = 63, + DirectXPixelFormat_R8Int = 64, + DirectXPixelFormat_A8UIntNormalized = 65, + DirectXPixelFormat_R1UIntNormalized = 66, + DirectXPixelFormat_R9G9B9E5SharedExponent = 67, + DirectXPixelFormat_R8G8B8G8UIntNormalized = 68, + DirectXPixelFormat_G8R8G8B8UIntNormalized = 69, + DirectXPixelFormat_BC1Typeless = 70, + DirectXPixelFormat_BC1UIntNormalized = 71, + DirectXPixelFormat_BC1UIntNormalizedSrgb = 72, + DirectXPixelFormat_BC2Typeless = 73, + DirectXPixelFormat_BC2UIntNormalized = 74, + DirectXPixelFormat_BC2UIntNormalizedSrgb = 75, + DirectXPixelFormat_BC3Typeless = 76, + DirectXPixelFormat_BC3UIntNormalized = 77, + DirectXPixelFormat_BC3UIntNormalizedSrgb = 78, + DirectXPixelFormat_BC4Typeless = 79, + DirectXPixelFormat_BC4UIntNormalized = 80, + DirectXPixelFormat_BC4IntNormalized = 81, + DirectXPixelFormat_BC5Typeless = 82, + DirectXPixelFormat_BC5UIntNormalized = 83, + DirectXPixelFormat_BC5IntNormalized = 84, + DirectXPixelFormat_B5G6R5UIntNormalized = 85, + DirectXPixelFormat_B5G5R5A1UIntNormalized = 86, + DirectXPixelFormat_B8G8R8A8UIntNormalized = 87, + DirectXPixelFormat_B8G8R8X8UIntNormalized = 88, + DirectXPixelFormat_R10G10B10XRBiasA2UIntNormalized = 89, + DirectXPixelFormat_B8G8R8A8Typeless = 90, + DirectXPixelFormat_B8G8R8A8UIntNormalizedSrgb = 91, + DirectXPixelFormat_B8G8R8X8Typeless = 92, + DirectXPixelFormat_B8G8R8X8UIntNormalizedSrgb = 93, + DirectXPixelFormat_BC6HTypeless = 94, + DirectXPixelFormat_BC6H16UnsignedFloat = 95, + DirectXPixelFormat_BC6H16Float = 96, + DirectXPixelFormat_BC7Typeless = 97, + DirectXPixelFormat_BC7UIntNormalized = 98, + DirectXPixelFormat_BC7UIntNormalizedSrgb = 99, + DirectXPixelFormat_Ayuv = 100, + DirectXPixelFormat_Y410 = 101, + DirectXPixelFormat_Y416 = 102, + DirectXPixelFormat_NV12 = 103, + DirectXPixelFormat_P010 = 104, + DirectXPixelFormat_P016 = 105, + DirectXPixelFormat_Opaque420 = 106, + DirectXPixelFormat_Yuy2 = 107, + DirectXPixelFormat_Y210 = 108, + DirectXPixelFormat_Y216 = 109, + DirectXPixelFormat_NV11 = 110, + DirectXPixelFormat_AI44 = 111, + DirectXPixelFormat_IA44 = 112, + DirectXPixelFormat_P8 = 113, + DirectXPixelFormat_A8P8 = 114, + DirectXPixelFormat_B4G4R4A4UIntNormalized = 115, + DirectXPixelFormat_P208 = 130, + DirectXPixelFormat_V208 = 131, + DirectXPixelFormat_V408 = 132, + DirectXPixelFormat_SamplerFeedbackMinMipOpaque = 189, + DirectXPixelFormat_SamplerFeedbackMipRegionUsedOpaque = 190 +}; +#endif +#endif + #include #include #include