X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=init.cpp;h=fd22778f4ccec152cc973f2ebe1f6ffa51d1d935;hb=0fa51e08f83e0283337216f5b951b3d5a8c0555b;hp=396cd8b68106d5855e88ff6f67ee46f6d982f9b3;hpb=271fa61d1251144b5558555ec9873e9f24a13a70;p=movit

diff --git a/init.cpp b/init.cpp
index 396cd8b..fd22778 100644
--- a/init.cpp
+++ b/init.cpp
@@ -7,16 +7,19 @@
 #include "init.h"
 #include "util.h"
 
+using namespace std;
+
 bool movit_initialized = false;
 MovitDebugLevel movit_debug_level = MOVIT_DEBUG_ON;
 float movit_texel_subpixel_precision;
 bool movit_srgb_textures_supported;
 int movit_num_wrongly_rounded;
+bool movit_shader_rounding_supported;
 
 // The rules for objects with nontrivial constructors in static scope
 // are somewhat convoluted, and easy to mess up. We simply have a
 // pointer instead (and never care to clean it up).
-std::string *movit_data_directory = NULL;
+string *movit_data_directory = NULL;
 
 namespace {
 
@@ -114,7 +117,7 @@ void measure_texel_subpixel_precision()
 	float biggest_jump = 0.0f;
 	for (unsigned i = 1; i < width; ++i) {
 		assert(out_data[i] >= out_data[i - 1]);
-		biggest_jump = std::max(biggest_jump, out_data[i] - out_data[i - 1]);
+		biggest_jump = max(biggest_jump, out_data[i] - out_data[i - 1]);
 	}
 
 	movit_texel_subpixel_precision = biggest_jump;
@@ -248,51 +251,66 @@ void measure_roundoff_problems()
 	check_error();
 }
 
-void check_extensions()
+bool check_extensions()
 {
 	// We fundamentally need FBOs and floating-point textures.
-	assert(glewIsSupported("GL_ARB_framebuffer_object") != 0);
-	assert(glewIsSupported("GL_ARB_texture_float") != 0);
+	if (!glewIsSupported("GL_ARB_framebuffer_object")) return false;
+	if (!glewIsSupported("GL_ARB_texture_float")) return false;
 
 	// We assume that we can use non-power-of-two textures without restrictions.
-	assert(glewIsSupported("GL_ARB_texture_non_power_of_two") != 0);
+	if (!glewIsSupported("GL_ARB_texture_non_power_of_two")) return false;
 
 	// We also need GLSL fragment shaders.
-	assert(glewIsSupported("GL_ARB_fragment_shader") != 0);
-	assert(glewIsSupported("GL_ARB_shading_language_100") != 0);
+	if (!glewIsSupported("GL_ARB_fragment_shader")) return false;
+	if (!glewIsSupported("GL_ARB_shading_language_100")) return false;
 
 	// FlatInput and YCbCrInput uses PBOs. (They could in theory do without,
 	// but no modern card would really not provide it.)
-	assert(glewIsSupported("GL_ARB_pixel_buffer_object") != 0);
+	if (!glewIsSupported("GL_ARB_pixel_buffer_object")) return false;
 
 	// ResampleEffect uses RG textures to encode a two-component LUT.
-	assert(glewIsSupported("GL_ARB_texture_rg") != 0);
+	if (!glewIsSupported("GL_ARB_texture_rg")) return false;
 
 	// sRGB texture decode would be nice, but are not mandatory
 	// (GammaExpansionEffect can do the same thing if needed).
 	movit_srgb_textures_supported = glewIsSupported("GL_EXT_texture_sRGB");
+
+	// We may want to use round() at the end of the final shader,
+	// if supported. We need either GLSL 1.30 or this extension to do that,
+	// and 1.30 brings with it other things that we don't want to demand
+	// for now.
+	movit_shader_rounding_supported = glewIsSupported("GL_EXT_gpu_shader4");
+
+	return true;
 }
 
 }  // namespace
 
-void init_movit(const std::string& data_directory, MovitDebugLevel debug_level)
+bool init_movit(const string& data_directory, MovitDebugLevel debug_level)
 {
 	if (movit_initialized) {
-		return;
+		return true;
 	}
 
-	movit_data_directory = new std::string(data_directory);
+	movit_data_directory = new string(data_directory);
 	movit_debug_level = debug_level;
 
-	glewInit();
+	GLenum err = glewInit();
+	if (err != GLEW_OK) {
+		return false;
+	}
 
 	// geez	
 	glPixelStorei(GL_PACK_ALIGNMENT, 1);
 	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+	glDisable(GL_DITHER);
 
+	if (!check_extensions()) {
+		return false;
+	}
 	measure_texel_subpixel_precision();
 	measure_roundoff_problems();
-	check_extensions();
 
 	movit_initialized = true;
+	return true;
 }