X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=init.h;h=3ecc29b6270242c4fb43390c75bc15de3fd646c5;hp=9b4deff5c7a36bb256b93ba199b5c8862c55f961;hb=645c0e312389d15c6661c152ce9635183e9ca307;hpb=271fa61d1251144b5558555ec9873e9f24a13a70

diff --git a/init.h b/init.h
index 9b4deff..3ecc29b 100644
--- a/init.h
+++ b/init.h
@@ -1,8 +1,11 @@
 #ifndef _MOVIT_INIT_H
 #define _MOVIT_INIT_H
 
+#include "defs.h"
 #include <string>
 
+namespace movit {
+
 enum MovitDebugLevel {
 	MOVIT_DEBUG_OFF = 0,
 	MOVIT_DEBUG_ON = 1,
@@ -10,7 +13,8 @@ enum MovitDebugLevel {
 
 // Initialize the library; in particular, will query the GPU for information
 // that is needed by various components. For instance, it verifies that
-// we have all the OpenGL extensions we need.
+// we have all the OpenGL extensions we need. Returns true if initialization
+// succeeded.
 //
 // The first parameter gives which directory to read .frag files from.
 // This is a temporary hack until we add something more solid.
@@ -20,8 +24,8 @@ enum MovitDebugLevel {
 // generated shaders to the current directory.
 //
 // If you call init_movit() twice with different parameters,
-// only the first will count.
-void init_movit(const std::string& data_directory, MovitDebugLevel debug_level);
+// only the first will count, and the second will always return true.
+bool init_movit(const std::string& data_directory, MovitDebugLevel debug_level) MUST_CHECK_RESULT;
 
 // GPU features. These are not intended for end-user use.
 
@@ -51,11 +55,30 @@ extern float movit_texel_subpixel_precision;
 // round the right way (giving some leeway, but not a lot); the number
 // of errors are stored here.
 //
-// If this value is above 0, and you have enabled dithering, we will
-// round off explicitly at the very end of the shader.
+// If this value is above 0, the extension GL_EXT_gpu_shader4 is available
+// (giving round()) and you have enabled dithering, we will round off
+// explicitly at the very end of the shader.
+//
+// Note: I don't know of any cards that round off wrong (well, outside
+// our tolerance) and do not have this extension.
 extern int movit_num_wrongly_rounded;
+extern bool movit_shader_rounding_supported;
 
 // Whether the GPU in use supports GL_EXT_texture_sRGB.
 extern bool movit_srgb_textures_supported;
 
+// Whether the OpenGL driver (or GPU) in use supports GL_ARB_timer_query.
+extern bool movit_timer_queries_supported;
+
+// What shader model we are compiling for. This only affects the choice
+// of a few files (like header.frag); most of the shaders are the same.
+enum MovitShaderModel {
+	MOVIT_GLSL_110,
+	MOVIT_GLSL_130,
+	MOVIT_ESSL_300
+};
+extern MovitShaderModel movit_shader_model;
+
+}  // namespace movit
+
 #endif  // !defined(_MOVIT_INIT_H)