]> git.sesse.net Git - movit/blobdiff - effect_chain.cpp
Fix a C++11 compatibility issue.
[movit] / effect_chain.cpp
index 4dfa6921b4d610296d899dca4a6021e654f5798e..a90f5f3a64db0ffea0427cc009fc106c56eebf0a 100644 (file)
@@ -209,6 +209,10 @@ void EffectChain::render_to_screen(unsigned char *src)
                format = GL_RGB;
        } else if (input_format.pixel_format == FORMAT_RGBA) {
                format = GL_RGBA;
+       } else if (input_format.pixel_format == FORMAT_BGR) {
+               format = GL_BGR;
+       } else if (input_format.pixel_format == FORMAT_BGRA) {
+               format = GL_BGRA;
        } else {
                assert(false);
        }
@@ -217,7 +221,7 @@ void EffectChain::render_to_screen(unsigned char *src)
        if (first) {
                glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, src);
        } else {
-               glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, 0, format, GL_UNSIGNED_BYTE, src);
+               glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, GL_UNSIGNED_BYTE, src);
        }
        check_error();
        glUniform1i(glGetUniformLocation(glsl_program_num, "input_tex"), 0);