X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fshader.cpp;h=0c356f5f460826f7e97877881d15f35ba3db36f0;hp=1b3455f1aa91270c810d0494ac80c3e80b7fe051;hb=HEAD;hpb=6924ea10c4111b11eab51f0e1aa5b4a6438da7d3

diff --git a/source/shader.cpp b/source/shader.cpp
deleted file mode 100644
index 1b3455f1..00000000
--- a/source/shader.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-#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;
-
-namespace Msp {
-namespace GL {
-
-Shader::Shader(GLenum t)
-{
-	init(t);
-}
-
-Shader::Shader(GLenum t, const string &src)
-{
-	init(t);
-
-	source(src);
-	compile();
-}
-
-void Shader::init(GLenum t)
-{
-	compiled = false;
-
-	if(t==GL_FRAGMENT_SHADER)
-		static Require _req(ARB_fragment_shader);
-	else if(t==GL_VERTEX_SHADER)
-		static Require _req(ARB_vertex_shader);
-
-	id = glCreateShader(t);
-}
-
-Shader::~Shader()
-{
-	glDeleteShader(id);
-}
-
-void Shader::source(unsigned count, const char **str, const int *len)
-{
-	glShaderSource(id, count, str, len);
-}
-
-void Shader::source(const string &str)
-{
-	source(str.data(), str.size());
-}
-
-void Shader::source(const char *str, int len)
-{
-	source(1, &str, &len);
-}
-
-void Shader::compile()
-{
-	glCompileShader(id);
-	compiled = get_shader_i(id, GL_COMPILE_STATUS);
-	if(!compiled)
-		throw compile_error(get_info_log());
-}
-
-string Shader::get_info_log() const
-{
-	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);
-	delete[] buf;
-	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