diff options
Diffstat (limited to 'subprojects/packagefiles/libplacebo')
3 files changed, 38 insertions, 58 deletions
diff --git a/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff b/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff new file mode 100644 index 0000000..ba59ad8 --- /dev/null +++ b/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff @@ -0,0 +1,14 @@ +diff --git a/src/d3d11/swapchain.c b/src/d3d11/swapchain.c +index 8a53632..bbe5182 100644 +--- a/src/d3d11/swapchain.c ++++ b/src/d3d11/swapchain.c +@@ -456,7 +456,8 @@ static HRESULT create_swapchain_1_2(struct d3d11_ctx *ctx, + .Format = format, + .SampleDesc.Count = 1, + .BufferUsage = DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT, +- .Flags = params->flags, ++ .Scaling = DXGI_SCALING_NONE, ++ .Flags = params->flags + }; + + if (ID3D11Device_GetFeatureLevel(ctx->dev) >= D3D_FEATURE_LEVEL_11_0) diff --git a/subprojects/packagefiles/libplacebo/dependency_version_override.diff b/subprojects/packagefiles/libplacebo/dependency_version_override.diff new file mode 100644 index 0000000..f9a0688 --- /dev/null +++ b/subprojects/packagefiles/libplacebo/dependency_version_override.diff @@ -0,0 +1,24 @@ +diff --git a/src/d3d11/meson.build b/src/d3d11/meson.build +index d4c4b44..ef96256 100644 +--- a/src/d3d11/meson.build ++++ b/src/d3d11/meson.build +@@ -5,7 +5,7 @@ d3d11_headers_extra = [ # needed internally + cc.check_header('dxgi1_6.h', required: d3d11), + ] + d3d11_deps = [ +- dependency('spirv-cross-c-shared', version: '>=0.29.0', required: d3d11), ++ dependency('spirv-cross-c-shared', required: d3d11), + cc.find_library('version', required: d3d11), + ] + +diff --git a/src/glsl/meson.build b/src/glsl/meson.build +index 8fb5e69..4adfa18 100644 +--- a/src/glsl/meson.build ++++ b/src/glsl/meson.build +@@ -1,5 +1,5 @@ + # shaderc +-shaderc = dependency('shaderc', version: '>=2019.1', required: get_option('shaderc')) ++shaderc = dependency('shaderc', required: get_option('shaderc')) + components.set('shaderc', shaderc.found()) + if shaderc.found() + build_deps += shaderc diff --git a/subprojects/packagefiles/libplacebo/no_dlltool_no_shaderc_version.diff b/subprojects/packagefiles/libplacebo/no_dlltool_no_shaderc_version.diff deleted file mode 100644 index a579431..0000000 --- a/subprojects/packagefiles/libplacebo/no_dlltool_no_shaderc_version.diff +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/src/glsl/meson.build b/src/glsl/meson.build -index 5a88196..d6bb430 100644 ---- a/src/glsl/meson.build -+++ b/src/glsl/meson.build -@@ -1,5 +1,5 @@ - # shaderc --shaderc = dependency('shaderc', version: '>=2019.1', required: get_option('shaderc')) -+shaderc = dependency('shaderc', required: get_option('shaderc')) - components.set('shaderc', shaderc.found()) - if shaderc.found() - build_deps += shaderc -diff --git a/src/meson.build b/src/meson.build -index 6162f8f..f93eb4c 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -18,24 +18,24 @@ link_args = [] - link_depends = [] - - # Looks like meson in certain configuration returns ' ' instead of empty string --mingw32 = cc.get_define('__MINGW32__').strip() --if host_machine.system() == 'windows' and mingw32 != '' and host_machine.cpu() in ['aarch64', 'arm', 'x86_64'] -- # MinGW-w64 math functions are significantly slower than the UCRT ones. -- # In particular powf is over 7 times slower than UCRT counterpart. -- # MinGW-w64 explicitly excludes some math functions from their ucrtbase def -- # file and replaces with own versions. To workaround the issue, generate the -- # import library and link it with UCRT versions of math functions. -- dlltool = find_program('llvm-dlltool', 'dlltool') -- ucrt_math = custom_target('ucrt_math.lib', -- output : ['ucrt_math.lib'], -- input : 'ucrt_math.def', -- command : [dlltool, '-d', '@INPUT@', '-l', '@OUTPUT@']) -- link_args += ucrt_math.full_path() -- link_depends += ucrt_math -- # MinGW-w64 inlines functions like powf, rewriting them to pow. We want to use -- # the powf specialization from UCRT, so disable inlining. -- add_project_arguments(['-D__CRT__NO_INLINE'], language: ['c', 'cpp']) --endif -+#mingw32 = cc.get_define('__MINGW32__').strip() -+#if host_machine.system() == 'windows' and mingw32 != '' and host_machine.cpu() in ['aarch64', 'arm', 'x86_64'] -+# # MinGW-w64 math functions are significantly slower than the UCRT ones. -+# # In particular powf is over 7 times slower than UCRT counterpart. -+# # MinGW-w64 explicitly excludes some math functions from their ucrtbase def -+# # file and replaces with own versions. To workaround the issue, generate the -+# # import library and link it with UCRT versions of math functions. -+# dlltool = find_program('llvm-dlltool', 'dlltool') -+# ucrt_math = custom_target('ucrt_math.lib', -+# output : ['ucrt_math.lib'], -+# input : 'ucrt_math.def', -+# command : [dlltool, '-d', '@INPUT@', '-l', '@OUTPUT@']) -+# link_args += ucrt_math.full_path() -+# link_depends += ucrt_math -+# # MinGW-w64 inlines functions like powf, rewriting them to pow. We want to use -+# # the powf specialization from UCRT, so disable inlining. -+# add_project_arguments(['-D__CRT__NO_INLINE'], language: ['c', 'cpp']) -+#endif - - # Work around missing atomics on some (obscure) platforms - atomic_test = ''' |