X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=init.cpp;h=89998f40d64d81c957dfabc897ba61b6b63a7552;hp=1d7c46a50a63fb0cb1138f885efae4526eaaef0b;hb=de9c0e36aae9272c57596541de19790686669b25;hpb=ba1339c311f67fa4718e6995d8bc446ac45e3244 diff --git a/init.cpp b/init.cpp index 1d7c46a..89998f4 100644 --- a/init.cpp +++ b/init.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -38,7 +38,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); @@ -58,13 +58,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); + glTexImage2D(GL_TEXTURE_2D, 0, GL_R16F, 2, 1, 0, GL_RED, GL_FLOAT, texdata); check_error(); // Basic state. @@ -81,7 +81,7 @@ void measure_texel_subpixel_precision() read_file("vs.vert"), read_file("texture1d.frag")); glUseProgram(glsl_program_num); check_error(); - glUniform1i(glGetUniformLocation(glsl_program_num, "tex"), 0); // Bind the 1D sampler. + glUniform1i(glGetUniformLocation(glsl_program_num, "tex"), 0); // Bind the 2D sampler. check_error(); // Draw the texture stretched over a long quad, interpolating it out. @@ -136,7 +136,7 @@ void measure_texel_subpixel_precision() 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(); @@ -189,13 +189,13 @@ void measure_roundoff_problems() } 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_LUMINANCE32F_ARB, 512, 0, GL_LUMINANCE, GL_FLOAT, texdata); + glTexImage2D(GL_TEXTURE_2D, 0, GL_R32F, 512, 1, 0, GL_RED, GL_FLOAT, texdata); check_error(); // Basic state. @@ -212,7 +212,7 @@ void measure_roundoff_problems() read_file("vs.vert"), read_file("texture1d.frag")); glUseProgram(glsl_program_num); check_error(); - glUniform1i(glGetUniformLocation(glsl_program_num, "tex"), 0); // Bind the 1D sampler. + glUniform1i(glGetUniformLocation(glsl_program_num, "tex"), 0); // Bind the 2D sampler. // Draw the texture stretched over a long quad, interpolating it out. float vertices[] = { @@ -221,12 +221,6 @@ void measure_roundoff_problems() 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 - }; GLuint vao; glGenVertexArrays(1, &vao); @@ -235,7 +229,7 @@ void measure_roundoff_problems() check_error(); 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); + GLuint texcoord_vbo = fill_vertex_attribute(glsl_program_num, "texcoord", 2, GL_FLOAT, sizeof(vertices), vertices); // Same data. glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); check_error(); @@ -265,7 +259,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(); @@ -284,32 +278,43 @@ void measure_roundoff_problems() bool check_extensions() { // 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; } @@ -325,11 +330,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);