X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fshader.h;h=c1fd6b2294a47c57c38b62ce9aa41241c19bc9c6;hp=86a70be0e10eb5716b2b296d17e7998c6a8c9e1a;hb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;hpb=ceae2a27dfc58310c5bab7e3aa3fedf0fa9a1f49 diff --git a/source/shader.h b/source/shader.h index 86a70be0..c1fd6b22 100644 --- a/source/shader.h +++ b/source/shader.h @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #ifndef MSP_GL_SHADER_H_ #define MSP_GL_SHADER_H_ @@ -16,12 +9,16 @@ namespace GL { enum ShaderType { - FRAGMENT_SHADER = GL_FRAGMENT_SHADER, - VERTEX_SHADER = GL_VERTEX_SHADER + FRAGMENT_SHADER = GL_FRAGMENT_SHADER_ARB, + VERTEX_SHADER = GL_VERTEX_SHADER_ARB }; class Shader { +private: + unsigned id; + bool compiled; + public: Shader(ShaderType t); Shader(ShaderType t, const std::string &); @@ -35,12 +32,8 @@ public: void source(const char *str, int len); void compile(); unsigned get_id() const { return id; } - bool get_compiled() const { return compiled; } - int get_param(GLenum param) const; + bool is_compiled() const { return compiled; } std::string get_info_log() const; -private: - unsigned id; - bool compiled; }; } // namespace GL