X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=init.cpp;h=4802c68712e3b69b086eb5877da28528fc457c3f;hp=5717dda8d43ad1a3416a3be618c0866fe3d886e0;hb=ddf71f853e64c3912eed4ab98bfe7503826ce8e1;hpb=cfc161e0289c2169d4835c48751ff56b97355eb2 diff --git a/init.cpp b/init.cpp index 5717dda..4802c68 100644 --- a/init.cpp +++ b/init.cpp @@ -1,10 +1,11 @@ -#include +#include #include #include #include #include #include "init.h" +#include "resource_pool.h" #include "util.h" using namespace std; @@ -17,6 +18,7 @@ float movit_texel_subpixel_precision; bool movit_srgb_textures_supported; int movit_num_wrongly_rounded; bool movit_shader_rounding_supported; +MovitShaderModel movit_shader_model; // The rules for objects with nontrivial constructors in static scope // are somewhat convoluted, and easy to mess up. We simply have a @@ -27,6 +29,7 @@ namespace { void measure_texel_subpixel_precision() { + ResourcePool resource_pool; static const unsigned width = 4096; // Generate a destination texture to render to, and an FBO. @@ -36,7 +39,7 @@ void measure_texel_subpixel_precision() check_error(); glBindTexture(GL_TEXTURE_2D, dst_texnum); check_error(); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, width, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F, width, 1, 0, GL_RGBA, GL_FLOAT, NULL); check_error(); glGenFramebuffers(1, &fbo); @@ -56,15 +59,13 @@ void measure_texel_subpixel_precision() float texdata[] = { 0, 1 }; glGenTextures(1, &src_texnum); check_error(); - glBindTexture(GL_TEXTURE_1D, src_texnum); + glBindTexture(GL_TEXTURE_2D, src_texnum); check_error(); - glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); check_error(); - glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); check_error(); - glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE16F_ARB, 2, 0, GL_LUMINANCE, GL_FLOAT, texdata); - check_error(); - glEnable(GL_TEXTURE_1D); + glTexImage2D(GL_TEXTURE_2D, 0, GL_R16F, 2, 1, 0, GL_RED, GL_FLOAT, texdata); check_error(); // Basic state. @@ -77,55 +78,67 @@ void measure_texel_subpixel_precision() glViewport(0, 0, width, 1); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0.0, 1.0, 0.0, 1.0, 0.0, 1.0); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); + GLuint glsl_program_num = resource_pool.compile_glsl_program( + read_version_dependent_file("vs", "vert"), + read_version_dependent_file("texture1d", "frag")); + glUseProgram(glsl_program_num); + check_error(); + glUniform1i(glGetUniformLocation(glsl_program_num, "tex"), 0); // Bind the 2D sampler. check_error(); // Draw the texture stretched over a long quad, interpolating it out. // Note that since the texel center is in (0.5), we need to adjust the // texture coordinates in order not to get long stretches of (1,1,1,...) // at the start and (...,0,0,0) at the end. - glBegin(GL_QUADS); - - glTexCoord1f(0.25f); - glVertex2f(0.0f, 0.0f); - - glTexCoord1f(0.75f); - glVertex2f(1.0f, 0.0f); + float vertices[] = { + 0.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 1.0f, + 1.0f, 0.0f + }; + float texcoords[] = { + 0.25f, 0.0f, + 0.25f, 0.0f, + 0.75f, 0.0f, + 0.75f, 0.0f + }; - glTexCoord1f(0.75f); - glVertex2f(1.0f, 1.0f); + GLuint vao; + glGenVertexArrays(1, &vao); + check_error(); + glBindVertexArray(vao); + check_error(); - glTexCoord1f(0.25f); - glVertex2f(0.0f, 1.0f); + GLuint position_vbo = fill_vertex_attribute(glsl_program_num, "position", 2, GL_FLOAT, sizeof(vertices), vertices); + GLuint texcoord_vbo = fill_vertex_attribute(glsl_program_num, "texcoord", 2, GL_FLOAT, sizeof(texcoords), texcoords); - glEnd(); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); check_error(); - glDisable(GL_TEXTURE_1D); + cleanup_vertex_attribute(glsl_program_num, "position", position_vbo); + cleanup_vertex_attribute(glsl_program_num, "texcoord", texcoord_vbo); + + glUseProgram(0); check_error(); // Now read the data back and see what the card did. // (We only look at the red channel; the others will surely be the same.) // We assume a linear ramp; anything else will give sort of odd results here. - float out_data[width]; - glReadPixels(0, 0, width, 1, GL_RED, GL_FLOAT, out_data); + float out_data[width * 4]; + glReadPixels(0, 0, width, 1, GL_RGBA, GL_FLOAT, out_data); check_error(); float biggest_jump = 0.0f; for (unsigned i = 1; i < width; ++i) { - assert(out_data[i] >= out_data[i - 1]); - biggest_jump = max(biggest_jump, out_data[i] - out_data[i - 1]); + assert(out_data[i * 4] >= out_data[(i - 1) * 4]); + biggest_jump = max(biggest_jump, out_data[i * 4] - out_data[(i - 1) * 4]); } + assert(biggest_jump > 0.0); movit_texel_subpixel_precision = biggest_jump; // Clean up. - glBindTexture(GL_TEXTURE_1D, 0); + glBindTexture(GL_TEXTURE_2D, 0); check_error(); glBindFramebuffer(GL_FRAMEBUFFER, 0); check_error(); @@ -135,10 +148,16 @@ void measure_texel_subpixel_precision() check_error(); glDeleteTextures(1, &src_texnum); check_error(); + + resource_pool.release_glsl_program(glsl_program_num); + glDeleteVertexArrays(1, &vao); + check_error(); } void measure_roundoff_problems() { + ResourcePool resource_pool; + // Generate a destination texture to render to, and an FBO. GLuint dst_texnum, fbo; @@ -172,15 +191,13 @@ void measure_roundoff_problems() } glGenTextures(1, &src_texnum); check_error(); - glBindTexture(GL_TEXTURE_1D, src_texnum); - check_error(); - glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glBindTexture(GL_TEXTURE_2D, src_texnum); check_error(); - glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); check_error(); - glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE32F_ARB, 512, 0, GL_LUMINANCE, GL_FLOAT, texdata); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); check_error(); - glEnable(GL_TEXTURE_1D); + glTexImage2D(GL_TEXTURE_2D, 0, GL_R32F, 512, 1, 0, GL_RED, GL_FLOAT, texdata); check_error(); // Basic state. @@ -193,47 +210,51 @@ void measure_roundoff_problems() glViewport(0, 0, 512, 1); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0.0, 1.0, 0.0, 1.0, 0.0, 1.0); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); + GLuint glsl_program_num = resource_pool.compile_glsl_program( + read_version_dependent_file("vs", "vert"), + read_version_dependent_file("texture1d", "frag")); + glUseProgram(glsl_program_num); check_error(); + glUniform1i(glGetUniformLocation(glsl_program_num, "tex"), 0); // Bind the 2D sampler. // Draw the texture stretched over a long quad, interpolating it out. - glBegin(GL_QUADS); - - glTexCoord1f(0.0f); - glVertex2f(0.0f, 0.0f); - - glTexCoord1f(1.0f); - glVertex2f(1.0f, 0.0f); + float vertices[] = { + 0.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 1.0f, + 1.0f, 0.0f + }; - glTexCoord1f(1.0f); - glVertex2f(1.0f, 1.0f); + GLuint vao; + glGenVertexArrays(1, &vao); + check_error(); + glBindVertexArray(vao); + check_error(); - glTexCoord1f(0.0f); - glVertex2f(0.0f, 1.0f); + GLuint position_vbo = fill_vertex_attribute(glsl_program_num, "position", 2, GL_FLOAT, sizeof(vertices), vertices); + GLuint texcoord_vbo = fill_vertex_attribute(glsl_program_num, "texcoord", 2, GL_FLOAT, sizeof(vertices), vertices); // Same data. - glEnd(); + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); check_error(); - glDisable(GL_TEXTURE_1D); + cleanup_vertex_attribute(glsl_program_num, "position", position_vbo); + cleanup_vertex_attribute(glsl_program_num, "texcoord", texcoord_vbo); + + glUseProgram(0); check_error(); // Now read the data back and see what the card did. (Ignore the last value.) // (We only look at the red channel; the others will surely be the same.) - unsigned char out_data[512]; - glReadPixels(0, 0, 512, 1, GL_RED, GL_UNSIGNED_BYTE, out_data); + unsigned char out_data[512 * 4]; + glReadPixels(0, 0, 512, 1, GL_RGBA, GL_UNSIGNED_BYTE, out_data); check_error(); int wrongly_rounded = 0; for (unsigned i = 0; i < 255; ++i) { - if (out_data[i * 2 + 0] != i) { + if (out_data[(i * 2 + 0) * 4] != i) { ++wrongly_rounded; } - if (out_data[i * 2 + 1] != i + 1) { + if (out_data[(i * 2 + 1) * 4] != i + 1) { ++wrongly_rounded; } } @@ -241,7 +262,7 @@ void measure_roundoff_problems() movit_num_wrongly_rounded = wrongly_rounded; // Clean up. - glBindTexture(GL_TEXTURE_1D, 0); + glBindTexture(GL_TEXTURE_2D, 0); check_error(); glBindFramebuffer(GL_FRAMEBUFFER, 0); check_error(); @@ -251,41 +272,96 @@ void measure_roundoff_problems() check_error(); glDeleteTextures(1, &src_texnum); check_error(); + + resource_pool.release_glsl_program(glsl_program_num); + glDeleteVertexArrays(1, &vao); + check_error(); } bool check_extensions() { + // GLES generally doesn't use extensions as actively as desktop OpenGL. + // For now, we say that for GLES, we require GLES 3, which has everything + // we need. + // + // Since we use implicit #version 100, we don't have round(). We will + // fix this at some later stage. + if (!epoxy_is_desktop_gl()) { + if (epoxy_gl_version() >= 30) { + movit_srgb_textures_supported = true; + movit_shader_rounding_supported = false; + } else { + return false; + } + } + // We fundamentally need FBOs and floating-point textures. - if (!glewIsSupported("GL_ARB_framebuffer_object")) return false; - if (!glewIsSupported("GL_ARB_texture_float")) return false; + // FBOs are covered by OpenGL 1.5, and are not an extension there. + // Floating-point textures are part of OpenGL 3.0 and newer. + if (epoxy_gl_version() < 15 && + !epoxy_has_gl_extension("GL_ARB_framebuffer_object")) return false; + if (epoxy_gl_version() < 30 && + !epoxy_has_gl_extension("GL_ARB_texture_float")) return false; // We assume that we can use non-power-of-two textures without restrictions. - if (!glewIsSupported("GL_ARB_texture_non_power_of_two")) return false; + if (epoxy_gl_version() < 20 && + !epoxy_has_gl_extension("GL_ARB_texture_non_power_of_two")) return false; // We also need GLSL fragment shaders. - if (!glewIsSupported("GL_ARB_fragment_shader")) return false; - if (!glewIsSupported("GL_ARB_shading_language_100")) return false; + if (epoxy_gl_version() < 20) { + if (!epoxy_has_gl_extension("GL_ARB_fragment_shader")) return false; + if (!epoxy_has_gl_extension("GL_ARB_shading_language_100")) return false; + } // FlatInput and YCbCrInput uses PBOs. (They could in theory do without, // but no modern card would really not provide it.) - if (!glewIsSupported("GL_ARB_pixel_buffer_object")) return false; + if (epoxy_gl_version() < 21 && + !epoxy_has_gl_extension("GL_ARB_pixel_buffer_object")) return false; // ResampleEffect uses RG textures to encode a two-component LUT. - if (!glewIsSupported("GL_ARB_texture_rg")) return false; + if (epoxy_gl_version() < 30 && + !epoxy_has_gl_extension("GL_ARB_texture_rg")) return false; // sRGB texture decode would be nice, but are not mandatory // (GammaExpansionEffect can do the same thing if needed). - movit_srgb_textures_supported = glewIsSupported("GL_EXT_texture_sRGB"); + movit_srgb_textures_supported = + (epoxy_gl_version() >= 21 || epoxy_has_gl_extension("GL_EXT_texture_sRGB")); // We may want to use round() at the end of the final shader, // if supported. We need either GLSL 1.30 or this extension to do that, // and 1.30 brings with it other things that we don't want to demand // for now. - movit_shader_rounding_supported = glewIsSupported("GL_EXT_gpu_shader4"); + movit_shader_rounding_supported = + (epoxy_gl_version() >= 30 || epoxy_has_gl_extension("GL_EXT_gpu_shader4")); return true; } +double get_glsl_version() +{ + char *glsl_version_str = strdup((const char *)glGetString(GL_SHADING_LANGUAGE_VERSION)); + + // Skip past the first period. + char *ptr = strchr(glsl_version_str, '.'); + assert(ptr != NULL); + ++ptr; + + // Now cut the string off at the next period or space, whatever comes first + // (unless the string ends first). + while (*ptr && *ptr != '.' && *ptr != ' ') { + ++ptr; + } + *ptr = '\0'; + + // Now we have something on the form X.YY. We convert it to a float, and hope + // that if it's inexact (e.g. 1.30), atof() will round the same way the + // compiler will. + float glsl_version = atof(glsl_version_str); + free(glsl_version_str); + + return glsl_version; +} + } // namespace bool init_movit(const string& data_directory, MovitDebugLevel debug_level) @@ -297,11 +373,6 @@ bool init_movit(const string& data_directory, MovitDebugLevel debug_level) movit_data_directory = new string(data_directory); movit_debug_level = debug_level; - GLenum err = glewInit(); - if (err != GLEW_OK) { - return false; - } - // geez glPixelStorei(GL_PACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); @@ -310,6 +381,18 @@ bool init_movit(const string& data_directory, MovitDebugLevel debug_level) if (!check_extensions()) { return false; } + + // Find out what shader model we should compile for. + if (epoxy_is_desktop_gl()) { + if (get_glsl_version() >= 1.30) { + movit_shader_model = MOVIT_GLSL_130; + } else { + movit_shader_model = MOVIT_GLSL_110; + } + } else { + movit_shader_model = MOVIT_ESSL_300; + } + measure_texel_subpixel_precision(); measure_roundoff_problems();