X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=demo.cpp;h=dd04c84314160ccdec170672ae8244092efaa2ac;hp=c9b46ea7ed6f78f08be936cb1c5f6199e8d98141;hb=490f53088d8cc2bf9590f0822cbd7e8bc73be55a;hpb=15daf781e6ce00ec37ca806a16e490d59dcb4e24 diff --git a/demo.cpp b/demo.cpp index c9b46ea..dd04c84 100644 --- a/demo.cpp +++ b/demo.cpp @@ -1,4 +1,3 @@ -#define GL_GLEXT_PROTOTYPES 1 #define NO_SDL_GLEXT 1 #define WIDTH 1280 @@ -191,6 +190,10 @@ int main(int argc, char **argv) SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); #ifdef HAVE_SDL2 + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1); + // SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG); SDL_Window *window = SDL_CreateWindow("OpenGL window", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, @@ -209,11 +212,7 @@ int main(int argc, char **argv) printf("Wrongly rounded x+0.48 or x+0.52 values: %d/510\n", movit_num_wrongly_rounded); if (movit_num_wrongly_rounded > 0) { - if (movit_shader_rounding_supported) { - printf("Rounding off in the shader to compensate.\n"); - } else { - printf("No shader roundoff available; cannot compensate.\n"); - } + printf("Rounding off in the shader to compensate.\n"); } unsigned img_w, img_h; @@ -222,13 +221,6 @@ int main(int argc, char **argv) EffectChain chain(WIDTH, HEIGHT); glViewport(0, 0, WIDTH, HEIGHT); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0.0, 1.0, 0.0, 1.0, 0.0, 1.0); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - ImageFormat inout_format; inout_format.color_space = COLORSPACE_sRGB; inout_format.gamma_curve = GAMMA_sRGB; @@ -253,7 +245,8 @@ int main(int argc, char **argv) glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, pbo); glBufferData(GL_PIXEL_PACK_BUFFER_ARB, WIDTH * HEIGHT * 4, NULL, GL_STREAM_READ); - make_hsv_wheel_texture(); + init_hsv_resources(); + check_error(); int frame = 0; bool screenshot = false; @@ -301,7 +294,6 @@ int main(int argc, char **argv) glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, 0); check_error(); - glLoadIdentity(); draw_hsv_wheel(0.0f, lift_rad, lift_theta, lift_v); draw_hsv_wheel(0.2f, gamma_rad, gamma_theta, gamma_v); draw_hsv_wheel(0.4f, gain_rad, gain_theta, gain_v); @@ -360,5 +352,6 @@ int main(int argc, char **argv) } #endif } + cleanup_hsv_resources(); return 0; }