.gitignore more unit tests.

[movit] / resource_pool.cpp

diff --git a/resource_pool.cpp b/resource_pool.cpp
index 81a6bd4afc7f1f09f8083d9eef02e2ec8e5c679d..72b309519062b728d7b1b6ae73d05c0cc5086c9d 100644 (file)
--- a/resource_pool.cpp
+++ b/resource_pool.cpp
@@ -14,6 +14,8 @@
 
 using namespace std;
 
 
 using namespace std;
 

+namespace movit {
+

 ResourcePool::ResourcePool(size_t program_freelist_max_length,
                            size_t texture_freelist_max_bytes)
        : program_freelist_max_length(program_freelist_max_length),
 ResourcePool::ResourcePool(size_t program_freelist_max_length,
                            size_t texture_freelist_max_bytes)
        : program_freelist_max_length(program_freelist_max_length),


@@ -103,6 +105,15 @@ GLuint ResourcePool::compile_glsl_program(const string& vertex_shader, const str
                glLinkProgram(glsl_program_num);
                check_error();
 
                glLinkProgram(glsl_program_num);
                check_error();
 

+               GLint success;
+               glGetProgramiv(glsl_program_num, GL_LINK_STATUS, &success);
+               if (success == GL_FALSE) {
+                       GLchar error_log[1024] = {0};
+                       glGetProgramInfoLog(glsl_program_num, 1024, NULL, error_log);
+                       fprintf(stderr, "Error linking program: %s\n", error_log);
+                       exit(1);
+               }
+

                if (movit_debug_level == MOVIT_DEBUG_ON) {
                        // Output shader to a temporary file, for easier debugging.
                        static int compiled_shader_num = 0;
                if (movit_debug_level == MOVIT_DEBUG_ON) {
                        // Output shader to a temporary file, for easier debugging.
                        static int compiled_shader_num = 0;


@@ -179,8 +190,8 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs
        case GL_RG16F:
                format = GL_RG;
                break;
        case GL_RG16F:
                format = GL_RG;
                break;

-       case GL_LUMINANCE8:
-               format = GL_LUMINANCE;
+       case GL_R8:
+               format = GL_RED;

                break;
        default:
                // TODO: Add more here as needed.
                break;
        default:
                // TODO: Add more here as needed.


@@ -248,7 +259,7 @@ size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format)
        case GL_RG16F:
                bytes_per_pixel = 4;
                break;
        case GL_RG16F:
                bytes_per_pixel = 4;
                break;

-       case GL_LUMINANCE8:
+       case GL_R8:

                bytes_per_pixel = 1;
                break;
        default:
                bytes_per_pixel = 1;
                break;
        default:


@@ -258,3 +269,5 @@ size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format)
 
        return texture_format.width * texture_format.height * bytes_per_pixel;
 }
 
        return texture_format.width * texture_format.height * bytes_per_pixel;
 }

+
+}  // namespace movit