-#include "arb_fragment_shader.h"
-#include "arb_shader_objects.h"
-#include "arb_vertex_shader.h"
+#include <msp/gl/extensions/arb_fragment_shader.h>
+#include <msp/gl/extensions/arb_shader_objects.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
#include "error.h"
+#include "misc.h"
#include "shader.h"
using namespace std;
void Shader::compile()
{
glCompileShader(id);
- int value = 0;
- glGetShaderiv(id, GL_COMPILE_STATUS, &value);
- if(!(compiled = value))
+ compiled = get_shader_i(id, GL_COMPILE_STATUS);
+ if(!compiled)
throw compile_error(get_info_log());
}
string Shader::get_info_log() const
{
- GLsizei len = 0;
- glGetShaderiv(id, GL_INFO_LOG_LENGTH, &len);
+ GLsizei len = get_shader_i(id, GL_INFO_LOG_LENGTH);
char *buf = new char[len+1];
glGetShaderInfoLog(id, len+1, &len, buf);
string log(buf, len);