X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=init.cpp;h=4003163d9494843b3eccc42910ca41084b52a691;hp=fd22778f4ccec152cc973f2ebe1f6ffa51d1d935;hb=92573f7be18bfca16dd3292cbe536d7d7912198f;hpb=0fa51e08f83e0283337216f5b951b3d5a8c0555b diff --git a/init.cpp b/init.cpp index fd22778..4003163 100644 --- a/init.cpp +++ b/init.cpp @@ -5,10 +5,13 @@ #include #include "init.h" +#include "resource_pool.h" #include "util.h" using namespace std; +namespace movit { + bool movit_initialized = false; MovitDebugLevel movit_debug_level = MOVIT_DEBUG_ON; float movit_texel_subpixel_precision; @@ -25,6 +28,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. @@ -62,8 +66,6 @@ void measure_texel_subpixel_precision() check_error(); glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE16F_ARB, 2, 0, GL_LUMINANCE, GL_FLOAT, texdata); check_error(); - glEnable(GL_TEXTURE_1D); - check_error(); // Basic state. glDisable(GL_BLEND); @@ -75,36 +77,51 @@ 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_file("vs.vert"), read_file("texture1d.frag")); + glUseProgram(glsl_program_num); + check_error(); + glUniform1i(glGetUniformLocation(glsl_program_num, "tex"), 0); // Bind the 1D 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); - - glTexCoord1f(0.75f); - glVertex2f(1.0f, 1.0f); + float vertices[] = { + 0.0f, 0.0f, + 1.0f, 0.0f, + 1.0f, 1.0f, + 0.0f, 1.0f + }; + float texcoords[] = { + 0.25f, 0.0f, + 0.75f, 0.0f, + 0.75f, 0.0f, + 0.25f, 0.0f + }; - glTexCoord1f(0.25f); - glVertex2f(0.0f, 1.0f); + int position_attrib = glGetAttribLocation(glsl_program_num, "position"); + assert(position_attrib != -1); + int texcoord_attrib = glGetAttribLocation(glsl_program_num, "texcoord"); + assert(texcoord_attrib != -1); + glEnableVertexAttribArray(position_attrib); + check_error(); + glVertexAttribPointer(position_attrib, 2, GL_FLOAT, GL_FALSE, 0, vertices); + check_error(); + glEnableVertexAttribArray(texcoord_attrib); + check_error(); + glVertexAttribPointer(texcoord_attrib, 2, GL_FLOAT, GL_FALSE, 0, texcoords); + check_error(); - glEnd(); + glDrawArrays(GL_QUADS, 0, 4); check_error(); - glDisable(GL_TEXTURE_1D); + glUseProgram(0); + check_error(); + glDisableVertexAttribArray(position_attrib); + check_error(); + glDisableVertexAttribArray(texcoord_attrib); check_error(); // Now read the data back and see what the card did. @@ -120,6 +137,7 @@ void measure_texel_subpixel_precision() biggest_jump = max(biggest_jump, out_data[i] - out_data[i - 1]); } + assert(biggest_jump > 0.0); movit_texel_subpixel_precision = biggest_jump; // Clean up. @@ -133,10 +151,14 @@ void measure_texel_subpixel_precision() check_error(); glDeleteTextures(1, &src_texnum); check_error(); + + resource_pool.release_glsl_program(glsl_program_num); } void measure_roundoff_problems() { + ResourcePool resource_pool; + // Generate a destination texture to render to, and an FBO. GLuint dst_texnum, fbo; @@ -178,8 +200,6 @@ void measure_roundoff_problems() check_error(); glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE32F_ARB, 512, 0, GL_LUMINANCE, GL_FLOAT, texdata); check_error(); - glEnable(GL_TEXTURE_1D); - check_error(); // Basic state. glDisable(GL_BLEND); @@ -191,34 +211,44 @@ 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_file("vs.vert"), read_file("texture1d.frag")); + glUseProgram(glsl_program_num); check_error(); + glUniform1i(glGetUniformLocation(glsl_program_num, "tex"), 0); // Bind the 1D 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); - - glTexCoord1f(1.0f); - glVertex2f(1.0f, 1.0f); - - glTexCoord1f(0.0f); - glVertex2f(0.0f, 1.0f); - - glEnd(); + float vertices[] = { + 0.0f, 0.0f, + 1.0f, 0.0f, + 1.0f, 1.0f, + 0.0f, 1.0f + }; + float texcoords[] = { + 0.25f, 0.0f, + 0.75f, 0.0f, + 0.75f, 0.0f, + 0.25f, 0.0f + }; + int position_attrib = glGetAttribLocation(glsl_program_num, "position"); + assert(position_attrib != -1); + int texcoord_attrib = glGetAttribLocation(glsl_program_num, "texcoord"); + assert(texcoord_attrib != -1); + glEnableVertexAttribArray(position_attrib); + check_error(); + glVertexAttribPointer(position_attrib, 2, GL_FLOAT, GL_FALSE, 0, vertices); + check_error(); + glEnableVertexAttribArray(texcoord_attrib); + check_error(); + glVertexAttribPointer(texcoord_attrib, 2, GL_FLOAT, GL_FALSE, 0, texcoords); check_error(); + glDrawArrays(GL_QUADS, 0, 4); - glDisable(GL_TEXTURE_1D); + glUseProgram(0); check_error(); + glDisableVertexAttribArray(position_attrib); + check_error(); + glDisableVertexAttribArray(texcoord_attrib); // 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.) @@ -249,6 +279,8 @@ void measure_roundoff_problems() check_error(); glDeleteTextures(1, &src_texnum); check_error(); + + resource_pool.release_glsl_program(glsl_program_num); } bool check_extensions() @@ -314,3 +346,5 @@ bool init_movit(const string& data_directory, MovitDebugLevel debug_level) movit_initialized = true; return true; } + +} // namespace movit