-#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 "shader.h"
namespace Msp {
namespace GL {
-Shader::Shader(ShaderType t)
+Shader::Shader(GLenum t)
{
init(t);
}
-Shader::Shader(ShaderType t, const string &src)
+Shader::Shader(GLenum t, const string &src)
{
init(t);
compile();
}
-void Shader::init(ShaderType t)
+void Shader::init(GLenum t)
{
compiled = false;
- if(t==FRAGMENT_SHADER)
+ if(t==GL_FRAGMENT_SHADER)
static Require _req(ARB_fragment_shader);
- else if(t==VERTEX_SHADER)
+ else if(t==GL_VERTEX_SHADER)
static Require _req(ARB_vertex_shader);
id = glCreateShader(t);
return log;
}
+
+VertexShader::VertexShader():
+ Shader(GL_VERTEX_SHADER)
+{ }
+
+VertexShader::VertexShader(const string &src):
+ Shader(GL_VERTEX_SHADER, src)
+{ }
+
+
+FragmentShader::FragmentShader():
+ Shader(GL_FRAGMENT_SHADER)
+{ }
+
+FragmentShader::FragmentShader(const string &src):
+ Shader(GL_FRAGMENT_SHADER, src)
+{ }
+
} // namespace GL
} // namespace Msp