Drop support for SDL1, which is no longer maintained.

[movit] / demo.cpp

diff --git a/demo.cpp b/demo.cpp
index aabb615d02f05391d09ce88b06b125e0845fe21c..1c38fc30b7ecf70e9f4351920d55b2344e1515fc 100644 (file)
--- a/demo.cpp
+++ b/demo.cpp
@@ -5,7 +5,6 @@
 
 #include <epoxy/gl.h>
 
-#ifdef HAVE_SDL2
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_error.h>
 #include <SDL2/SDL_events.h>
@@ -13,16 +12,6 @@
 #include <SDL2/SDL_keyboard.h>
 #include <SDL2/SDL_mouse.h>
 #include <SDL2/SDL_video.h>
-#else
-#include <SDL/SDL.h>
-#include <SDL/SDL_error.h>
-#include <SDL/SDL_events.h>
-#include <SDL/SDL_image.h>
-#include <SDL/SDL_keyboard.h>
-#include <SDL/SDL_keysym.h>
-#include <SDL/SDL_mouse.h>
-#include <SDL/SDL_video.h>
-#endif
 
 #include <assert.h>
 #include <features.h>
@@ -133,11 +122,6 @@ unsigned char *load_image(const char *filename, unsigned *w, unsigned *h)
        rgba_fmt.Bshift = 0;
        rgba_fmt.Ashift = 24;
 
-#ifndef HAVE_SDL2
-       rgba_fmt.colorkey = 0;
-       rgba_fmt.alpha = 255;
-#endif
-
        SDL_Surface *converted = SDL_ConvertSurface(img, &rgba_fmt, SDL_SWSURFACE);
 
        *w = img->w;
@@ -189,7 +173,6 @@ int main(int argc, char **argv)
        SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
        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);
@@ -201,10 +184,6 @@ int main(int argc, char **argv)
                SDL_WINDOW_OPENGL);
        SDL_GLContext context = SDL_GL_CreateContext(window);
        assert(context != nullptr);
-#else
-       SDL_SetVideoMode(WIDTH, HEIGHT, 0, SDL_OPENGL);
-       SDL_WM_SetCaption("OpenGL window", nullptr);
-#endif
 
        CHECK(init_movit(".", MOVIT_DEBUG_ON));
        printf("GPU texture subpixel precision: about %.1f bits\n",
@@ -305,11 +284,7 @@ int main(int argc, char **argv)
                draw_saturation_bar(0.75f, blur_radius / 100.0f);
                draw_saturation_bar(0.80f, blurred_mix_amount);
 
-#ifdef HAVE_SDL2
                SDL_GL_SwapWindow(window);
-#else
-               SDL_GL_SwapBuffers();
-#endif
                check_error();
 
                glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, pbo);