X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.cpp;h=dc5e4d9fd2db9e619d9b680583b6c1f514f65220;hp=d3d71749a5be4eef4bdbbc1f50768b21e0af7e33;hb=5ee3e6bb0bf100d57a06911b89c3a0a0dc49e2be;hpb=cfc161e0289c2169d4835c48751ff56b97355eb2 diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp index d3d7174..dc5e4d9 100644 --- a/ycbcr_input.cpp +++ b/ycbcr_input.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include @@ -105,7 +105,7 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns if (texture_num[channel] == 0) { // (Re-)upload the texture. - texture_num[channel] = resource_pool->create_2d_texture(GL_LUMINANCE8, widths[channel], heights[channel]); + texture_num[channel] = resource_pool->create_2d_texture(GL_R8, widths[channel], heights[channel]); glBindTexture(GL_TEXTURE_2D, texture_num[channel]); check_error(); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); @@ -116,7 +116,7 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns check_error(); glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch[channel]); check_error(); - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], GL_LUMINANCE, GL_UNSIGNED_BYTE, pixel_data[channel]); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], GL_RED, GL_UNSIGNED_BYTE, pixel_data[channel]); check_error(); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); check_error();