History

x86/vf_blend: fix warnings about trailing empty parameters

Finishes fixing ticket #8771

James Almer committed 6 years ago

Commit 320694f1 parent 2c844c91 file · +17 −17Browse files

Unified · Split

libavfilter/x86/vf_blend.asm+17−17
@@ -38,11 +38,11 @@ pb_255: times 16 db 255 · 37 unmodified lines
38 38
39SECTION .text39SECTION .text
40 40
41%macro BLEND_INIT 2-341%macro BLEND_INIT 2-3 0
42%if ARCH_X86_6442%if ARCH_X86_64
43cglobal blend_%1, 6, 9, %2, top, top_linesize, bottom, bottom_linesize, dst, dst_linesize, width, end, x43cglobal blend_%1, 6, 9, %2, top, top_linesize, bottom, bottom_linesize, dst, dst_linesize, width, end, x
44 mov widthd, dword widthm44 mov widthd, dword widthm
45 %if %0 == 3; is 16 bit45 %if %3; is 16 bit
46 add widthq, widthq ; doesn't compile on x86_3246 add widthq, widthq ; doesn't compile on x86_32
47 %endif47 %endif
48%else48%else
@@ -66,7 +66,7 @@ cglobal blend_%1, 5, 7, %2, top, top_linesize, bottom, bottom_linesize, dst, end · 17 unmodified lines
66REP_RET66REP_RET
67%endmacro67%endmacro
68 68
69%macro BLEND_SIMPLE 2-369%macro BLEND_SIMPLE 2-3 0
70BLEND_INIT %1, 2, %370BLEND_INIT %1, 2, %3
71.nextrow:71.nextrow:
72 mov xq, widthq72 mov xq, widthq
@@ -82,10 +82,10 @@ BLEND_END · 9 unmodified lines
82%endmacro82%endmacro
83 83
84; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)84; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)
85%macro GRAINEXTRACT 3-485%macro GRAINEXTRACT 3-4 0
86BLEND_INIT %1, 6, %486BLEND_INIT %1, 6, %4
87 pxor m4, m487 pxor m4, m4
88%if %0 == 4 ; 16 bit88%if %4 ; 16 bit
89 VBROADCASTI128 m5, [pd_32768]89 VBROADCASTI128 m5, [pd_32768]
90%else90%else
91 VBROADCASTI128 m5, [pw_128]91 VBROADCASTI128 m5, [pw_128]
@@ -182,7 +182,7 @@ BLEND_END · 90 unmodified lines
182%endmacro182%endmacro
183 183
184;%1 name, %2 (b or w), %3 (set if 16 bit)184;%1 name, %2 (b or w), %3 (set if 16 bit)
185%macro AVERAGE 2-3185%macro AVERAGE 2-3 0
186BLEND_INIT %1, 3, %3186BLEND_INIT %1, 3, %3
187 pcmpeqb m2, m2187 pcmpeqb m2, m2
188 188
@@ -203,10 +203,10 @@ BLEND_END · 14 unmodified lines
203%endmacro203%endmacro
204 204
205; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)205; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)
206%macro GRAINMERGE 3-4206%macro GRAINMERGE 3-4 0
207BLEND_INIT %1, 6, %4207BLEND_INIT %1, 6, %4
208 pxor m4, m4208 pxor m4, m4
209%if %0 == 4 ; 16 bit209%if %4 ; 16 bit
210 VBROADCASTI128 m5, [pd_32768]210 VBROADCASTI128 m5, [pd_32768]
211%else211%else
212 VBROADCASTI128 m5, [pw_128]212 VBROADCASTI128 m5, [pw_128]
@@ -288,7 +288,7 @@ BLEND_INIT divide, 4 · 75 unmodified lines
288BLEND_END288BLEND_END
289%endmacro289%endmacro
290 290
291%macro PHOENIX 2-3291%macro PHOENIX 2-3 0
292; %1 name, %2 b or w, %3 (opt) 1 if 16 bit292; %1 name, %2 b or w, %3 (opt) 1 if 16 bit
293BLEND_INIT %1, 4, %3293BLEND_INIT %1, 4, %3
294 VBROADCASTI128 m3, [pb_255]294 VBROADCASTI128 m3, [pb_255]
@@ -311,7 +311,7 @@ BLEND_END · 16 unmodified lines
311%endmacro311%endmacro
312 312
313; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)313; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)
314%macro DIFFERENCE 3-4314%macro DIFFERENCE 3-4 0
315BLEND_INIT %1, 5, %4315BLEND_INIT %1, 5, %4
316 pxor m2, m2316 pxor m2, m2
317.nextrow:317.nextrow:
@@ -326,7 +326,7 @@ BLEND_INIT %1, 5, %4 · 8 unmodified lines
326 punpckl%2%3 m1, m2326 punpckl%2%3 m1, m2
327 psub%3 m0, m1327 psub%3 m0, m1
328 psub%3 m3, m4328 psub%3 m3, m4
329%if %0 == 4; 16 bit329%if %4; 16 bit
330 pabsd m0, m0330 pabsd m0, m0
331 pabsd m3, m3331 pabsd m3, m3
332%else332%else
@@ -340,10 +340,10 @@ BLEND_END · 7 unmodified lines
340%endmacro340%endmacro
341 341
342; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)342; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit)
343%macro EXTREMITY 3-4343%macro EXTREMITY 3-4 0
344BLEND_INIT %1, 8, %4344BLEND_INIT %1, 8, %4
345 pxor m2, m2345 pxor m2, m2
346%if %0 == 4; 16 bit346%if %4; 16 bit
347 VBROADCASTI128 m4, [pd_65535]347 VBROADCASTI128 m4, [pd_65535]
348%else348%else
349 VBROADCASTI128 m4, [pw_255]349 VBROADCASTI128 m4, [pw_255]
@@ -362,7 +362,7 @@ BLEND_INIT %1, 8, %4 · 12 unmodified lines
362 psub%3 m7, m4, m5362 psub%3 m7, m4, m5
363 psub%3 m3, m1363 psub%3 m3, m1
364 psub%3 m7, m6364 psub%3 m7, m6
365%if %0 == 4; 16 bit365%if %4; 16 bit
366 pabsd m3, m3366 pabsd m3, m3
367 pabsd m7, m7367 pabsd m7, m7
368%else368%else
@@ -375,10 +375,10 @@ BLEND_INIT %1, 8, %4 · 6 unmodified lines
375BLEND_END375BLEND_END
376%endmacro376%endmacro
377 377
378%macro NEGATION 3-4378%macro NEGATION 3-4 0
379BLEND_INIT %1, 8, %4379BLEND_INIT %1, 8, %4
380 pxor m2, m2380 pxor m2, m2
381%if %0 == 4; 16 bit381%if %4; 16 bit
382 VBROADCASTI128 m4, [pd_65535]382 VBROADCASTI128 m4, [pd_65535]
383%else383%else
384 VBROADCASTI128 m4, [pw_255]384 VBROADCASTI128 m4, [pw_255]
@@ -397,7 +397,7 @@ BLEND_INIT %1, 8, %4 · 12 unmodified lines
397 psub%3 m7, m4, m5397 psub%3 m7, m4, m5
398 psub%3 m3, m1398 psub%3 m3, m1
399 psub%3 m7, m6399 psub%3 m7, m6
400%if %0 == 4; 16 bit400%if %4; 16 bit
401 pabsd m3, m3401 pabsd m3, m3
402 pabsd m7, m7402 pabsd m7, m7
403%else403%else

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t