X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=85832db88541cfb90748dd55f8aca171a6621673;hp=623d64aad936e081e0b6d9e7f7ee26346a82107f;hb=aa72f1070c44ed0217ce1ffde599d5c40864ac4a;hpb=f4516cf70e80bf1153759919c8b2ab1cee37d9ec

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 623d64a..85832db 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -176,8 +176,8 @@ void EffectChain::finalize()
 	printf("%s\n", frag_shader.c_str());
 	
 	glsl_program_num = glCreateProgram();
-	GLhandleARB vs_obj = compile_shader(read_file("vs.glsl"), GL_VERTEX_SHADER);
-	GLhandleARB fs_obj = compile_shader(frag_shader, GL_FRAGMENT_SHADER);
+	GLuint vs_obj = compile_shader(read_file("vs.glsl"), GL_VERTEX_SHADER);
+	GLuint fs_obj = compile_shader(frag_shader, GL_FRAGMENT_SHADER);
 	glAttachShader(glsl_program_num, vs_obj);
 	check_error();
 	glAttachShader(glsl_program_num, fs_obj);
@@ -199,18 +199,21 @@ void EffectChain::render_to_screen(unsigned char *src)
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, SOURCE_IMAGE);
 
-	GLenum internal_format = GL_RGBA8;
+	GLenum format, internal_format;
 	if (use_srgb_texture_format) {
 		internal_format = GL_SRGB8;
+	} else {
+		internal_format = GL_RGBA8;
 	}
-
 	if (input_format.pixel_format == FORMAT_RGB) {
-		glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, src);
+		format = GL_RGB;
 	} else if (input_format.pixel_format == FORMAT_RGBA) {
-		glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, src);
+		format = GL_RGBA;
 	} else {
 		assert(false);
 	}
+
+	glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, src);
 	check_error();
 	glUniform1i(glGetUniformLocation(glsl_program_num, "input_tex"), 0);