Leigh Scott
4 years ago
parent
88168a6851
commit
59bfd6c3be
@ -1,33 +0,0 @@
|
|||||||
From 98ea1a662ee172961feaa374fe8d26078838d250 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Philip Langdale <philipl@overt.org>
|
|
||||||
Date: Mon, 17 Aug 2020 16:19:39 -0700
|
|
||||||
Subject: [PATCH] configure: Add additional glslang libraries to make linking
|
|
||||||
work
|
|
||||||
|
|
||||||
The latest builds of glslang introduce new libraries that need to be
|
|
||||||
linked for all symbols to be fully resolved.
|
|
||||||
|
|
||||||
This change will break building against older installations of glslang
|
|
||||||
and it's very hard to tell them apart as the library change upstream
|
|
||||||
was not accompanied by any version bump and no official release has
|
|
||||||
been made with this change it - just lots of people packaging up git
|
|
||||||
snapshots. So, apologies in advance.
|
|
||||||
---
|
|
||||||
configure | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/configure b/configure
|
|
||||||
index 9ff246b..f13d1a8 100755
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -6308,7 +6308,7 @@ enabled fontconfig && enable libfontconfig
|
|
||||||
enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
|
|
||||||
enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
|
|
||||||
enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
|
|
||||||
-enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
|
|
||||||
+enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
|
|
||||||
enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
|
|
||||||
require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
|
|
||||||
enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff_plain/6f84e92172a12f14d24c4467b2e58611afd726bd..4dab04622a6cf2a31da26a51dedb60ec44ac89a4:/libavfilter/glslang.cpp
|
|
||||||
|
|
||||||
diff --git a/libavfilter/glslang.cpp b/libavfilter/glslang.cpp
|
|
||||||
index 497df6e..125eb5c 100644
|
|
||||||
--- a/libavfilter/glslang.cpp
|
|
||||||
+++ b/libavfilter/glslang.cpp
|
|
||||||
@@ -24,7 +24,6 @@ extern "C" {
|
|
||||||
}
|
|
||||||
|
|
||||||
#include <glslang/Include/ResourceLimits.h>
|
|
||||||
-#include <glslang/Include/revision.h>
|
|
||||||
#include <glslang/Public/ShaderLang.h>
|
|
||||||
#include <glslang/SPIRV/GlslangToSpv.h>
|
|
||||||
|
|
||||||
@ -1,101 +0,0 @@
|
|||||||
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff_plain/3205ed31a7756ae563301e2f5a5dd2c853b20349..0b2b03568f22fdb361d9a44c262bfb9269335f80:/libavutil/x86/x86inc.asm
|
|
||||||
|
|
||||||
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm
|
|
||||||
index 5044ee8..01c35e3 100644
|
|
||||||
--- a/libavutil/x86/x86inc.asm
|
|
||||||
+++ b/libavutil/x86/x86inc.asm
|
|
||||||
@@ -411,16 +411,6 @@ DECLARE_REG_TMP_SIZE 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14
|
|
||||||
%endif
|
|
||||||
%endmacro
|
|
||||||
|
|
||||||
-%macro DEFINE_ARGS_INTERNAL 3+
|
|
||||||
- %ifnum %2
|
|
||||||
- DEFINE_ARGS %3
|
|
||||||
- %elif %1 == 4
|
|
||||||
- DEFINE_ARGS %2
|
|
||||||
- %elif %1 > 4
|
|
||||||
- DEFINE_ARGS %2, %3
|
|
||||||
- %endif
|
|
||||||
-%endmacro
|
|
||||||
-
|
|
||||||
%if WIN64 ; Windows x64 ;=================================================
|
|
||||||
|
|
||||||
DECLARE_REG 0, rcx
|
|
||||||
@@ -439,7 +429,7 @@ DECLARE_REG 12, R15, 104
|
|
||||||
DECLARE_REG 13, R12, 112
|
|
||||||
DECLARE_REG 14, R13, 120
|
|
||||||
|
|
||||||
-%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
|
|
||||||
+%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
|
|
||||||
%assign num_args %1
|
|
||||||
%assign regs_used %2
|
|
||||||
ASSERT regs_used >= num_args
|
|
||||||
@@ -451,7 +441,15 @@ DECLARE_REG 14, R13, 120
|
|
||||||
WIN64_SPILL_XMM %3
|
|
||||||
%endif
|
|
||||||
LOAD_IF_USED 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
|
|
||||||
- DEFINE_ARGS_INTERNAL %0, %4, %5
|
|
||||||
+ %if %0 > 4
|
|
||||||
+ %ifnum %4
|
|
||||||
+ DEFINE_ARGS %5
|
|
||||||
+ %else
|
|
||||||
+ DEFINE_ARGS %4, %5
|
|
||||||
+ %endif
|
|
||||||
+ %elifnnum %4
|
|
||||||
+ DEFINE_ARGS %4
|
|
||||||
+ %endif
|
|
||||||
%endmacro
|
|
||||||
|
|
||||||
%macro WIN64_PUSH_XMM 0
|
|
||||||
@@ -547,7 +545,7 @@ DECLARE_REG 12, R15, 56
|
|
||||||
DECLARE_REG 13, R12, 64
|
|
||||||
DECLARE_REG 14, R13, 72
|
|
||||||
|
|
||||||
-%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
|
|
||||||
+%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
|
|
||||||
%assign num_args %1
|
|
||||||
%assign regs_used %2
|
|
||||||
%assign xmm_regs_used %3
|
|
||||||
@@ -557,7 +555,15 @@ DECLARE_REG 14, R13, 72
|
|
||||||
PUSH_IF_USED 9, 10, 11, 12, 13, 14
|
|
||||||
ALLOC_STACK %4
|
|
||||||
LOAD_IF_USED 6, 7, 8, 9, 10, 11, 12, 13, 14
|
|
||||||
- DEFINE_ARGS_INTERNAL %0, %4, %5
|
|
||||||
+ %if %0 > 4
|
|
||||||
+ %ifnum %4
|
|
||||||
+ DEFINE_ARGS %5
|
|
||||||
+ %else
|
|
||||||
+ DEFINE_ARGS %4, %5
|
|
||||||
+ %endif
|
|
||||||
+ %elifnnum %4
|
|
||||||
+ DEFINE_ARGS %4
|
|
||||||
+ %endif
|
|
||||||
%endmacro
|
|
||||||
|
|
||||||
%define has_epilogue regs_used > 9 || stack_size > 0 || vzeroupper_required
|
|
||||||
@@ -598,7 +604,7 @@ DECLARE_REG 6, ebp, 28
|
|
||||||
|
|
||||||
DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
|
|
||||||
|
|
||||||
-%macro PROLOGUE 2-5+ ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
|
|
||||||
+%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
|
|
||||||
%assign num_args %1
|
|
||||||
%assign regs_used %2
|
|
||||||
ASSERT regs_used >= num_args
|
|
||||||
@@ -613,7 +619,15 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
|
|
||||||
PUSH_IF_USED 3, 4, 5, 6
|
|
||||||
ALLOC_STACK %4
|
|
||||||
LOAD_IF_USED 0, 1, 2, 3, 4, 5, 6
|
|
||||||
- DEFINE_ARGS_INTERNAL %0, %4, %5
|
|
||||||
+ %if %0 > 4
|
|
||||||
+ %ifnum %4
|
|
||||||
+ DEFINE_ARGS %5
|
|
||||||
+ %else
|
|
||||||
+ DEFINE_ARGS %4, %5
|
|
||||||
+ %endif
|
|
||||||
+ %elifnnum %4
|
|
||||||
+ DEFINE_ARGS %4
|
|
||||||
+ %endif
|
|
||||||
%endmacro
|
|
||||||
|
|
||||||
%define has_epilogue regs_used > 3 || stack_size > 0 || vzeroupper_required
|
|
||||||
@ -1 +1 @@
|
|||||||
SHA512 (ffmpeg-4.3.1.tar.xz) = 64e1052c45145e27726e43d4fe49c9a92058e55562d34fd3b3adf54d3506e6bd680f016b748828215e1bfc8ce19aa85b6f7e4eb05fafe21479118a4ad528a81f
|
SHA512 (ffmpeg-20201231.tar.bz2) = f64087aa8222d3d7817a969abe80aa3bd769685432b5e28220a5e8d7482278b7b65745df6ad56ebe37e7eb2c2438c50b6856bad3ed9f8e2b9f1e41eafffe60a3
|
||||||
|
|||||||
@ -1,15 +0,0 @@
|
|||||||
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff_plain/320694ff84a609c5b0438c1f10da355cb48a0be3..55e1bc39cb3e485e5b0b6b13a41a2fd6f18ed3af:/tests/checkasm/vf_blend.c
|
|
||||||
|
|
||||||
diff --git a/tests/checkasm/vf_blend.c b/tests/checkasm/vf_blend.c
|
|
||||||
index a7578fe..bdd21d4 100644
|
|
||||||
--- a/tests/checkasm/vf_blend.c
|
|
||||||
+++ b/tests/checkasm/vf_blend.c
|
|
||||||
@@ -99,7 +99,7 @@ void checkasm_check_blend(void)
|
|
||||||
|
|
||||||
#define check_and_report(name, val, depth) \
|
|
||||||
param.mode = val; \
|
|
||||||
- ff_blend_init(¶m, depth - 1); \
|
|
||||||
+ ff_blend_init(¶m, depth * 8); \
|
|
||||||
if (check_func(param.blend, #name)) \
|
|
||||||
check_blend_func(depth);
|
|
||||||
|
|
||||||
Loading…
Reference in new issue