geometry shaders, map poi icons

gl/glsl_common.cpp

@@ -63,6 +63,7 @@ void gl::glsl_common_setup()
     {
         mat4 projection;
         mat4 lightview;
+	    vec3 scene_extra;
         float time;
     };
 

gl/shader.cpp

@@ -228,6 +228,8 @@ gl::shader::shader(const std::string &filename)
         type = GL_VERTEX_SHADER;
     else if (strcend(filename, ".frag"))
         type = GL_FRAGMENT_SHADER;
+	else if (strcend(filename, ".geom"))
+		type = GL_GEOMETRY_SHADER;
     else
         throw shader_exception("unknown shader " + filename);
 

gl/ubo.h

@@ -37,8 +37,8 @@ namespace gl
     {
         glm::mat4 projection;
         glm::mat4 lightview;
+		glm::vec3 scene_extra;
         float time;
-        UBS_PAD(12);
     };
 
     static_assert(sizeof(scene_ubs) == 144, "bad size of ubs");