X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=pbo_frame_allocator.cpp;h=84a75e442fee38ff96bc61913f143e091d0d7ee3;hb=96cb6414f85e0ef4d660b7bd56267303e80fcd05;hp=bfc65f2efe918bf0c0e988d75459d55a74023773;hpb=83e395e558735bd09d645e01b194f42f6764a503;p=nageru diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp index bfc65f2..84a75e4 100644 --- a/pbo_frame_allocator.cpp +++ b/pbo_frame_allocator.cpp @@ -12,8 +12,22 @@ using namespace std; -PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint height, size_t num_queued_frames, GLenum buffer, GLenum permissions, GLenum map_bits) - : buffer(buffer) +namespace { + +void set_clamp_to_edge() +{ + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + check_error(); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + check_error(); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + check_error(); +} + +} // namespace + +PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t frame_size, GLuint width, GLuint height, size_t num_queued_frames, GLenum buffer, GLenum permissions, GLenum map_bits) + : pixel_format(pixel_format), buffer(buffer) { userdata.reset(new Userdata[num_queued_frames]); for (size_t i = 0; i < num_queued_frames; ++i) { @@ -32,42 +46,66 @@ PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint hei frame.size = frame_size; frame.userdata = &userdata[i]; userdata[i].pbo = pbo; + userdata[i].pixel_format = pixel_format; frame.owner = this; - // For 8-bit Y'CbCr, we ask the driver to split Y' and Cb/Cr + // For 8-bit non-planar Y'CbCr, we ask the driver to split Y' and Cb/Cr // into separate textures. For 10-bit, the input format (v210) // is complicated enough that we need to interpolate up to 4:4:4, - // which we do in a compute shader ourselves. - frame.interleaved = !global_flags.ten_bit_input; + // which we do in a compute shader ourselves. For BGRA, the data + // is already 4:4:4:4. + frame.interleaved = (pixel_format == bmusb::PixelFormat_8BitYCbCr); // Create textures. We don't allocate any data for the second field at this point // (just create the texture state with the samplers), since our default assumed // resolution is progressive. - if (global_flags.ten_bit_input) { + switch (pixel_format) { + case bmusb::PixelFormat_8BitYCbCr: + glGenTextures(2, userdata[i].tex_y); + check_error(); + glGenTextures(2, userdata[i].tex_cbcr); + check_error(); + break; + case bmusb::PixelFormat_10BitYCbCr: glGenTextures(2, userdata[i].tex_v210); check_error(); glGenTextures(2, userdata[i].tex_444); check_error(); - } else { + break; + case bmusb::PixelFormat_8BitBGRA: + glGenTextures(2, userdata[i].tex_rgba); + check_error(); + break; + case bmusb::PixelFormat_8BitYCbCrPlanar: glGenTextures(2, userdata[i].tex_y); check_error(); - glGenTextures(2, userdata[i].tex_cbcr); + glGenTextures(2, userdata[i].tex_cb); + check_error(); + glGenTextures(2, userdata[i].tex_cr); check_error(); + break; + default: + assert(false); } userdata[i].last_width[0] = width; userdata[i].last_height[0] = height; + userdata[i].last_cbcr_width[0] = width / 2; + userdata[i].last_cbcr_height[0] = height; userdata[i].last_v210_width[0] = 0; userdata[i].last_width[1] = 0; userdata[i].last_height[1] = 0; + userdata[i].last_cbcr_width[1] = 0; + userdata[i].last_cbcr_height[1] = 0; userdata[i].last_v210_width[1] = 0; userdata[i].last_interlaced = false; userdata[i].last_has_signal = false; userdata[i].last_is_connected = false; for (unsigned field = 0; field < 2; ++field) { - if (global_flags.ten_bit_input) { + switch (pixel_format) { + case bmusb::PixelFormat_10BitYCbCr: { const size_t v210_width = v210Converter::get_minimum_v210_texture_width(width); // Seemingly we need to set the minification filter even though @@ -85,25 +123,17 @@ PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint hei glBindTexture(GL_TEXTURE_2D, userdata[i].tex_444[field]); check_error(); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - check_error(); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - check_error(); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - check_error(); + set_clamp_to_edge(); if (field == 0) { glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, NULL); check_error(); } - } else { + break; + } + case bmusb::PixelFormat_8BitYCbCr: glBindTexture(GL_TEXTURE_2D, userdata[i].tex_y[field]); check_error(); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - check_error(); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - check_error(); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - check_error(); + set_clamp_to_edge(); if (field == 0) { glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL); check_error(); @@ -111,16 +141,52 @@ PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint hei glBindTexture(GL_TEXTURE_2D, userdata[i].tex_cbcr[field]); check_error(); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + set_clamp_to_edge(); + if (field == 0) { + glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, width / 2, height, 0, GL_RG, GL_UNSIGNED_BYTE, NULL); + check_error(); + } + break; + case bmusb::PixelFormat_8BitBGRA: + glBindTexture(GL_TEXTURE_2D, userdata[i].tex_rgba[field]); + check_error(); + set_clamp_to_edge(); + if (field == 0) { + if (global_flags.can_disable_srgb_decoder) { // See the comments in tweaked_inputs.h. + glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); + } else { + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); + } + check_error(); + } + break; + case bmusb::PixelFormat_8BitYCbCrPlanar: + glBindTexture(GL_TEXTURE_2D, userdata[i].tex_y[field]); check_error(); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + set_clamp_to_edge(); + if (field == 0) { + glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL); + check_error(); + } + + glBindTexture(GL_TEXTURE_2D, userdata[i].tex_cb[field]); check_error(); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + set_clamp_to_edge(); + if (field == 0) { + glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width / 2, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL); + check_error(); + } + + glBindTexture(GL_TEXTURE_2D, userdata[i].tex_cr[field]); check_error(); + set_clamp_to_edge(); if (field == 0) { - glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, width / 2, height, 0, GL_RG, GL_UNSIGNED_BYTE, NULL); + glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width / 2, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL); check_error(); } + break; + default: + assert(false); } } @@ -146,16 +212,33 @@ PBOFrameAllocator::~PBOFrameAllocator() check_error(); glDeleteBuffers(1, &pbo); check_error(); - if (global_flags.ten_bit_input) { + switch (pixel_format) { + case bmusb::PixelFormat_10BitYCbCr: glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_v210); check_error(); glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_444); check_error(); - } else { + break; + case bmusb::PixelFormat_8BitYCbCr: glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_y); check_error(); glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_cbcr); check_error(); + break; + case bmusb::PixelFormat_8BitBGRA: + glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_rgba); + check_error(); + break; + case bmusb::PixelFormat_8BitYCbCrPlanar: + glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_y); + check_error(); + glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_cb); + check_error(); + glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_cr); + check_error(); + break; + default: + assert(false); } } }