Make the blur use the resize functionality, which also unbreaks the in-between sampli...

[movit] / colorspace_conversion_effect.cpp

diff --git a/colorspace_conversion_effect.cpp b/colorspace_conversion_effect.cpp
index 4cef41351a912fe6072cdbecd6af9f89056946ed..9726b3b69afdb283b24cb043a9d42643a03661d2 100644 (file)
--- a/colorspace_conversion_effect.cpp
+++ b/colorspace_conversion_effect.cpp
@@ -65,7 +65,7 @@ void get_xyz_matrix(ColorSpace space, Matrix3x3 m)
        m[2] = Z_R; m[5] = Z_G; m[8] = Z_B;
 }
 
-std::string ColorSpaceConversionEffect::output_glsl()
+std::string ColorSpaceConversionEffect::output_fragment_shader()
 {
        // Create a matrix to convert from source space -> XYZ,
        // another matrix to convert from XYZ -> destination space,
@@ -91,8 +91,8 @@ std::string ColorSpaceConversionEffect::output_glsl()
                "    %.8f, %.8f, %.8f,\n"
                "    %.8f, %.8f, %.8f,\n"
                "    %.8f, %.8f, %.8f);\n\n",
-               m[0], m[3], m[6],
-               m[1], m[4], m[7],
-               m[2], m[5], m[8]);
-       return buf + read_file("colorspace_conversion_effect.glsl");
+               m[0], m[1], m[2],
+               m[3], m[4], m[5],
+               m[6], m[7], m[8]);
+       return buf + read_file("colorspace_conversion_effect.frag");
 }