diff options
Diffstat (limited to 'src')
26 files changed, 48 insertions, 48 deletions
diff --git a/src/render_program/Makefile.am b/src/render_program/Makefile.am index 7b835e1a..44936734 100644 --- a/src/render_program/Makefile.am +++ b/src/render_program/Makefile.am @@ -15,7 +15,7 @@ INTEL_G4A = \ exa_wm_ca.g4a \ exa_wm_ca_srcalpha.g4a \ exa_wm_write.g4a \ - exa_wm_yuv_rgb.g4a \ + exa_wm_yuv_rgb_bt601.g4a \ exa_wm_xy.g4a \ $(NULL) @@ -45,7 +45,7 @@ INTEL_G4B = \ exa_wm_ca.g4b \ exa_wm_ca_srcalpha.g4b \ exa_wm_write.g4b \ - exa_wm_yuv_rgb.g4b \ + exa_wm_yuv_rgb_bt601.g4b \ exa_wm_xy.g4b \ $(NULL) @@ -67,7 +67,7 @@ INTEL_G4B_GEN5 = \ exa_wm_ca.g4b.gen5 \ exa_wm_ca_srcalpha.g4b.gen5 \ exa_wm_write.g4b.gen5 \ - exa_wm_yuv_rgb.g4b.gen5 \ + exa_wm_yuv_rgb_bt601.g4b.gen5 \ exa_wm_xy.g4b.gen5 \ $(NULL) @@ -88,7 +88,7 @@ INTEL_G5A = \ exa_wm_ca.g5a \ exa_wm_ca_srcalpha.g5a \ exa_wm_write.g5a \ - exa_wm_yuv_rgb.g5a \ + exa_wm_yuv_rgb_bt601.g5a \ exa_wm_xy.g5a \ $(NULL) @@ -109,7 +109,7 @@ INTEL_G5B = \ exa_wm_ca.g5b \ exa_wm_ca_srcalpha.g5b \ exa_wm_write.g5b \ - exa_wm_yuv_rgb.g5b \ + exa_wm_yuv_rgb_bt601.g5b \ exa_wm_xy.g5b \ $(NULL) @@ -133,7 +133,7 @@ INTEL_G6A = \ exa_wm_ca_srcalpha.g6a \ exa_wm_noca.g6a \ exa_wm_write.g6a \ - exa_wm_yuv_rgb.g6a \ + exa_wm_yuv_rgb_bt601.g6a \ $(NULL) INTEL_G6B = \ @@ -151,7 +151,7 @@ INTEL_G6B = \ exa_wm_ca_srcalpha.g6b \ exa_wm_noca.g6b \ exa_wm_write.g6b \ - exa_wm_yuv_rgb.g6b \ + exa_wm_yuv_rgb_bt601.g6b \ $(NULL) INTEL_G7A = \ @@ -166,7 +166,7 @@ INTEL_G7A = \ exa_wm_src_sample_nv12.g7a \ exa_wm_src_sample_planar.g7a \ exa_wm_write.g7a \ - exa_wm_yuv_rgb.g7a \ + exa_wm_yuv_rgb_bt601.g7a \ $(NULL) INTEL_G7B = \ @@ -181,7 +181,7 @@ INTEL_G7B = \ exa_wm_src_sample_nv12.g7b \ exa_wm_src_sample_planar.g7b \ exa_wm_write.g7b \ - exa_wm_yuv_rgb.g7b \ + exa_wm_yuv_rgb_bt601.g7b \ $(NULL) INTEL_G8A = \ @@ -190,7 +190,7 @@ INTEL_G8A = \ exa_wm_src_sample_nv12.g8a \ exa_wm_src_sample_planar.g8a \ exa_wm_write.g8a \ - exa_wm_yuv_rgb.g8a \ + exa_wm_yuv_rgb_bt601.g8a \ $(NULL) INTEL_G8B = \ @@ -199,7 +199,7 @@ INTEL_G8B = \ exa_wm_src_sample_nv12.g8b \ exa_wm_src_sample_planar.g8b \ exa_wm_write.g8b \ - exa_wm_yuv_rgb.g8b \ + exa_wm_yuv_rgb_bt601.g8b \ $(NULL) EXTRA_DIST = \ diff --git a/src/render_program/exa_wm_yuv_rgb.g5a b/src/render_program/exa_wm_yuv_rgb.g5a deleted file mode 120000 index d34d246d..00000000 --- a/src/render_program/exa_wm_yuv_rgb.g5a +++ /dev/null @@ -1 +0,0 @@ -exa_wm_yuv_rgb.g4a
\ No newline at end of file diff --git a/src/render_program/exa_wm_yuv_rgb.g6a b/src/render_program/exa_wm_yuv_rgb.g6a deleted file mode 120000 index d34d246d..00000000 --- a/src/render_program/exa_wm_yuv_rgb.g6a +++ /dev/null @@ -1 +0,0 @@ -exa_wm_yuv_rgb.g4a
\ No newline at end of file diff --git a/src/render_program/exa_wm_yuv_rgb.g7a b/src/render_program/exa_wm_yuv_rgb.g7a deleted file mode 120000 index d34d246d..00000000 --- a/src/render_program/exa_wm_yuv_rgb.g7a +++ /dev/null @@ -1 +0,0 @@ -exa_wm_yuv_rgb.g4a
\ No newline at end of file diff --git a/src/render_program/exa_wm_yuv_rgb.g4a b/src/render_program/exa_wm_yuv_rgb_bt601.g4a index 4fb2576a..4fb2576a 100644 --- a/src/render_program/exa_wm_yuv_rgb.g4a +++ b/src/render_program/exa_wm_yuv_rgb_bt601.g4a diff --git a/src/render_program/exa_wm_yuv_rgb.g4b b/src/render_program/exa_wm_yuv_rgb_bt601.g4b index 01f6e2b2..01f6e2b2 100644 --- a/src/render_program/exa_wm_yuv_rgb.g4b +++ b/src/render_program/exa_wm_yuv_rgb_bt601.g4b diff --git a/src/render_program/exa_wm_yuv_rgb.g4b.gen5 b/src/render_program/exa_wm_yuv_rgb_bt601.g4b.gen5 index 01f6e2b2..01f6e2b2 100644 --- a/src/render_program/exa_wm_yuv_rgb.g4b.gen5 +++ b/src/render_program/exa_wm_yuv_rgb_bt601.g4b.gen5 diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g5a b/src/render_program/exa_wm_yuv_rgb_bt601.g5a new file mode 120000 index 00000000..8c98e82d --- /dev/null +++ b/src/render_program/exa_wm_yuv_rgb_bt601.g5a @@ -0,0 +1 @@ +exa_wm_yuv_rgb_bt601.g4a
\ No newline at end of file diff --git a/src/render_program/exa_wm_yuv_rgb.g5b b/src/render_program/exa_wm_yuv_rgb_bt601.g5b index 01f6e2b2..01f6e2b2 100644 --- a/src/render_program/exa_wm_yuv_rgb.g5b +++ b/src/render_program/exa_wm_yuv_rgb_bt601.g5b diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g6a b/src/render_program/exa_wm_yuv_rgb_bt601.g6a new file mode 120000 index 00000000..8c98e82d --- /dev/null +++ b/src/render_program/exa_wm_yuv_rgb_bt601.g6a @@ -0,0 +1 @@ +exa_wm_yuv_rgb_bt601.g4a
\ No newline at end of file diff --git a/src/render_program/exa_wm_yuv_rgb.g6b b/src/render_program/exa_wm_yuv_rgb_bt601.g6b index 01ec5e50..01ec5e50 100644 --- a/src/render_program/exa_wm_yuv_rgb.g6b +++ b/src/render_program/exa_wm_yuv_rgb_bt601.g6b diff --git a/src/render_program/exa_wm_yuv_rgb_bt601.g7a b/src/render_program/exa_wm_yuv_rgb_bt601.g7a new file mode 120000 index 00000000..8c98e82d --- /dev/null +++ b/src/render_program/exa_wm_yuv_rgb_bt601.g7a @@ -0,0 +1 @@ +exa_wm_yuv_rgb_bt601.g4a
\ No newline at end of file diff --git a/src/render_program/exa_wm_yuv_rgb.g7b b/src/render_program/exa_wm_yuv_rgb_bt601.g7b index 01ec5e50..01ec5e50 100644 --- a/src/render_program/exa_wm_yuv_rgb.g7b +++ b/src/render_program/exa_wm_yuv_rgb_bt601.g7b diff --git a/src/render_program/exa_wm_yuv_rgb.g8a b/src/render_program/exa_wm_yuv_rgb_bt601.g8a index 34973ba8..34973ba8 100644 --- a/src/render_program/exa_wm_yuv_rgb.g8a +++ b/src/render_program/exa_wm_yuv_rgb_bt601.g8a diff --git a/src/render_program/exa_wm_yuv_rgb.g8b b/src/render_program/exa_wm_yuv_rgb_bt601.g8b index 2cd6fc44..2cd6fc44 100644 --- a/src/render_program/exa_wm_yuv_rgb.g8b +++ b/src/render_program/exa_wm_yuv_rgb_bt601.g8b diff --git a/src/sna/brw/brw_test_gen4.c b/src/sna/brw/brw_test_gen4.c index c0a185f3..78ff7465 100644 --- a/src/sna/brw/brw_test_gen4.c +++ b/src/sna/brw/brw_test_gen4.c @@ -115,7 +115,7 @@ static const uint32_t ps_kernel_packed_static[][4] = { #include "exa_wm_xy.g4b" #include "exa_wm_src_affine.g4b" #include "exa_wm_src_sample_argb.g4b" -#include "exa_wm_yuv_rgb.g4b" +#include "exa_wm_yuv_rgb_bt601.g4b" #include "exa_wm_write.g4b" }; @@ -123,7 +123,7 @@ static const uint32_t ps_kernel_planar_static[][4] = { #include "exa_wm_xy.g4b" #include "exa_wm_src_affine.g4b" #include "exa_wm_src_sample_planar.g4b" -#include "exa_wm_yuv_rgb.g4b" +#include "exa_wm_yuv_rgb_bt601.g4b" #include "exa_wm_write.g4b" }; diff --git a/src/sna/brw/brw_test_gen5.c b/src/sna/brw/brw_test_gen5.c index 5f909fe5..e821ce8b 100644 --- a/src/sna/brw/brw_test_gen5.c +++ b/src/sna/brw/brw_test_gen5.c @@ -115,7 +115,7 @@ static const uint32_t ps_kernel_packed_static[][4] = { #include "exa_wm_xy.g5b" #include "exa_wm_src_affine.g5b" #include "exa_wm_src_sample_argb.g5b" -#include "exa_wm_yuv_rgb.g5b" +#include "exa_wm_yuv_rgb_bt601.g5b" #include "exa_wm_write.g5b" }; @@ -123,7 +123,7 @@ static const uint32_t ps_kernel_planar_static[][4] = { #include "exa_wm_xy.g5b" #include "exa_wm_src_affine.g5b" #include "exa_wm_src_sample_planar.g5b" -#include "exa_wm_yuv_rgb.g5b" +#include "exa_wm_yuv_rgb_bt601.g5b" #include "exa_wm_write.g5b" }; diff --git a/src/sna/brw/brw_test_gen6.c b/src/sna/brw/brw_test_gen6.c index 813ea8ac..9603b9d9 100644 --- a/src/sna/brw/brw_test_gen6.c +++ b/src/sna/brw/brw_test_gen6.c @@ -98,14 +98,14 @@ static const uint32_t ps_kernel_masknoca_projective[][4] = { static const uint32_t ps_kernel_packed[][4] = { #include "exa_wm_src_affine.g6b" #include "exa_wm_src_sample_argb.g6b" -#include "exa_wm_yuv_rgb.g6b" +#include "exa_wm_yuv_rgb_bt601.g6b" #include "exa_wm_write.g6b" }; static const uint32_t ps_kernel_planar[][4] = { #include "exa_wm_src_affine.g6b" #include "exa_wm_src_sample_planar.g6b" -#include "exa_wm_yuv_rgb.g6b" +#include "exa_wm_yuv_rgb_bt601.g6b" #include "exa_wm_write.g6b" }; diff --git a/src/sna/brw/brw_test_gen7.c b/src/sna/brw/brw_test_gen7.c index 297ae470..658b6699 100644 --- a/src/sna/brw/brw_test_gen7.c +++ b/src/sna/brw/brw_test_gen7.c @@ -98,14 +98,14 @@ static const uint32_t ps_kernel_masknoca_projective[][4] = { static const uint32_t ps_kernel_packed[][4] = { #include "exa_wm_src_affine.g7b" #include "exa_wm_src_sample_argb.g7b" -#include "exa_wm_yuv_rgb.g7b" +#include "exa_wm_yuv_rgb_bt601.g7b" #include "exa_wm_write.g7b" }; static const uint32_t ps_kernel_planar[][4] = { #include "exa_wm_src_affine.g7b" #include "exa_wm_src_sample_planar.g7b" -#include "exa_wm_yuv_rgb.g7b" +#include "exa_wm_yuv_rgb_bt601.g7b" #include "exa_wm_write.g7b" }; diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c index f74b76f0..01f8040f 100644 --- a/src/sna/gen4_render.c +++ b/src/sna/gen4_render.c @@ -103,7 +103,7 @@ static const uint32_t ps_kernel_packed_static[][4] = { #include "exa_wm_xy.g4b" #include "exa_wm_src_affine.g4b" #include "exa_wm_src_sample_argb.g4b" -#include "exa_wm_yuv_rgb.g4b" +#include "exa_wm_yuv_rgb_bt601.g4b" #include "exa_wm_write.g4b" }; @@ -111,7 +111,7 @@ static const uint32_t ps_kernel_planar_static[][4] = { #include "exa_wm_xy.g4b" #include "exa_wm_src_affine.g4b" #include "exa_wm_src_sample_planar.g4b" -#include "exa_wm_yuv_rgb.g4b" +#include "exa_wm_yuv_rgb_bt601.g4b" #include "exa_wm_write.g4b" }; @@ -119,7 +119,7 @@ static const uint32_t ps_kernel_nv12_static[][4] = { #include "exa_wm_xy.g4b" #include "exa_wm_src_affine.g4b" #include "exa_wm_src_sample_nv12.g4b" -#include "exa_wm_yuv_rgb.g4b" +#include "exa_wm_yuv_rgb_bt601.g4b" #include "exa_wm_write.g4b" }; diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c index 46535f7b..bed4a3ed 100644 --- a/src/sna/gen5_render.c +++ b/src/sna/gen5_render.c @@ -93,7 +93,7 @@ static const uint32_t ps_kernel_packed_static[][4] = { #include "exa_wm_xy.g5b" #include "exa_wm_src_affine.g5b" #include "exa_wm_src_sample_argb.g5b" -#include "exa_wm_yuv_rgb.g5b" +#include "exa_wm_yuv_rgb_bt601.g5b" #include "exa_wm_write.g5b" }; @@ -101,7 +101,7 @@ static const uint32_t ps_kernel_planar_static[][4] = { #include "exa_wm_xy.g5b" #include "exa_wm_src_affine.g5b" #include "exa_wm_src_sample_planar.g5b" -#include "exa_wm_yuv_rgb.g5b" +#include "exa_wm_yuv_rgb_bt601.g5b" #include "exa_wm_write.g5b" }; @@ -109,7 +109,7 @@ static const uint32_t ps_kernel_nv12_static[][4] = { #include "exa_wm_xy.g5b" #include "exa_wm_src_affine.g5b" #include "exa_wm_src_sample_nv12.g5b" -#include "exa_wm_yuv_rgb.g5b" +#include "exa_wm_yuv_rgb_bt601.g5b" #include "exa_wm_write.g5b" }; diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c index e847062f..39ea5b6f 100644 --- a/src/sna/gen6_render.c +++ b/src/sna/gen6_render.c @@ -104,21 +104,21 @@ static const struct gt_info gt2_info = { static const uint32_t ps_kernel_packed[][4] = { #include "exa_wm_src_affine.g6b" #include "exa_wm_src_sample_argb.g6b" -#include "exa_wm_yuv_rgb.g6b" +#include "exa_wm_yuv_rgb_bt601.g6b" #include "exa_wm_write.g6b" }; static const uint32_t ps_kernel_planar[][4] = { #include "exa_wm_src_affine.g6b" #include "exa_wm_src_sample_planar.g6b" -#include "exa_wm_yuv_rgb.g6b" +#include "exa_wm_yuv_rgb_bt601.g6b" #include "exa_wm_write.g6b" }; static const uint32_t ps_kernel_nv12[][4] = { #include "exa_wm_src_affine.g6b" #include "exa_wm_src_sample_nv12.g6b" -#include "exa_wm_yuv_rgb.g6b" +#include "exa_wm_yuv_rgb_bt601.g6b" #include "exa_wm_write.g6b" }; diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c index c3f81c52..b1fdfb51 100644 --- a/src/sna/gen7_render.c +++ b/src/sna/gen7_render.c @@ -196,21 +196,21 @@ inline static bool is_hsw(struct sna *sna) static const uint32_t ps_kernel_packed[][4] = { #include "exa_wm_src_affine.g7b" #include "exa_wm_src_sample_argb.g7b" -#include "exa_wm_yuv_rgb.g7b" +#include "exa_wm_yuv_rgb_bt601.g7b" #include "exa_wm_write.g7b" }; static const uint32_t ps_kernel_planar[][4] = { #include "exa_wm_src_affine.g7b" #include "exa_wm_src_sample_planar.g7b" -#include "exa_wm_yuv_rgb.g7b" +#include "exa_wm_yuv_rgb_bt601.g7b" #include "exa_wm_write.g7b" }; static const uint32_t ps_kernel_nv12[][4] = { #include "exa_wm_src_affine.g7b" #include "exa_wm_src_sample_nv12.g7b" -#include "exa_wm_yuv_rgb.g7b" +#include "exa_wm_yuv_rgb_bt601.g7b" #include "exa_wm_write.g7b" }; diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c index 46369d6b..eadb09eb 100644 --- a/src/sna/gen8_render.c +++ b/src/sna/gen8_render.c @@ -96,21 +96,21 @@ static const uint32_t ps_kernel_packed[][4] = { #include "exa_wm_src_affine.g8b" #include "exa_wm_src_sample_argb.g8b" -#include "exa_wm_yuv_rgb.g8b" +#include "exa_wm_yuv_rgb_bt601.g8b" #include "exa_wm_write.g8b" }; static const uint32_t ps_kernel_planar[][4] = { #include "exa_wm_src_affine.g8b" #include "exa_wm_src_sample_planar.g8b" -#include "exa_wm_yuv_rgb.g8b" +#include "exa_wm_yuv_rgb_bt601.g8b" #include "exa_wm_write.g8b" }; static const uint32_t ps_kernel_nv12[][4] = { #include "exa_wm_src_affine.g8b" #include "exa_wm_src_sample_nv12.g8b" -#include "exa_wm_yuv_rgb.g8b" +#include "exa_wm_yuv_rgb_bt601.g8b" #include "exa_wm_write.g8b" }; diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c index dd25b7b1..721a186a 100644 --- a/src/sna/gen9_render.c +++ b/src/sna/gen9_render.c @@ -97,21 +97,21 @@ static const uint32_t ps_kernel_packed[][4] = { #include "exa_wm_src_affine.g8b" #include "exa_wm_src_sample_argb.g8b" -#include "exa_wm_yuv_rgb.g8b" +#include "exa_wm_yuv_rgb_bt601.g8b" #include "exa_wm_write.g8b" }; static const uint32_t ps_kernel_planar[][4] = { #include "exa_wm_src_affine.g8b" #include "exa_wm_src_sample_planar.g8b" -#include "exa_wm_yuv_rgb.g8b" +#include "exa_wm_yuv_rgb_bt601.g8b" #include "exa_wm_write.g8b" }; static const uint32_t ps_kernel_nv12[][4] = { #include "exa_wm_src_affine.g8b" #include "exa_wm_src_sample_nv12.g8b" -#include "exa_wm_yuv_rgb.g8b" +#include "exa_wm_yuv_rgb_bt601.g8b" #include "exa_wm_write.g8b" }; diff --git a/src/uxa/i965_video.c b/src/uxa/i965_video.c index 438ab909..9b9203b6 100644 --- a/src/uxa/i965_video.c +++ b/src/uxa/i965_video.c @@ -101,7 +101,7 @@ static const uint32_t ps_kernel_packed_static[][4] = { #include "exa_wm_xy.g4b" #include "exa_wm_src_affine.g4b" #include "exa_wm_src_sample_argb.g4b" -#include "exa_wm_yuv_rgb.g4b" +#include "exa_wm_yuv_rgb_bt601.g4b" #include "exa_wm_write.g4b" }; @@ -109,7 +109,7 @@ static const uint32_t ps_kernel_planar_static[][4] = { #include "exa_wm_xy.g4b" #include "exa_wm_src_affine.g4b" #include "exa_wm_src_sample_planar.g4b" -#include "exa_wm_yuv_rgb.g4b" +#include "exa_wm_yuv_rgb_bt601.g4b" #include "exa_wm_write.g4b" }; @@ -122,7 +122,7 @@ static const uint32_t ps_kernel_packed_static_gen5[][4] = { #include "exa_wm_xy.g4b.gen5" #include "exa_wm_src_affine.g4b.gen5" #include "exa_wm_src_sample_argb.g4b.gen5" -#include "exa_wm_yuv_rgb.g4b.gen5" +#include "exa_wm_yuv_rgb_bt601.g4b.gen5" #include "exa_wm_write.g4b.gen5" }; @@ -130,7 +130,7 @@ static const uint32_t ps_kernel_planar_static_gen5[][4] = { #include "exa_wm_xy.g4b.gen5" #include "exa_wm_src_affine.g4b.gen5" #include "exa_wm_src_sample_planar.g4b.gen5" -#include "exa_wm_yuv_rgb.g4b.gen5" +#include "exa_wm_yuv_rgb_bt601.g4b.gen5" #include "exa_wm_write.g4b.gen5" }; @@ -138,14 +138,14 @@ static const uint32_t ps_kernel_planar_static_gen5[][4] = { static const uint32_t ps_kernel_packed_static_gen6[][4] = { #include "exa_wm_src_affine.g6b" #include "exa_wm_src_sample_argb.g6b" -#include "exa_wm_yuv_rgb.g6b" +#include "exa_wm_yuv_rgb_bt601.g6b" #include "exa_wm_write.g6b" }; static const uint32_t ps_kernel_planar_static_gen6[][4] = { #include "exa_wm_src_affine.g6b" #include "exa_wm_src_sample_planar.g6b" -#include "exa_wm_yuv_rgb.g6b" +#include "exa_wm_yuv_rgb_bt601.g6b" #include "exa_wm_write.g6b" }; @@ -153,14 +153,14 @@ static const uint32_t ps_kernel_planar_static_gen6[][4] = { static const uint32_t ps_kernel_packed_static_gen7[][4] = { #include "exa_wm_src_affine.g7b" #include "exa_wm_src_sample_argb.g7b" -#include "exa_wm_yuv_rgb.g7b" +#include "exa_wm_yuv_rgb_bt601.g7b" #include "exa_wm_write.g7b" }; static const uint32_t ps_kernel_planar_static_gen7[][4] = { #include "exa_wm_src_affine.g7b" #include "exa_wm_src_sample_planar.g7b" -#include "exa_wm_yuv_rgb.g7b" +#include "exa_wm_yuv_rgb_bt601.g7b" #include "exa_wm_write.g7b" }; |