-#define GL_GLEXT_PROTOTYPES 1
#define NO_SDL_GLEXT 1
#define WIDTH 1280
#define HEIGHT 720
-#include <GL/glew.h>
-#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>
+#include <epoxy/gl.h>
+
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_error.h>
+#include <SDL2/SDL_events.h>
+#include <SDL2/SDL_image.h>
+#include <SDL2/SDL_keyboard.h>
+#include <SDL2/SDL_mouse.h>
+#include <SDL2/SDL_video.h>
+
#include <assert.h>
#include <features.h>
#include <math.h>
#include "util.h"
#include "widgets.h"
+using namespace movit;
+
unsigned char result[WIDTH * HEIGHT * 4];
float lift_theta = 0.0f, lift_rad = 0.0f, lift_v = 0.0f;
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;
rgba_fmt.Gshift = 8;
rgba_fmt.Bshift = 0;
rgba_fmt.Ashift = 24;
-
- rgba_fmt.colorkey = 0;
- rgba_fmt.alpha = 255;
SDL_Surface *converted = SDL_ConvertSurface(img, &rgba_fmt, SDL_SWSURFACE);
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))) {
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);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
- SDL_SetVideoMode(WIDTH, HEIGHT, 0, SDL_OPENGL);
- SDL_WM_SetCaption("OpenGL window", NULL);
+
+ 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,
+ WIDTH, HEIGHT,
+ SDL_WINDOW_OPENGL);
+ SDL_GLContext context = SDL_GL_CreateContext(window);
+ assert(context != nullptr);
CHECK(init_movit(".", MOVIT_DEBUG_ON));
printf("GPU texture subpixel precision: about %.1f bits\n",
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;
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);
- make_hsv_wheel_texture();
+ init_hsv_resources();
+ check_error();
int frame = 0;
bool screenshot = false;
clock_gettime(CLOCK_MONOTONIC, &start);
#else
struct timeval start, now;
- gettimeofday(&start, NULL);
+ gettimeofday(&start, nullptr);
#endif
while (!quit) {
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);
draw_saturation_bar(0.75f, blur_radius / 100.0f);
draw_saturation_bar(0.80f, blurred_mix_amount);
- SDL_GL_SwapBuffers();
+ SDL_GL_SwapWindow(window);
check_error();
glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, pbo);
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
}
#endif
}
+ cleanup_hsv_resources();
return 0;
}