X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=main.cpp;h=256b29ecb9a2bf2dff97208bc5da77b1c7262b14;hp=3b2bcad7961dc53c5bd13ed8a8703602c2b5bfd3;hb=b8ff086e2b949d7135eb5031edb3606d29400eac;hpb=a88f299483ffe5068cd2828513078b9103325da8

diff --git a/main.cpp b/main.cpp
index 3b2bcad..256b29e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -38,39 +38,6 @@ float lift_r = 0.0f, lift_g = 0.0f, lift_b = 0.0f;
 float gamma_r = 1.0f, gamma_g = 1.0f, gamma_b = 1.0f;
 float gain_r = 1.0f, gain_g = 1.0f, gain_b = 1.0f;
 
-GLhandleARB read_shader(const char* filename, GLenum type)
-{
-	static char buf[131072];
-	FILE *fp = fopen(filename, "r");
-	if (fp == NULL) {
-		perror(filename);
-		exit(1);
-	}
-
-	int len = fread(buf, 1, sizeof(buf), fp);
-	fclose(fp);
-
-	GLhandleARB obj = glCreateShaderObjectARB(type);
-	const GLchar* source[] = { buf };
-	const GLint length[] = { len };
-	glShaderSource(obj, 1, source, length);
-	glCompileShader(obj);
-
-	GLchar info_log[4096];
-	GLsizei log_length = sizeof(info_log) - 1;
-	glGetShaderInfoLog(obj, log_length, &log_length, info_log);
-	info_log[log_length] = 0; 
-	printf("shader compile log: %s\n", info_log);
-
-	GLint status;
-	glGetShaderiv(obj, GL_COMPILE_STATUS, &status);
-	if (status == GL_FALSE) {
-		exit(1);
-	}
-
-	return obj;
-}
-
 void draw_picture_quad(GLint prog, int frame)
 {
 	glUseProgramObjectARB(prog);
@@ -171,7 +138,7 @@ void mouse(int x, int y)
 	update_hsv();
 }
 
-void load_texture(const char *filename)
+unsigned char *load_image(const char *filename, unsigned *w, unsigned *h)
 {
 	SDL_Surface *img = IMG_Load(filename);
 	if (img == NULL) {
@@ -210,17 +177,30 @@ void load_texture(const char *filename)
 	}
 	SDL_UnlockSurface(img);
 
+	*w = img->w;
+	*h = img->h;
+
+	SDL_FreeSurface(img);
+
+	return dst_pixels;
+}
+
+void load_texture(const char *filename)
+{
+	unsigned w, h;
+	unsigned char *pixels = load_image(filename, &w, &h);
+
 #if 1
 	// we will convert to sRGB in the shader
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, img->w, img->h, 0, GL_RGB, GL_UNSIGNED_BYTE, dst_pixels);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, pixels);
 	check_error();
 #else
 	// implicit sRGB conversion in hardware
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8, img->w, img->h, 0, GL_RGB, GL_UNSIGNED_BYTE, dst_pixels);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, pixels);
 	check_error();
 #endif
-	free(dst_pixels);
-	SDL_FreeSurface(img);
+
+	free(pixels);
 }
 
 void write_ppm(const char *filename, unsigned char *screenbuf)
@@ -259,6 +239,19 @@ int main(int argc, char **argv)
 	check_error();
 
 	load_texture("blg_wheels_woman_1.jpg");
+
+	EffectChain chain(WIDTH, HEIGHT);
+
+	ImageFormat inout_format;
+	inout_format.pixel_format = FORMAT_RGB;
+	inout_format.color_space = COLORSPACE_sRGB;
+	inout_format.gamma_curve = GAMMA_sRGB;
+
+	chain.add_input(inout_format);
+	Effect *lift_gamma_gain_effect = chain.add_effect(LIFT_GAMMA_GAIN);
+	chain.add_output(inout_format);
+	chain.finalize();
+
 	//glGenerateMipmap(GL_TEXTURE_2D);
 	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 4);
 	//check_error();
@@ -314,8 +307,8 @@ int main(int argc, char **argv)
 	update_hsv();
 
 	int prog = glCreateProgram();
-	GLhandleARB vs_obj = read_shader("vs.glsl", GL_VERTEX_SHADER);
-	GLhandleARB fs_obj = read_shader("fs.glsl", GL_FRAGMENT_SHADER);
+	GLhandleARB vs_obj = compile_shader(read_file("vs.glsl"), GL_VERTEX_SHADER);
+	GLhandleARB fs_obj = compile_shader(read_file("fs.glsl"), GL_FRAGMENT_SHADER);
 	glAttachObjectARB(prog, vs_obj);
 	check_error();
 	glAttachObjectARB(prog, fs_obj);
@@ -352,6 +345,7 @@ int main(int argc, char **argv)
 
 		++frame;
 
+		
 		draw_picture_quad(prog, frame);
 		
 		glReadPixels(0, 0, WIDTH, HEIGHT, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, BUFFER_OFFSET(0));