From patchwork Thu Jul 9 14:53:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20915 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3C5B444B990 for ; Thu, 9 Jul 2020 17:59:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0760D68B375; Thu, 9 Jul 2020 17:59:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC14A687F1D for ; Thu, 9 Jul 2020 17:59:40 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id f2so937434plr.8 for ; Thu, 09 Jul 2020 07:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=OKes569whygP1mAY6M3uoMWlwQkaVppKgUjJvMSpnQw=; b=qFjsPEs3qZoEIRGrMR1O20l2qSjpycSFYXeDmQAAS0goFp6AdrXoG23xbcHz4uksFN iBpuuTPo34JoRth6HNDGze85QM9dzFTCHORX7XT60t/kwNfE8pQJ+gXupS9LNRn2UVfa MWJqeL1iotRzwo5+CtP+fHjZ+Hv0kPBK1I9pR9cdabR/yW0zEvkrB6IHQmdpxHN0Q5yd r0t5UWSo3xFczQYmVW4YSNtoKFHc1/zBPQFC8wSzpsBSkHdJgt7cDcBPd9brsahlCNBQ Z+6KVglqzQoiUYN2lpPr3a4iqCeZ+QXyYpx3j3G2Nxd/YIdkLDpCHZcdZ1suLcpu0qH0 6zQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=OKes569whygP1mAY6M3uoMWlwQkaVppKgUjJvMSpnQw=; b=IwEY20GAx/ydlvQ57jNBw9eOVNjs1csv72udvxc7swISB1qLLGMe0s0v3P192t9uQC BmyeO+HO3iGYBswP4OSb+t5cNoQfFoTp1cr0JJ4aKSUkzAgaxVND+3ZDPGaifMrr91UO xKEmlRK6KbO31yST0iairhR0Y3IE7GNFwnZd9uqd+55zlTRIkDQ095jwlf1gQongvpLG EAoFybPOKonNpgLJP8Y2C8HgfPKysB/LhA90oFriIxwSfMU46i0pQXQClRDXRo7Zrcuc +FZb9skhoZ93FaTmzVpFZgVUjEdpHvPUdpcJ0Vh/ablKE1iAxGFqyo1zczC874xuYpYy s3jw== X-Gm-Message-State: AOAM532oaxYFbkoA2iTYoY3BPk9ZPORSXHnQy9GiR3Z7dqj7ovJd7U4y a4Z8q8KcIluM+5dSujjPnOzflcp2 X-Google-Smtp-Source: ABdhPJwuOa68hUe4fHqvJEH53ra/+TqjKJOTDuNvQCgMwpWvybilPPgrOn1hxI4BB1k1cqkQnI6G4Q== X-Received: by 2002:a0c:f345:: with SMTP id e5mr50428846qvm.84.1594306428330; Thu, 09 Jul 2020 07:53:48 -0700 (PDT) Received: from localhost.localdomain ([191.84.244.216]) by smtp.gmail.com with ESMTPSA id x13sm3697927qkx.10.2020.07.09.07.53.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 07:53:47 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jul 2020 11:53:23 -0300 Message-Id: <20200709145325.7812-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avutil/x86inc: fix warnings when assembling with Nasm 2.15 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Henrik Gramner Some new warnings regarding use of empty macro parameters has been added, so adjust some x86inc code to silence those Signed-off-by: James Almer --- libavutil/x86/x86inc.asm | 46 ++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 5044ee86f0..01c35e3a4b 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 From patchwork Thu Jul 9 14:53:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20913 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9398544A4D8 for ; Thu, 9 Jul 2020 17:53:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6BCAF68B5EF; Thu, 9 Jul 2020 17:53:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D65868B5C3 for ; Thu, 9 Jul 2020 17:53:51 +0300 (EEST) Received: by mail-qv1-f45.google.com with SMTP id di5so1039856qvb.11 for ; Thu, 09 Jul 2020 07:53:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BenEUgpxrUZmyG1GJaGVN07Iph0OOfj6BhrgSygLtHo=; b=gizjGf/QzxOc/ekDDB1wWFI5Nf66GotFmn4FpiGYQAgWQ90zZmKsvxkxz/sEFalaO3 8Wjeq/sGVsfIbrorO4+1NO44XkNSYHwNPjEHYayFOqr7cStqC6sP+1ML6fKtFSupXZhg MPno1TptNVUVW7Xcx73AYjVDpjzmG3qSdbo7PkXWG1dikJYV2kw3H+ePv7pQMn193+A0 S2vgfKbop36ctxGqNjvJawkrR2CSNK+cVNZvsnT/dYB1zTDmZ9yUGz72rdV0OgGuhx+3 YSQEPV/g9bReQS4Nrx7vE/mp29lycpCImt/auOZfmttIsf8ijeLxj02uy/JTGzxX6d6l 02kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BenEUgpxrUZmyG1GJaGVN07Iph0OOfj6BhrgSygLtHo=; b=I2/ub4ywp7yfR+urZYtp9PHHWgzt+p60A13JH1XHQfJxxOawHuQa5Uhe2Yv/dXKE8X YSjAuMc4vC/XVuLQWvgJrfDPf9GsJnhN+IjtimKqCQd/9hdgZ9+mWP0gsDxBrL7rsdfs 5STXMBb7dT4hW4CnspJkbDipbGwfjnUGb/WN3YBUbuJsgOjrJkDjjGw6LS84ohkw+4/1 8zCNeCDa0ZhPmc8AIQu536I8X4qsybv2ka493iLcqy0kstOb6/Kcpip6NphGi02Ewt4m rokdaI+GfuECogOvy5oPM8OP0RLi17tJ/aRfOPGKbJzVYuaLeKCeLfSfy7mUymvFR8lZ l3og== X-Gm-Message-State: AOAM532LfqiWCH/yGWFvbbWfxbZ9xWFPemcw/OpT0lzCQ2Gmt1TAjB2b 9Hkh13eDtGQzIkO7SGLHBke7Ncsd X-Google-Smtp-Source: ABdhPJwniQ3/NsnUOjP1MiSyEwKbpq8Ib1SJX4AdP9m7zlOKA6lSLJVS2LqaBt2ishu/zBU2ujiGWw== X-Received: by 2002:a0c:fc02:: with SMTP id z2mr50040733qvo.1.1594306430001; Thu, 09 Jul 2020 07:53:50 -0700 (PDT) Received: from localhost.localdomain ([191.84.244.216]) by smtp.gmail.com with ESMTPSA id x13sm3697927qkx.10.2020.07.09.07.53.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 07:53:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jul 2020 11:53:24 -0300 Message-Id: <20200709145325.7812-2-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200709145325.7812-1-jamrial@gmail.com> References: <20200709145325.7812-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] x86/h264_deblock: fix warnings about trailing empty parameters X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavcodec/x86/h264_deblock.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index 6702ae98d4..a2e745cd8e 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -1185,7 +1185,7 @@ cglobal deblock_h_chroma_8, 5, 7, 8, 0-16, pix_, stride_, alpha_, beta_, tc0_ STORE_8_ROWS PASS8ROWS(pix_q - 2, r5 - 2, stride_q, r6) RET -cglobal deblock_h_chroma422_8, 5, 7, 8, 0-16, pix_, stride_, alpha_, beta_, tc0_, +cglobal deblock_h_chroma422_8, 5, 7, 8, 0-16, pix_, stride_, alpha_, beta_, tc0_ CHROMA_H_START_XMM r5, r6 LOAD_8_ROWS PASS8ROWS(pix_q - 2, r5 - 2, stride_q, r6) TRANSPOSE_8x4B_XMM From patchwork Thu Jul 9 14:53:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20914 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8457644A4D8 for ; Thu, 9 Jul 2020 17:53:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6DEF568B5EE; Thu, 9 Jul 2020 17:53:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83F3468B5C3 for ; Thu, 9 Jul 2020 17:53:53 +0300 (EEST) Received: by mail-qt1-f181.google.com with SMTP id u12so1820642qth.12 for ; Thu, 09 Jul 2020 07:53:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Rllx8fHKZT4Mx/5fBSyucTKmi+Feu7z2i4nIldAfjDM=; b=MTHt3vHiYFikG56a//pFtJXYzRYN2cR8Gz59H3yn6pL6WfseyWPKxvBiO1Dtu5fhvk pWwOkQAqEp8fP/h0GiGvHaiwZ5iSx4y24zeJP2NzN6ic8l0q6k9mgjTV2SgTyFloZwie GPD+A/KJsVhqL5RB7oW3l+Ebt60p3aRVz/Ug96cLzXp7fx1MQ/39yk+Z7IwggEtPGBse aSWRyA6ZRqIYsx2GYdR/AlMZjehgBvYJ3bNU3QX5qZkyebaYOMl5J7QQm3ux9CSNKBM/ DpYRLddwCGcD8dC6pRJPcO3eJlYZFH0AwLUXQlsxW9VV847iouUPfJk61XcvJDc5mQzT /Daw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rllx8fHKZT4Mx/5fBSyucTKmi+Feu7z2i4nIldAfjDM=; b=kRgk1HJfehTO6KfhGfC7Qo3WI/HlTEmixL58A9PEiIMvVdFsbCYysx6xpVA499sWGs nNf9bdcNcUXt7njmuPAkKEfA2+yZ10Lma4UiQtxOnX680BKsMYWQnz9iTj7StHfG9uHN WelV4mxeOIfOR/POyVfXduyku3tb4SF04+pZ1Jvx3yNBUGWKqkfo5DSePxdyq/fdy3EO WwV0244vFkz5Ha+Z7Q8NsySxGbECAB0PJLuX0In+vREWds063K9g3HrEUfdAMIQRl9hY 1ByM6/3Og8YU4SSNeOtpQUR33hKbiAbaFkwrylQc8sJ4nKaytKrArWdDuqA6yt2y+FCJ erbQ== X-Gm-Message-State: AOAM5330cN20CmSr7tO1EG/j+bn9RnHsV98NZRue4C51b/JWbBPe4Wo1 AHeB2UPyVLt0dNgptCckkKZZd9vL X-Google-Smtp-Source: ABdhPJzGfhUEzkN1rl7OPJxQ+aHP3zQrDdRY8ixlFgdSjvIipxTJ3dG/vURpQ7n/frUeb8zQ7l7xXQ== X-Received: by 2002:ac8:409c:: with SMTP id p28mr41511404qtl.103.1594306431398; Thu, 09 Jul 2020 07:53:51 -0700 (PDT) Received: from localhost.localdomain ([191.84.244.216]) by smtp.gmail.com with ESMTPSA id x13sm3697927qkx.10.2020.07.09.07.53.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 07:53:50 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jul 2020 11:53:25 -0300 Message-Id: <20200709145325.7812-3-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200709145325.7812-1-jamrial@gmail.com> References: <20200709145325.7812-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] x86/vf_blend: fix warnings about trailing empty parameters X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavfilter/x86/vf_blend.asm | 90 ++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/libavfilter/x86/vf_blend.asm b/libavfilter/x86/vf_blend.asm index 251bbb5a12..77a6ed04c7 100644 --- a/libavfilter/x86/vf_blend.asm +++ b/libavfilter/x86/vf_blend.asm @@ -38,7 +38,7 @@ pb_255: times 16 db 255 SECTION .text -%macro BLEND_INIT 2-3 +%macro BLEND_INIT 2 %if ARCH_X86_64 cglobal blend_%1, 6, 9, %2, top, top_linesize, bottom, bottom_linesize, dst, dst_linesize, width, end, x mov widthd, dword widthm @@ -66,8 +66,8 @@ cglobal blend_%1, 5, 7, %2, top, top_linesize, bottom, bottom_linesize, dst, end REP_RET %endmacro -%macro BLEND_SIMPLE 2-3 -BLEND_INIT %1, 2, %3 +%macro BLEND_SIMPLE 2 +BLEND_INIT %1, 2 .nextrow: mov xq, widthq @@ -82,8 +82,8 @@ BLEND_END %endmacro ; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit) -%macro GRAINEXTRACT 3-4 -BLEND_INIT %1, 6, %4 +%macro GRAINEXTRACT 3 +BLEND_INIT %1, 6 pxor m4, m4 %if %0 == 4 ; 16 bit VBROADCASTI128 m5, [pd_32768] @@ -182,8 +182,8 @@ BLEND_END %endmacro ;%1 name, %2 (b or w), %3 (set if 16 bit) -%macro AVERAGE 2-3 -BLEND_INIT %1, 3, %3 +%macro AVERAGE 2 +BLEND_INIT %1, 3 pcmpeqb m2, m2 .nextrow: @@ -203,8 +203,8 @@ BLEND_END %endmacro ; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit) -%macro GRAINMERGE 3-4 -BLEND_INIT %1, 6, %4 +%macro GRAINMERGE 3 +BLEND_INIT %1, 6 pxor m4, m4 %if %0 == 4 ; 16 bit VBROADCASTI128 m5, [pd_32768] @@ -288,9 +288,9 @@ BLEND_INIT divide, 4 BLEND_END %endmacro -%macro PHOENIX 2-3 +%macro PHOENIX 2 ; %1 name, %2 b or w, %3 (opt) 1 if 16 bit -BLEND_INIT %1, 4, %3 +BLEND_INIT %1, 4 VBROADCASTI128 m3, [pb_255] .nextrow: mov xq, widthq @@ -311,8 +311,8 @@ BLEND_END %endmacro ; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit) -%macro DIFFERENCE 3-4 -BLEND_INIT %1, 5, %4 +%macro DIFFERENCE 3 +BLEND_INIT %1, 5 pxor m2, m2 .nextrow: mov xq, widthq @@ -340,8 +340,8 @@ BLEND_END %endmacro ; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit) -%macro EXTREMITY 3-4 -BLEND_INIT %1, 8, %4 +%macro EXTREMITY 3 +BLEND_INIT %1, 8 pxor m2, m2 %if %0 == 4; 16 bit VBROADCASTI128 m4, [pd_65535] @@ -375,8 +375,8 @@ BLEND_INIT %1, 8, %4 BLEND_END %endmacro -%macro NEGATION 3-4 -BLEND_INIT %1, 8, %4 +%macro NEGATION 3 +BLEND_INIT %1, 8 pxor m2, m2 %if %0 == 4; 16 bit VBROADCASTI128 m4, [pd_65535] @@ -433,12 +433,12 @@ EXTREMITY extremity, b, w NEGATION negation, b, w %if ARCH_X86_64 -BLEND_SIMPLE addition_16, addusw, 1 -BLEND_SIMPLE and_16, and, 1 -BLEND_SIMPLE or_16, or, 1 -BLEND_SIMPLE subtract_16, subusw, 1 -BLEND_SIMPLE xor_16, xor, 1 -AVERAGE average_16, w, 1 +BLEND_SIMPLE addition_16, addusw +BLEND_SIMPLE and_16, and +BLEND_SIMPLE or_16, or +BLEND_SIMPLE subtract_16, subusw +BLEND_SIMPLE xor_16, xor +AVERAGE average_16, w %endif INIT_XMM ssse3 @@ -448,14 +448,14 @@ NEGATION negation, b, w INIT_XMM sse4 %if ARCH_X86_64 -BLEND_SIMPLE darken_16, minuw, 1 -BLEND_SIMPLE lighten_16, maxuw, 1 -GRAINEXTRACT grainextract_16, w, d, 1 -GRAINMERGE grainmerge_16, w, d, 1 -PHOENIX phoenix_16, w, 1 -DIFFERENCE difference_16, w, d, 1 -EXTREMITY extremity_16, w, d, 1 -NEGATION negation_16, w, d, 1 +BLEND_SIMPLE darken_16, minuw +BLEND_SIMPLE lighten_16, maxuw +GRAINEXTRACT grainextract_16, w, d +GRAINMERGE grainmerge_16, w, d +PHOENIX phoenix_16, w +DIFFERENCE difference_16, w, d +EXTREMITY extremity_16, w, d +NEGATION negation_16, w, d %endif %if HAVE_AVX2_EXTERNAL @@ -480,19 +480,19 @@ EXTREMITY extremity, b, w NEGATION negation, b, w %if ARCH_X86_64 -BLEND_SIMPLE addition_16, addusw, 1 -BLEND_SIMPLE and_16, and, 1 -BLEND_SIMPLE darken_16, minuw, 1 -BLEND_SIMPLE lighten_16, maxuw, 1 -BLEND_SIMPLE or_16, or, 1 -BLEND_SIMPLE subtract_16, subusw, 1 -BLEND_SIMPLE xor_16, xor, 1 -GRAINEXTRACT grainextract_16, w, d, 1 -AVERAGE average_16, w, 1 -GRAINMERGE grainmerge_16, w, d, 1 -PHOENIX phoenix_16, w, 1 -DIFFERENCE difference_16, w, d, 1 -EXTREMITY extremity_16, w, d, 1 -NEGATION negation_16, w, d, 1 +BLEND_SIMPLE addition_16, addusw +BLEND_SIMPLE and_16, and +BLEND_SIMPLE darken_16, minuw +BLEND_SIMPLE lighten_16, maxuw +BLEND_SIMPLE or_16, or +BLEND_SIMPLE subtract_16, subusw +BLEND_SIMPLE xor_16, xor +GRAINEXTRACT grainextract_16, w, d +AVERAGE average_16, w +GRAINMERGE grainmerge_16, w, d +PHOENIX phoenix_16, w +DIFFERENCE difference_16, w, d +EXTREMITY extremity_16, w, d +NEGATION negation_16, w, d %endif %endif