Merge branch 'master' into epoxy

[movit] / resource_pool.cpp

diff --git a/resource_pool.cpp b/resource_pool.cpp
index e9241fc0d384f3981ce5ed8b8b8e2db04ef6e8be..b515769e4e8d49a6664e418d02745a171df1fb86 100644 (file)
--- a/resource_pool.cpp
+++ b/resource_pool.cpp
@@ -1,18 +1,21 @@
-#include "resource_pool.h"
-
-#include <stdio.h>
+#include <assert.h>
 #include <pthread.h>
-
+#include <stdio.h>
+#include <stdlib.h>
 #include <algorithm>
 #include <map>
 #include <string>
 #include <utility>
+#include <epoxy/gl.h>
 
 #include "init.h"
+#include "resource_pool.h"
 #include "util.h"
 
 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),
@@ -36,8 +39,7 @@ ResourcePool::~ResourcePool()
        for (list<GLuint>::const_iterator freelist_it = texture_freelist.begin();
             freelist_it != texture_freelist.end();
             ++freelist_it) {
-               GLuint free_texture_num = program_freelist.front();
-               program_freelist.pop_front();
+               GLuint free_texture_num = *freelist_it;
                assert(texture_formats.count(free_texture_num) != 0);
                texture_freelist_bytes -= estimate_texture_size(texture_formats[free_texture_num]);
                texture_formats.erase(free_texture_num);
@@ -51,7 +53,7 @@ ResourcePool::~ResourcePool()
 void ResourcePool::delete_program(GLuint glsl_program_num)
 {
        bool found_program = false;
-       for (std::map<std::pair<std::string, std::string>, GLuint>::iterator program_it = programs.begin();
+       for (map<pair<string, string>, GLuint>::iterator program_it = programs.begin();
             program_it != programs.end();
             ++program_it) {
                if (program_it->second == glsl_program_num) {
@@ -63,7 +65,7 @@ void ResourcePool::delete_program(GLuint glsl_program_num)
        assert(found_program);
        glDeleteProgram(glsl_program_num);
 
-       std::map<GLuint, std::pair<GLuint, GLuint> >::iterator shader_it =
+       map<GLuint, pair<GLuint, GLuint> >::iterator shader_it =
                program_shaders.find(glsl_program_num);
        assert(shader_it != program_shaders.end());
 
@@ -103,6 +105,15 @@ GLuint ResourcePool::compile_glsl_program(const string& vertex_shader, const str
                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;
@@ -179,8 +190,8 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs
        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.
@@ -248,7 +259,7 @@ size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format)
        case GL_RG16F:
                bytes_per_pixel = 4;
                break;
-       case GL_LUMINANCE8:
+       case GL_R8:
                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;
 }
+
+}  // namespace movit