X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=init.cpp;h=d8d249f256203decf638fb92febea1f44e758bdc;hp=aca85b9d404f152b8971230612c696dbc747a11e;hb=8dedcc2fd11b00fec125212b60e144363033137d;hpb=88add60f9ee1049ebd39ef3e1903e2636bdac313

diff --git a/init.cpp b/init.cpp
index aca85b9..d8d249f 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;
@@ -271,17 +274,23 @@ void check_extensions()
 	// 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");
 }
 
 }  // namespace
 
-void init_movit(const std::string& data_directory, MovitDebugLevel debug_level)
+void init_movit(const string& data_directory, MovitDebugLevel debug_level)
 {
 	if (movit_initialized) {
 		return;
 	}
 
-	movit_data_directory = new std::string(data_directory);
+	movit_data_directory = new string(data_directory);
 	movit_debug_level = debug_level;
 
 	glewInit();