early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

30
externals/vcpkg/ports/angle/001-fix-uwp.patch vendored Executable file
View File

@@ -0,0 +1,30 @@
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
index 7d3f078d6..fac057dd6 100644
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
@@ -213,16 +213,20 @@ HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWind
static float GetLogicalDpi()
{
- ComPtr<ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> displayProperties;
+ ComPtr<ABI::Windows::Graphics::Display::IDisplayInformationStatics> displayInformationStatics;
+ ComPtr<ABI::Windows::Graphics::Display::IDisplayInformation> displayInformation;
if (SUCCEEDED(GetActivationFactory(
- HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(),
- displayProperties.GetAddressOf())))
+ HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayInformation).Get(),
+ displayInformationStatics.GetAddressOf())))
{
float dpi = 96.0f;
- if (SUCCEEDED(displayProperties->get_LogicalDpi(&dpi)))
+ if (SUCCEEDED(displayInformationStatics->GetForCurrentView(&displayInformation)))
{
- return dpi;
+ if (SUCCEEDED(displayInformation->get_LogicalDpi(&dpi)))
+ {
+ return dpi;
+ }
}
}

View File

@@ -0,0 +1,28 @@
diff --git a/src/gpu_info_util/SystemInfo_win.cpp b/src/gpu_info_util/SystemInfo_win.cpp
index f4bb137f2..86495013b 100644
--- a/src/gpu_info_util/SystemInfo_win.cpp
+++ b/src/gpu_info_util/SystemInfo_win.cpp
@@ -6,11 +6,6 @@
// SystemInfo_win.cpp: implementation of the Windows-specific parts of SystemInfo.h
-#include "gpu_info_util/SystemInfo_internal.h"
-
-#include "common/debug.h"
-#include "common/string_utils.h"
-
// Windows.h needs to be included first
#include <windows.h>
@@ -19,6 +14,11 @@
#include <array>
#include <sstream>
+#include "gpu_info_util/SystemInfo_internal.h"
+
+#include "common/debug.h"
+#include "common/string_utils.h"
+
namespace angle
{

View File

@@ -0,0 +1,22 @@
diff --git a/src/common/mathutil.h b/src/common/mathutil.h
index 1d73bbf..c5b9cc8 100644
--- a/src/common/mathutil.h
+++ b/src/common/mathutil.h
@@ -1073,7 +1073,7 @@ inline int BitCount(uint64_t bits)
# endif // defined(_M_IX86) || defined(_M_X64)
#endif // defined(_MSC_VER) && !defined(__clang__)
-#if defined(ANGLE_PLATFORM_POSIX) || defined(__clang__)
+#if defined(ANGLE_PLATFORM_POSIX) || defined(__clang__) || defined(__MINGW32__)
inline int BitCount(uint32_t bits)
{
return __builtin_popcount(bits);
@@ -1083,7 +1083,7 @@ inline int BitCount(uint64_t bits)
{
return __builtin_popcountll(bits);
}
-#endif // defined(ANGLE_PLATFORM_POSIX) || defined(__clang__)
+#endif // defined(ANGLE_PLATFORM_POSIX) || defined(__clang__) || defined(__MINGW32__)
inline int BitCount(uint8_t bits)
{

754
externals/vcpkg/ports/angle/CMakeLists.txt vendored Executable file
View File

@@ -0,0 +1,754 @@
cmake_minimum_required(VERSION 3.8)
project(angle CXX C)
if(WIN32 AND NOT WINDOWS_STORE)
set(WINDOWS_DESKTOP 1)
else()
set(WINDOWS_DESKTOP 0)
endif()
if(UNIX AND NOT APPLE)
set(LINUX 1)
else()
set(LINUX 0)
endif()
if(MSVC)
add_compile_options(/d2guard4 /Wv:18 /guard:cf /permissive /bigobj)
else()
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
if (APPLE)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework IOSurface -framework QuartzCore -framework CoreGraphics")
endif()
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}")
set(CMAKE_STATIC_LIBRARY_PREFIX "")
if (WINDOWS_STORE)
set(WINRT_DEFINES -DANGLE_ENABLE_WINDOWS_UWP -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP)
else()
set(WINRT_DEFINES)
endif()
add_definitions(
-D_CRT_SECURE_NO_DEPRECATE
-D_SCL_SECURE_NO_WARNINGS
-DGL_SILENCE_DEPRECATION
-D_HAS_EXCEPTIONS=0
-DNOMINMAX
-DANGLE_STANDALONE_BUILD
${WINRT_DEFINES}
)
add_compile_options("$<$<CONFIG:DEBUG>:-DANGLE_ENABLE_DEBUG_ANNOTATIONS>")
if(WIN32)
add_definitions(-DANGLE_IS_WIN)
endif()
if(LINUX)
add_definitions(-DANGLE_IS_LINUX)
endif()
if(ANGLE_IS_64_BIT_CPU)
add_definitions(-DANGLE_IS_64_BIT_CPU)
elseif(ANGLE_IS_32_BIT_CPU)
add_definitions(-DANGLE_IS_32_BIT_CPU)
endif()
configure_file(angle_commit.h include/id/commit.h COPYONLY)
#include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include)
include_directories("$<INSTALL_INTERFACE:include>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
##########
# angle::common
if(WINDOWS_DESKTOP)
set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_apple|_mac|_ios|_posix|_winuwp")
elseif(WINDOWS_STORE)
set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_apple|_mac|_ios|_posix|_win32")
elseif(LINUX)
set(ANGLE_COMMON_PLATFORM_FILTER "_win|_apple|_mac|_ios")
elseif(APPLE)
if(CMAKE_SYSTEM_NAME MATCHES "Darwin") # macOS
set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win|_ios")
else() # other Apple platforms (iOS, etc)
set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win|_mac")
endif()
endif()
if(APPLE)
set(ANGLE_COMMON_PLATFORM_SOURCES
"src/common/apple/*.h"
"src/common/apple/*.cpp"
"src/common/apple/*.mm"
"src/common/gl/cgl/*.h"
"src/common/gl/cgl/*.cpp"
"src/common/gl/cgl/*.mm")
else()
set(ANGLE_COMMON_PLATFORM_SOURCES )
endif()
file(GLOB ANGLE_COMMON_SOURCES
${ANGLE_COMMON_PLATFORM_SOURCES}
"src/common/*.h"
"src/common/*.inc"
"src/common/*.cpp"
"src/common/third_party/base/anglebase/*.h"
"src/common/third_party/base/anglebase/*.cc"
"src/common/third_party/base/anglebase/containers/*.h"
"src/common/third_party/base/anglebase/numerics/*.h"
"src/common/third_party/base/anglebase/numerics/*.cc"
"src/common/third_party/xxhash/*.h"
"src/common/third_party/xxhash/*.c"
"src/common/third_party/smhasher/src/*.h"
"src/common/third_party/smhasher/src/*.cpp")
list(FILTER ANGLE_COMMON_SOURCES EXCLUDE REGEX "_unittest|event_tracer|${ANGLE_COMMON_PLATFORM_FILTER}")
add_library(angle_common OBJECT ${ANGLE_COMMON_SOURCES})
target_include_directories(angle_common PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/common/third_party/base>")
add_library(angle::common ALIAS angle_common)
##########
# angle::compression
file(GLOB ANGLE_COMPRESSION_UTILS_SOURCES "third_party/zlib/google/compression_utils_portable.*")
find_package(ZLIB REQUIRED)
add_library(angle_compression_utils OBJECT ${ANGLE_COMPRESSION_UTILS_SOURCES})
target_link_libraries(angle_compression_utils PUBLIC ZLIB::ZLIB)
target_compile_definitions(angle_compression_utils PRIVATE
-DUSE_SYSTEM_ZLIB
)
target_include_directories(angle_compression_utils INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/third_party/zlib/google>")
add_library(angle::compression ALIAS angle_compression_utils)
##########
# angle::image_util
file(GLOB ANGLE_IMAGE_UTIL_SOURCES "src/image_util/*.h" "src/image_util/*.inc" "src/image_util/*.cpp")
add_library(angle_image_util OBJECT ${ANGLE_IMAGE_UTIL_SOURCES})
target_link_libraries(angle_image_util PRIVATE angle::common)
add_library(angle::image_util ALIAS angle_image_util)
##########
# angle::translator
file(GLOB TRANSLATOR_SOURCES
"src/compiler/translator/BaseTypes.h"
"src/compiler/translator/BuiltInFunctionEmulator.cpp"
"src/compiler/translator/BuiltInFunctionEmulator.h"
"src/compiler/translator/CallDAG.cpp"
"src/compiler/translator/CallDAG.h"
"src/compiler/translator/CodeGen.cpp"
"src/compiler/translator/CollectVariables.cpp"
"src/compiler/translator/CollectVariables.h"
"src/compiler/translator/Common.h"
"src/compiler/translator/Compiler.cpp"
"src/compiler/translator/Compiler.h"
"src/compiler/translator/ConstantUnion.cpp"
"src/compiler/translator/ConstantUnion.h"
"src/compiler/translator/Declarator.cpp"
"src/compiler/translator/Declarator.h"
"src/compiler/translator/Diagnostics.cpp"
"src/compiler/translator/Diagnostics.h"
"src/compiler/translator/DirectiveHandler.cpp"
"src/compiler/translator/DirectiveHandler.h"
"src/compiler/translator/ExtensionBehavior.cpp"
"src/compiler/translator/ExtensionBehavior.h"
"src/compiler/translator/FlagStd140Structs.cpp"
"src/compiler/translator/FlagStd140Structs.h"
"src/compiler/translator/FunctionLookup.cpp"
"src/compiler/translator/FunctionLookup.h"
"src/compiler/translator/HashNames.cpp"
"src/compiler/translator/HashNames.h"
"src/compiler/translator/ImmutableString.h"
"src/compiler/translator/ImmutableStringBuilder.cpp"
"src/compiler/translator/ImmutableStringBuilder.h"
"src/compiler/translator/InfoSink.cpp"
"src/compiler/translator/InfoSink.h"
"src/compiler/translator/Initialize.cpp"
"src/compiler/translator/Initialize.h"
"src/compiler/translator/InitializeDll.cpp"
"src/compiler/translator/InitializeDll.h"
"src/compiler/translator/InitializeGlobals.h"
"src/compiler/translator/IntermNode.cpp"
"src/compiler/translator/IntermNode.h"
"src/compiler/translator/IsASTDepthBelowLimit.cpp"
"src/compiler/translator/IsASTDepthBelowLimit.h"
"src/compiler/translator/Operator.cpp"
"src/compiler/translator/Operator.h"
"src/compiler/translator/OutputTree.cpp"
"src/compiler/translator/OutputTree.h"
"src/compiler/translator/ParseContext.cpp"
"src/compiler/translator/ParseContext.h"
"src/compiler/translator/ParseContext_ESSL_autogen.h"
"src/compiler/translator/ParseContext_complete_autogen.h"
"src/compiler/translator/ParseContext_interm.h"
"src/compiler/translator/PoolAlloc.cpp"
"src/compiler/translator/PoolAlloc.h"
"src/compiler/translator/Pragma.h"
"src/compiler/translator/QualifierTypes.cpp"
"src/compiler/translator/QualifierTypes.h"
"src/compiler/translator/Severity.h"
"src/compiler/translator/ShaderLang.cpp"
"src/compiler/translator/ShaderVars.cpp"
"src/compiler/translator/StaticType.h"
"src/compiler/translator/Symbol.cpp"
"src/compiler/translator/Symbol.h"
"src/compiler/translator/SymbolTable.cpp"
"src/compiler/translator/SymbolTable.h"
"src/compiler/translator/SymbolTable_autogen.h"
"src/compiler/translator/SymbolUniqueId.cpp"
"src/compiler/translator/SymbolUniqueId.h"
"src/compiler/translator/TranslatorESSL.h"
"src/compiler/translator/TranslatorGLSL.h"
"src/compiler/translator/TranslatorHLSL.h"
"src/compiler/translator/TranslatorMetal.h"
"src/compiler/translator/TranslatorVulkan.h"
"src/compiler/translator/Types.cpp"
"src/compiler/translator/Types.h"
"src/compiler/translator/ValidateAST.cpp"
"src/compiler/translator/ValidateAST.h"
"src/compiler/translator/ValidateBarrierFunctionCall.cpp"
"src/compiler/translator/ValidateBarrierFunctionCall.h"
"src/compiler/translator/ValidateClipCullDistance.cpp"
"src/compiler/translator/ValidateClipCullDistance.h"
"src/compiler/translator/ValidateGlobalInitializer.cpp"
"src/compiler/translator/ValidateGlobalInitializer.h"
"src/compiler/translator/ValidateLimitations.cpp"
"src/compiler/translator/ValidateLimitations.h"
"src/compiler/translator/ValidateMaxParameters.cpp"
"src/compiler/translator/ValidateMaxParameters.h"
"src/compiler/translator/ValidateOutputs.cpp"
"src/compiler/translator/ValidateOutputs.h"
"src/compiler/translator/ValidateSwitch.cpp"
"src/compiler/translator/ValidateSwitch.h"
"src/compiler/translator/ValidateVaryingLocations.cpp"
"src/compiler/translator/ValidateVaryingLocations.h"
"src/compiler/translator/VariablePacker.cpp"
"src/compiler/translator/VariablePacker.h"
"src/compiler/translator/blocklayout.cpp"
"src/compiler/translator/glslang.h"
"src/compiler/translator/glslang_lex_autogen.cpp"
"src/compiler/translator/glslang_tab_autogen.cpp"
"src/compiler/translator/glslang_tab_autogen.h"
"src/compiler/translator/glslang_wrapper.h"
"src/compiler/translator/length_limits.h"
"src/compiler/translator/tree_ops/*.cpp"
"src/compiler/translator/tree_ops/*.h"
"src/compiler/translator/tree_ops/gl/ClampFragDepth.h"
"src/compiler/translator/tree_ops/gl/RegenerateStructNames.h"
"src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.h"
"src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.h"
"src/compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.h"
"src/compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.h"
"src/compiler/translator/tree_ops/gl/mac/RewriteDoWhile.h"
"src/compiler/translator/tree_ops/gl/mac/UnfoldShortCircuitAST.h"
"src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h"
"src/compiler/translator/tree_util/*.h"
"src/compiler/translator/tree_util/*.cpp"
"src/compiler/translator/util.cpp"
"src/compiler/translator/util.h"
"src/third_party/compiler/ArrayBoundsClamper.cpp"
"src/third_party/compiler/ArrayBoundsClamper.h"
)
list(FILTER TRANSLATOR_SOURCES EXCLUDE REGEX "_unittest")
file(GLOB TRANSLATOR_GLSL_BASE_SOURCES
"src/compiler/translator/OutputGLSLBase.cpp"
"src/compiler/translator/OutputGLSLBase.h"
)
file(GLOB TRANSLATOR_GLSL_AND_VULKAN_BASE_SOURCES
"src/compiler/translator/BuiltinsWorkaroundGLSL.cpp"
"src/compiler/translator/BuiltinsWorkaroundGLSL.h"
"src/compiler/translator/OutputGLSL.cpp"
"src/compiler/translator/OutputGLSL.h"
)
file(GLOB TRANSLATOR_ESSL_SOURCES
"src/compiler/translator/OutputESSL.cpp"
"src/compiler/translator/OutputESSL.h"
"src/compiler/translator/TranslatorESSL.cpp"
"src/compiler/translator/tree_ops/gl/RecordConstantPrecision.cpp"
"src/compiler/translator/tree_ops/gl/RecordConstantPrecision.h"
)
file(GLOB TRANSLATOR_GLSL_SOURCES
"src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp"
"src/compiler/translator/BuiltInFunctionEmulatorGLSL.h"
"src/compiler/translator/ExtensionGLSL.cpp"
"src/compiler/translator/ExtensionGLSL.h"
"src/compiler/translator/TranslatorGLSL.cpp"
"src/compiler/translator/VersionGLSL.cpp"
"src/compiler/translator/VersionGLSL.h"
"src/compiler/translator/tree_ops/gl/ClampFragDepth.cpp"
"src/compiler/translator/tree_ops/gl/RegenerateStructNames.cpp"
"src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.cpp"
"src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.cpp"
"src/compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.cpp"
"src/compiler/translator/tree_ops/gl/mac/RewriteRowMajorMatrices.h"
"src/compiler/translator/tree_ops/gl/mac/RewriteUnaryMinusOperatorFloat.h"
)
file(GLOB TRANSLATOR_GLSL_MAC_SOURCES
"src/compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.cpp"
"src/compiler/translator/tree_ops/gl/mac/RewriteDoWhile.cpp"
"src/compiler/translator/tree_ops/gl/mac/RewriteRowMajorMatrices.cpp"
"src/compiler/translator/tree_ops/gl/mac/RewriteUnaryMinusOperatorFloat.cpp"
"src/compiler/translator/tree_ops/gl/mac/UnfoldShortCircuitAST.cpp"
)
file(GLOB TRANSLATOR_HLSL_SOURCES
"src/compiler/translator/*HLSL.h"
"src/compiler/translator/*HLSL.cpp"
"src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp"
"src/compiler/translator/tree_ops/d3d/*.cpp"
"src/compiler/translator/tree_ops/d3d/*.h"
)
if(ANDROID)
list(APPEND TRANSLATOR_SOURCES "src/compiler/translator/ImmutableString_ESSL_autogen.cpp" "src/compiler/translator/SymbolTable_ESSL_autogen.cpp")
else()
list(APPEND TRANSLATOR_SOURCES "src/compiler/translator/ImmutableString_autogen.cpp" "src/compiler/translator/SymbolTable_autogen.cpp")
endif()
set(ANGLE_ENABLE_ESSL TRUE)
set(ANGLE_ENABLE_GLSL TRUE)
set(ANGLE_ENABLE_HLSL TRUE)
set(_needs_glsl_base FALSE)
set(_needs_glsl_and_vulkan_base FALSE)
add_library(angle_translator OBJECT ${TRANSLATOR_SOURCES})
if(ANGLE_ENABLE_ESSL)
set(_needs_glsl_base TRUE)
target_sources(angle_translator PRIVATE ${TRANSLATOR_ESSL_SOURCES})
target_compile_definitions(angle_translator PUBLIC -DANGLE_ENABLE_ESSL)
endif()
if(ANGLE_ENABLE_GLSL)
set(_needs_glsl_base TRUE)
set(_needs_glsl_and_vulkan_base TRUE)
target_sources(angle_translator PRIVATE ${TRANSLATOR_GLSL_SOURCES})
if(APPLE)
target_sources(angle_translator PRIVATE ${TRANSLATOR_GLSL_MAC_SOURCES})
endif()
target_compile_definitions(angle_translator PUBLIC -DANGLE_ENABLE_GLSL)
endif()
if(ANGLE_ENABLE_HLSL)
target_sources(angle_translator PRIVATE ${TRANSLATOR_HLSL_SOURCES})
target_compile_definitions(angle_translator PUBLIC -DANGLE_ENABLE_HLSL)
endif()
if(_needs_glsl_base)
target_sources(angle_translator PRIVATE ${TRANSLATOR_GLSL_BASE_SOURCES})
endif()
if(_needs_glsl_and_vulkan_base)
target_sources(angle_translator PRIVATE ${TRANSLATOR_GLSL_AND_VULKAN_BASE_SOURCES})
endif()
target_link_libraries(angle_translator PRIVATE angle::common)
add_library(angle::translator ALIAS angle_translator)
##########
# angle::preprocessor
file(GLOB PREPROCESSOR_SOURCES
"src/compiler/preprocessor/*.h"
"src/compiler/preprocessor/*.cpp"
)
add_library(angle_preprocessor OBJECT ${PREPROCESSOR_SOURCES})
target_link_libraries(angle_preprocessor PRIVATE angle::common)
add_library(angle::preprocessor ALIAS angle_preprocessor)
##########
# libANGLE
## OpenGL Renderer
if(WINDOWS_DESKTOP OR LINUX OR APPLE)
if(WINDOWS_DESKTOP)
set(ANGLE_RENDERER_OPENGL_PLATFORM
"src/libANGLE/renderer/gl/wgl/*.cpp"
"src/libANGLE/renderer/gl/wgl/*.h"
)
elseif(APPLE)
set(ANGLE_RENDERER_OPENGL_PLATFORM
"src/libANGLE/renderer/gl/cgl/*.mm"
"src/libANGLE/renderer/gl/cgl/*.cpp"
"src/libANGLE/renderer/gl/cgl/*.h"
"src/libANGLE/renderer/gl/apple/*.mm"
"src/libANGLE/renderer/gl/apple/*.cpp"
"src/libANGLE/renderer/gl/apple/*.h"
"gpu_info_util/SystemInfo_macos.mm"
)
elseif(LINUX)
set(ANGLE_RENDERER_OPENGL_PLATFORM
"src/libANGLE/renderer/gl/glx/*.cpp"
"src/libANGLE/renderer/gl/glx/*.h"
"src/libANGLE/renderer/gl/egl/*.cpp"
"src/libANGLE/renderer/gl/egl/*.h"
)
endif()
file(GLOB LIBANGLE_GL_SOURCES
"src/libANGLE/renderer/gl/*.cpp"
"src/libANGLE/renderer/gl/*.inc"
"src/libANGLE/renderer/gl/*.h"
${ANGLE_RENDERER_OPENGL_PLATFORM}
)
list(FILTER LIBANGLE_GL_SOURCES EXCLUDE REGEX "_unittest")
add_library(angle_renderer_opengl INTERFACE)
target_sources(angle_renderer_opengl INTERFACE "$<BUILD_INTERFACE:${LIBANGLE_GL_SOURCES}>")
target_compile_definitions(angle_renderer_opengl INTERFACE -DANGLE_ENABLE_OPENGL -DANGLE_ENABLE_OPENGL_DESKTOP)
add_library(angle::renderer::opengl ALIAS angle_renderer_opengl)
endif()
# D3D Renderers
if(WIN32)
## All D3D Sources
file(GLOB_RECURSE LIBANGLE_D3D_SOURCES
"src/libANGLE/renderer/d3d/*.cpp"
"src/libANGLE/renderer/d3d/*.inc"
"src/libANGLE/renderer/d3d/*.h"
)
list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "_unittest")
if(MINGW)
list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "CompositorNativeWindow11")
endif()
## WinRT D3D Renderer
if(WINDOWS_STORE)
set(LIBANGLE_D3D_WINRT_SOURCES ${LIBANGLE_D3D_SOURCES})
list(FILTER LIBANGLE_D3D_WINRT_SOURCES INCLUDE REGEX "winrt")
add_library(angle_renderer_winrt INTERFACE)
target_sources(angle_renderer_winrt INTERFACE "$<BUILD_INTERFACE:${LIBANGLE_D3D_WINRT_SOURCES}>")
add_library(angle::renderer::winrt ALIAS angle_renderer_winrt)
endif()
## Win32/d3d9 D3D Renderer
if(WINDOWS_DESKTOP)
set(LIBANGLE_D3D_DESKTOP_SOURCES ${LIBANGLE_D3D_SOURCES})
list(FILTER LIBANGLE_D3D_DESKTOP_SOURCES INCLUDE REGEX "d3d9|win32")
find_library(D3D9_LIB NAMES d3d9)
add_library(angle_renderer_win32 INTERFACE)
target_sources(angle_renderer_win32 INTERFACE "$<BUILD_INTERFACE:${LIBANGLE_D3D_DESKTOP_SOURCES}>")
target_compile_definitions(angle_renderer_win32 INTERFACE -DANGLE_ENABLE_D3D9)
target_link_libraries(angle_renderer_win32 INTERFACE d3d9)
add_library(angle::renderer::win32 ALIAS angle_renderer_win32)
endif()
## D3D11 Base renderer
list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "winrt|d3d9|win32")
find_library(DXGUID_LIB NAMES dxguid)
find_library(D3D11_LIB NAMES d3d11)
add_library(angle_renderer_d3d INTERFACE)
target_sources(angle_renderer_d3d INTERFACE "$<BUILD_INTERFACE:${LIBANGLE_D3D_SOURCES}>")
target_compile_definitions(angle_renderer_d3d INTERFACE
-DANGLE_ENABLE_D3D11
"-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }"
)
if(NOT MINGW)
target_compile_definitions(angle_renderer_d3d INTERFACE
-DANGLE_ENABLE_D3D11_COMPOSITOR_NATIVE_WINDOW
)
endif()
target_link_libraries(angle_renderer_d3d INTERFACE d3d11 dxguid)
add_library(angle::renderer::d3d ALIAS angle_renderer_d3d)
endif()
## angle::gpu_info_util
file(GLOB ANGLE_GPU_INFO_UTIL_SOURCES
"src/gpu_info_util/SystemInfo.h"
"src/gpu_info_util/SystemInfo_internal.h"
"src/gpu_info_util/SystemInfo.cpp"
)
add_library(angle_gpu_info_util OBJECT ${ANGLE_GPU_INFO_UTIL_SOURCES})
if(WIN32)
target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_win.cpp")
target_link_libraries(angle_gpu_info_util PRIVATE setupapi.lib dxgi.lib)
elseif(APPLE)
target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_apple.mm")
if(CMAKE_SYSTEM_NAME MATCHES "Darwin") # macOS
target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_macos.mm")
endif()
find_library(IOKit IOKit)
find_library(CoreFoundation CoreFoundation)
find_library(CoreGraphics CoreGraphics)
target_link_libraries(angle_gpu_info_util PRIVATE ${IOKit} ${CoreFoundation} ${CoreGraphics})
elseif(LINUX)
target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_linux.cpp" "src/gpu_info_util/SystemInfo_x11.cpp")
target_compile_definitions(angle_gpu_info_util PRIVATE GPU_INFO_USE_X11)
target_link_libraries(angle_gpu_info_util PRIVATE X11 Xi Xext)
elseif(ANDROID)
target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_android.cpp")
endif()
target_link_libraries(angle_gpu_info_util PRIVATE angle::common)
add_library(angle::gpu_info_util ALIAS angle_gpu_info_util)
## Core libANGLE library
if(WIN32)
if(NOT WINDOWS_STORE)
set(LIBANGLE_SOURCES_PLATFORM
"src/third_party/systeminfo/SystemInfo.cpp"
)
endif()
elseif(APPLE)
file(GLOB LIBANGLE_SOURCES_PLATFORM
"src/libANGLE/renderer/*.mm"
)
else()
set(LIBANGLE_SOURCES_PLATFORM)
endif()
file(GLOB LIBANGLE_SOURCES
"src/common/third_party/murmurhash/MurmurHash3.cpp"
"src/common/event_tracer.cpp"
"src/libANGLE/*.cpp"
"src/libANGLE/*.inc"
"src/libANGLE/*.h"
"src/libANGLE/renderer/*.cpp"
"src/libANGLE/renderer/*.h"
"src/libANGLE/renderer/null/*.cpp"
"src/libANGLE/renderer/null/*.h"
# The frame capture headers are always visible to libANGLE.
"src/libANGLE/capture/*.h"
# angle_frame_capture_disabled
"src/libANGLE/capture/FrameCapture_mock.cpp"
"src/libANGLE/capture/frame_capture_utils_mock.cpp"
# angle_gl_enum_utils
"src/libANGLE/capture/gl_enum_utils.cpp"
"src/libANGLE/capture/gl_enum_utils_autogen.cpp"
${LIBANGLE_SOURCES_PLATFORM}
)
list(FILTER LIBANGLE_SOURCES EXCLUDE REGEX "_unittest|glslang_wrapper|dxgi_|d3d_format")
if(WIN32)
set(LIBANGLE_D3D_FORMAT_TABLES_SOURCES_PLATFORM)
if(NOT WINDOWS_STORE)
list(APPEND LIBANGLE_D3D_FORMAT_TABLES_SOURCES_PLATFORM
"src/libANGLE/renderer/d3d_format.cpp"
"src/libANGLE/renderer/d3d_format.h"
)
endif()
file(GLOB LIBANGLE_D3D_FORMAT_TABLES_SOURCES
"src/libANGLE/renderer/dxgi_format_map.h"
"src/libANGLE/renderer/dxgi_format_map_autogen.cpp"
"src/libANGLE/renderer/dxgi_support_table.h"
"src/libANGLE/renderer/dxgi_support_table_autogen.cpp"
${LIBANGLE_D3D_FORMAT_TABLES_SOURCES_PLATFORM}
)
list(APPEND LIBANGLE_SOURCES "${LIBANGLE_D3D_FORMAT_TABLES_SOURCES}")
endif()
if(LINUX OR APPLE)
set(LIBANGLE_RENDERER_PLATFORM
angle::renderer::opengl
)
elseif(WINDOWS_STORE)
set(LIBANGLE_RENDERER_PLATFORM
angle::renderer::d3d
angle::renderer::winrt
)
elseif(WINDOWS_DESKTOP)
set(LIBANGLE_RENDERER_PLATFORM
angle::renderer::d3d
angle::renderer::win32
angle::renderer::opengl
gdi32
)
else()
set(LIBANGLE_RENDERER_PLATFORM )
endif()
if(LINUX)
find_package(X11)
include_directories(${X11_INCLUDE_DIR})
list(APPEND LIBANGLE_RENDERER_PLATFORM ${X11_LIBRARIES})
set(LIBANGLE_RENDERER_COMPILEDEF
-DANGLE_USE_X11
)
else()
set(LIBANGLE_RENDERER_COMPILEDEF )
endif()
add_library(libANGLE STATIC ${LIBANGLE_SOURCES})
target_link_libraries(libANGLE PRIVATE
angle::common
angle::compression
angle::image_util
angle::gpu_info_util
angle::translator
angle::preprocessor
${LIBANGLE_RENDERER_PLATFORM}
)
target_include_directories(libANGLE PRIVATE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/khronos>")
target_compile_definitions(libANGLE
PRIVATE -DANGLE_ENABLE_NULL
PUBLIC
-DLIBANGLE_IMPLEMENTATION
${LIBANGLE_RENDERER_COMPILEDEF}
-DANGLE_EXPORT=
-DANGLE_UTIL_EXPORT=
-DEGLAPI=
-DGL_APICALL=
-DGL_API=
-DANGLE_CAPTURE_ENABLED=0
)
add_library(angle::libANGLE ALIAS libANGLE)
if(BUILD_SHARED_LIBS)
target_compile_definitions(libANGLE
PRIVATE -DLIBANGLE_UTIL_IMPLEMENTATION
)
endif()
##########
# libGLESv2
# Modified according to the file src/libGLESv2.gni
list(APPEND LIBGLESV2_SOURCES
"src/libGLESv2/egl_ext_stubs.cpp"
"src/libGLESv2/egl_ext_stubs_autogen.h"
"src/libGLESv2/egl_stubs.cpp"
"src/libGLESv2/egl_stubs_autogen.h"
"src/libGLESv2/entry_points_egl_autogen.cpp"
"src/libGLESv2/entry_points_egl_autogen.h"
"src/libGLESv2/entry_points_egl_ext_autogen.cpp"
"src/libGLESv2/entry_points_egl_ext_autogen.h"
"src/libGLESv2/entry_points_gles_1_0_autogen.cpp"
"src/libGLESv2/entry_points_gles_1_0_autogen.h"
"src/libGLESv2/entry_points_gles_2_0_autogen.cpp"
"src/libGLESv2/entry_points_gles_2_0_autogen.h"
"src/libGLESv2/entry_points_gles_3_0_autogen.cpp"
"src/libGLESv2/entry_points_gles_3_0_autogen.h"
"src/libGLESv2/entry_points_gles_3_1_autogen.cpp"
"src/libGLESv2/entry_points_gles_3_1_autogen.h"
"src/libGLESv2/entry_points_gles_3_2_autogen.cpp"
"src/libGLESv2/entry_points_gles_3_2_autogen.h"
"src/libGLESv2/entry_points_gles_ext_autogen.cpp"
"src/libGLESv2/entry_points_gles_ext_autogen.h"
"src/libGLESv2/global_state.cpp"
"src/libGLESv2/global_state.h"
"src/libGLESv2/libGLESv2_autogen.cpp"
"src/libGLESv2/proc_table_egl.h"
"src/libGLESv2/proc_table_egl_autogen.cpp"
"src/libGLESv2/resource.h"
"src/libGLESv2/libGLESv2_autogen.def"
)
add_library(libGLESv2 ${LIBGLESV2_SOURCES})
target_link_libraries(libGLESv2 PRIVATE angle::common angle::libANGLE)
target_compile_definitions(libGLESv2
PRIVATE -DLIBGLESV2_IMPLEMENTATION
PUBLIC
"-DGL_GLES_PROTOTYPES=1"
"-DGL_GLEXT_PROTOTYPES"
"-DEGL_EGL_PROTOTYPES=1"
"-DEGL_EGLEXT_PROTOTYPES"
)
if(BUILD_SHARED_LIBS)
else()
if(WIN32)
target_compile_definitions(libGLESv2 PRIVATE
"-DGL_API="
"-DGL_APICALL="
"-DEGLAPI="
)
else()
target_compile_definitions(libGLESv2 PRIVATE
"-DGL_API=__attribute__((visibility(\"default\")))"
"-DGL_APICALL=__attribute__((visibility(\"default\")))"
"-DEGLAPI=__attribute__((visibility(\"default\")))"
)
endif()
endif()
target_include_directories(libGLESv2 PUBLIC "$<INSTALL_INTERFACE:include>")
##########
# libEGL
if(WIN32)
set(libEGL_def
"src/libEGL/libEGL_autogen.def"
)
endif()
add_library(libEGL
"src/libEGL/egl_loader_autogen.h"
"src/libEGL/libEGL_autogen.cpp"
"src/libEGL/resource.h"
"src/libGLESv2/entry_points_egl_autogen.h"
"src/libGLESv2/entry_points_egl_ext_autogen.h"
${libEGL_def}
)
target_link_libraries(libEGL PRIVATE angle::common angle::libANGLE libGLESv2)
target_include_directories(libEGL PUBLIC "$<INSTALL_INTERFACE:include>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>")
target_compile_definitions(libEGL
PRIVATE
"-DLIBEGL_IMPLEMENTATION"
PUBLIC
"-DGL_GLES_PROTOTYPES=1"
"-DGL_GLEXT_PROTOTYPES"
"-DEGL_EGL_PROTOTYPES=1"
"-DEGL_EGLEXT_PROTOTYPES"
)
add_library(GL_VISIBILITY INTERFACE)
if(WIN32)
target_compile_definitions(GL_VISIBILITY INTERFACE
"-DGL_API="
"-DGL_APICALL=")
else()
target_compile_definitions(GL_VISIBILITY INTERFACE
"-DGL_API=__attribute__((visibility(\"default\")))"
"-DGL_APICALL=__attribute__((visibility(\"default\")))")
endif()
target_link_libraries(libEGL PRIVATE GL_VISIBILITY)
target_link_libraries(libGLESv2 PRIVATE GL_VISIBILITY)
if(WIN32)
target_compile_definitions(libEGL PRIVATE
"-DEGLAPI="
)
else()
target_compile_definitions(libEGL PRIVATE
"-DEGLAPI=__attribute__((visibility(\"default\")))"
)
endif()
if(NOT BUILD_SHARED_LIBS)
add_definitions("-DANGLE_EXPORT=" "-DANGLE_UTIL_EXPORT=" "-DEGLAPI=" "-DGL_APICALL=" "-DGL_API=")
endif()
set_target_properties(libANGLE PROPERTIES PREFIX "")
set_target_properties(libGLESv2 PROPERTIES PREFIX "" IMPORT_PREFIX "")
set_target_properties(libEGL PROPERTIES PREFIX "" IMPORT_PREFIX "")
install(TARGETS libEGL libGLESv2 libANGLE angle_common angle_compression_utils angle_image_util angle_gpu_info_util angle_translator angle_preprocessor GL_VISIBILITY EXPORT ANGLEExport
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
if(WINDOWS_DESKTOP)
install(TARGETS angle_renderer_d3d angle_renderer_win32 angle_renderer_opengl EXPORT ANGLEExport
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
elseif(WINDOWS_STORE)
install(TARGETS angle_renderer_d3d angle_renderer_winrt EXPORT ANGLEExport
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
else()
install(TARGETS angle_renderer_opengl EXPORT ANGLEExport
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
endif()
install(EXPORT ANGLEExport FILE unofficial-angle-config.cmake NAMESPACE unofficial::angle:: DESTINATION share/unofficial-angle)
if(NOT DISABLE_INSTALL_HEADERS)
install(
DIRECTORY include/
DESTINATION include
FILES_MATCHING
PATTERN "*.h"
PATTERN "*.inc"
PATTERN "CL" EXCLUDE
PATTERN "GLSLANG" EXCLUDE
PATTERN "egl.h" EXCLUDE
PATTERN "eglext.h" EXCLUDE
PATTERN "eglplatform.h" EXCLUDE
PATTERN "KHR" EXCLUDE
PATTERN "WGL" EXCLUDE
PATTERN "export.h" EXCLUDE
)
endif()

3
externals/vcpkg/ports/angle/angle_commit.h vendored Executable file
View File

@@ -0,0 +1,3 @@
#define ANGLE_COMMIT_HASH "invalid-hash"
#define ANGLE_COMMIT_HASH_SIZE 12
#define ANGLE_COMMIT_DATE "invalid-date"

99
externals/vcpkg/ports/angle/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,99 @@
if (VCPKG_TARGET_IS_LINUX)
message(WARNING "Building with a gcc version less than 6.1 is not supported.")
message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libx11-dev\n libmesa-dev\n libxi-dev\n libxext-dev\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libmesa-dev libxi-dev libxext-dev.")
endif()
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU)
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(ANGLE_CPU_BITNESS ANGLE_IS_64_BIT_CPU)
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU)
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
set(ANGLE_CPU_BITNESS ANGLE_IS_64_BIT_CPU)
else()
message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/angle
REF d15be77864e18f407c317be6f6bc06ee2b7d070a # chromium/4472
SHA512 aad8563ee65458a7865ec7c668d1f90ac2891583c569a22dcd2c557263b72b26386f56b74a7294398be2cf5c548df513159e4be53f3f096f19819ca06227d9ac
# On update check headers against opengl-registry
PATCHES
001-fix-uwp.patch
002-fix-builder-error.patch
003-fix-mingw.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/angle_commit.h DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/angle_commit.h DESTINATION ${SOURCE_PATH}/src/common)
function(checkout_in_path_with_patches PATH URL REF PATCHES)
if(EXISTS "${PATH}")
return()
endif()
vcpkg_from_git(
OUT_SOURCE_PATH DEP_SOURCE_PATH
URL "${URL}"
REF "${REF}"
PATCHES ${PATCHES}
)
file(RENAME "${DEP_SOURCE_PATH}" "${PATH}")
file(REMOVE_RECURSE "${DEP_SOURCE_PATH}")
endfunction()
checkout_in_path_with_patches(
"${SOURCE_PATH}/third_party/zlib"
"https://chromium.googlesource.com/chromium/src/third_party/zlib"
"09490503d0f201b81e03f5ca0ab8ba8ee76d4a8e"
"third-party-zlib-far-undef.patch"
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1
OPTIONS
-D${ANGLE_CPU_BITNESS}=1
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle TARGET_PATH share/unofficial-angle)
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
# File conflict with opengl-registry! Make sure headers are similar on Update!
# angle defines some additional entrypoints.
# opengl-registry probably needs an upstream update to account for those
# Due to that all angle headers get moved to include/angle.
# If you want to use those instead of the onces provided by opengl-registry make sure
# VCPKG_INSTALLED_DIR/include/angle is before VCPKG_INSTALLED_DIR/include
file(GLOB_RECURSE angle_includes "${CURRENT_PACKAGES_DIR}/include")
file(COPY ${angle_includes} DESTINATION "${CURRENT_PACKAGES_DIR}/include/angle")
set(_double_files
include/GLES/egl.h
include/GLES/gl.h
include/GLES/glext.h
include/GLES/glplatform.h
include/GLES2/gl2.h
include/GLES2/gl2ext.h
include/GLES2/gl2platform.h
include/GLES3/gl3.h
include/GLES3/gl31.h
include/GLES3/gl32.h
include/GLES3/gl3platform.h)
foreach(_file ${_double_files})
if(EXISTS "${CURRENT_PACKAGES_DIR}/${_file}")
file(REMOVE "${CURRENT_PACKAGES_DIR}/${_file}")
endif()
endforeach()

View File

@@ -0,0 +1,13 @@
diff --git a/google/compression_utils_portable.h b/google/compression_utils_portable.h
--- a/google/compression_utils_portable.h
+++ b/google/compression_utils_portable.h
@@ -13,6 +13,9 @@
* zlib.
*/
#if defined(USE_SYSTEM_ZLIB)
+# if defined(WIN32) && defined(FAR)
+# undef FAR
+# endif
#include <zlib.h>
/* AOSP build requires relative paths. */
#else

15
externals/vcpkg/ports/angle/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,15 @@
{
"name": "angle",
"version-string": "chromium_4472",
"port-version": 3,
"description": [
"A conformant OpenGL ES implementation for Windows, Mac and Linux.",
"The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support."
],
"homepage": "https://github.com/google/angle",
"dependencies": [
"egl-registry",
"opengl-registry",
"zlib"
]
}