Ignore .ld files.

[movit] / init.h

diff --git a/init.h b/init.h
index 398ddbe647e82b0fb832f26882dfb521ec91aaef..d6f6dd40b005b71c338bac61e151c83701a9323c 100644 (file)
--- 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.
 
@@ -63,4 +67,6 @@ extern bool movit_shader_rounding_supported;
 // Whether the GPU in use supports GL_EXT_texture_sRGB.
 extern bool movit_srgb_textures_supported;
 
+}  // namespace movit
+
 #endif  // !defined(_MOVIT_INIT_H)