X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=demo.cpp;h=1c38fc30b7ecf70e9f4351920d55b2344e1515fc;hp=ff910f09124edbb6d914315d746818b50feb921f;hb=eff011224abc5dc81f801f3ea44572287a55bcac;hpb=bb8f46837ca4dfa2d085dfbf62e5c27136778712

diff --git a/demo.cpp b/demo.cpp
index ff910f0..1c38fc3 100644
--- a/demo.cpp
+++ b/demo.cpp
@@ -1,4 +1,3 @@
-#define GL_GLEXT_PROTOTYPES 1
 #define NO_SDL_GLEXT 1
 
 #define WIDTH 1280
@@ -6,7 +5,6 @@
 
 #include <epoxy/gl.h>
 
-#ifdef HAVE_SDL2
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_error.h>
 #include <SDL2/SDL_events.h>
@@ -14,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>
@@ -112,13 +100,13 @@ void mouse(int x, int y)
 unsigned char *load_image(const char *filename, unsigned *w, unsigned *h)
 {
 	SDL_Surface *img = IMG_Load(filename);
-	if (img == NULL) {
+	if (img == nullptr) {
 		fprintf(stderr, "Load of '%s' failed\n", filename);
 		exit(1);
 	}
 
 	SDL_PixelFormat rgba_fmt;
-	rgba_fmt.palette = NULL;
+	rgba_fmt.palette = nullptr;
 	rgba_fmt.BitsPerPixel = 32;
 	rgba_fmt.BytesPerPixel = 8;
 	rgba_fmt.Rloss = rgba_fmt.Gloss = rgba_fmt.Bloss = rgba_fmt.Aloss = 0;
@@ -134,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;
@@ -152,7 +135,7 @@ unsigned char *load_image(const char *filename, unsigned *w, unsigned *h)
 void write_png(const char *filename, unsigned char *screenbuf)
 {
 	FILE *fp = fopen(filename, "wb");
-	png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+	png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
 	png_infop info_ptr = png_create_info_struct(png_ptr);
 	
 	if (setjmp(png_jmpbuf(png_ptr))) {
@@ -170,7 +153,7 @@ void write_png(const char *filename, unsigned char *screenbuf)
 
 	png_init_io(png_ptr, fp);
 	png_set_rows(png_ptr, info_ptr, row_pointers);
-	png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_BGR, NULL);
+	png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_BGR, nullptr);
 	png_destroy_write_struct(&png_ptr, &info_ptr);
 	fclose(fp);
 
@@ -190,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,11 +183,7 @@ int main(int argc, char **argv)
 		WIDTH, HEIGHT,
 		SDL_WINDOW_OPENGL);
 	SDL_GLContext context = SDL_GL_CreateContext(window);
-	assert(context != NULL);
-#else
-	SDL_SetVideoMode(WIDTH, HEIGHT, 0, SDL_OPENGL);
-	SDL_WM_SetCaption("OpenGL window", NULL);
-#endif
+	assert(context != nullptr);
 
 	CHECK(init_movit(".", MOVIT_DEBUG_ON));
 	printf("GPU texture subpixel precision: about %.1f bits\n",
@@ -244,7 +222,7 @@ int main(int argc, char **argv)
 	GLuint pbo;
 	glGenBuffers(1, &pbo);
 	glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, pbo);
-	glBufferData(GL_PIXEL_PACK_BUFFER_ARB, WIDTH * HEIGHT * 4, NULL, GL_STREAM_READ);
+	glBufferData(GL_PIXEL_PACK_BUFFER_ARB, WIDTH * HEIGHT * 4, nullptr, GL_STREAM_READ);
 
 	init_hsv_resources();
 	check_error();
@@ -256,7 +234,7 @@ int main(int argc, char **argv)
 	clock_gettime(CLOCK_MONOTONIC, &start);
 #else
 	struct timeval start, now;
-	gettimeofday(&start, NULL);
+	gettimeofday(&start, nullptr);
 #endif
 
 	while (!quit) {
@@ -306,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);
@@ -335,7 +309,7 @@ int main(int argc, char **argv)
 		double elapsed = now.tv_sec - start.tv_sec +
 			1e-9 * (now.tv_nsec - start.tv_nsec);
 #else
-		gettimeofday(&now, NULL);
+		gettimeofday(&now, nullptr);
 		double elapsed = now.tv_sec - start.tv_sec +
 			1e-6 * (now.tv_usec - start.tv_usec);
 #endif