Allow for more than ten bits in subpixel precision measuring; modern llvmpipe seems...

[movit] / init.cpp

diff --git a/init.cpp b/init.cpp
index a89028c645eb1504a203b0562948a4693ebfa614..b8b3cb4e884de457e57acc854b6ba0c593426df5 100644 (file)
--- a/init.cpp
+++ b/init.cpp
@@ -1,17 +1,24 @@
 #include <GL/glew.h>
 #include <GL/glew.h>

+#include <string>

 
 #include "init.h"
 #include "util.h"
 
 bool movit_initialized = false;
 
 #include "init.h"
 #include "util.h"
 
 bool movit_initialized = false;

+MovitDebugLevel movit_debug_level = MOVIT_DEBUG_ON;

 float movit_texel_subpixel_precision;
 bool movit_srgb_textures_supported;
 
 float movit_texel_subpixel_precision;
 bool movit_srgb_textures_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;
+

 namespace {
 
 void measure_texel_subpixel_precision()
 {
 namespace {
 
 void measure_texel_subpixel_precision()
 {

-       static const unsigned width = 1024;
+       static const unsigned width = 4096;

 
        // Generate a destination texture to render to, and an FBO.
        GLuint dst_texnum, fbo;
 
        // Generate a destination texture to render to, and an FBO.
        GLuint dst_texnum, fbo;


@@ -148,12 +155,15 @@ void check_extensions()
 
 }  // namespace
 
 
 }  // namespace
 

-void init_movit()
+void init_movit(const std::string& data_directory, MovitDebugLevel debug_level)

 {
        if (movit_initialized) {
                return;
        }
 
 {
        if (movit_initialized) {
                return;
        }
 

+       movit_data_directory = new std::string(data_directory);
+       movit_debug_level = debug_level;
+

        glewInit();
 
        // geez 
        glewInit();
 
        // geez