: image_format(image_format),
ycbcr_format(ycbcr_format),
ycbcr_input_splitting(ycbcr_input_splitting),
+ needs_mipmaps(false),
type(type),
width(width),
height(height),
register_uniform_sampler2d("tex_cb", &uniform_tex_cb);
register_uniform_sampler2d("tex_cr", &uniform_tex_cr);
}
+
+ register_int("needs_mipmaps", &needs_mipmaps);
}
YCbCrInput::~YCbCrInput()
if (type == GL_UNSIGNED_INT_2_10_10_10_REV) {
format = GL_RGBA;
internal_format = GL_RGB10_A2;
+ } else if (type == GL_UNSIGNED_SHORT) {
+ format = GL_RGB;
+ internal_format = GL_RGB16;
} else {
assert(type == GL_UNSIGNED_BYTE);
format = GL_RGB;
internal_format = GL_RGB8;
}
} else if (channel == 1 && ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
- assert(type == GL_UNSIGNED_BYTE);
format = GL_RG;
- internal_format = GL_RG8;
+ if (type == GL_UNSIGNED_SHORT) {
+ internal_format = GL_RG16;
+ } else {
+ assert(type == GL_UNSIGNED_BYTE);
+ internal_format = GL_RG8;
+ }
} else {
- assert(type == GL_UNSIGNED_BYTE);
format = GL_RED;
- internal_format = GL_R8;
+ if (type == GL_UNSIGNED_SHORT) {
+ internal_format = GL_R16;
+ } else {
+ assert(type == GL_UNSIGNED_BYTE);
+ internal_format = GL_R8;
+ }
}
// (Re-)upload the texture.
texture_num[channel] = resource_pool->create_2d_texture(internal_format, widths[channel], heights[channel]);
glBindTexture(GL_TEXTURE_2D, texture_num[channel]);
check_error();
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
check_error();
glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbos[channel]);
check_error();
check_error();
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
check_error();
+ if (needs_mipmaps) {
+ glGenerateMipmap(GL_TEXTURE_2D);
+ 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);
// Bind samplers.
uniform_tex_y = *sampler_num + 0;
- uniform_tex_cb = *sampler_num + 1;
+ if (ycbcr_input_splitting != YCBCR_INPUT_INTERLEAVED) {
+ uniform_tex_cb = *sampler_num + 1;
+ }
if (ycbcr_input_splitting == YCBCR_INPUT_PLANAR) {
uniform_tex_cr = *sampler_num + 2;
}
{
float offset[3];
Matrix3d ycbcr_to_rgb;
- compute_ycbcr_matrix(ycbcr_format, offset, &ycbcr_to_rgb);
+ compute_ycbcr_matrix(ycbcr_format, offset, &ycbcr_to_rgb, type);
string frag_shader;
bool YCbCrInput::set_int(const std::string& key, int value)
{
if (key == "needs_mipmaps") {
- // We currently do not support this.
- return (value == 0);
+ if (ycbcr_input_splitting != YCBCR_INPUT_INTERLEAVED && value != 0) {
+ // We do not currently support this.
+ return false;
+ }
}
return Effect::set_int(key, value);
}