X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogram.cpp;h=b3773a6359a8d576cea5664814c48e685dc6608d;hp=01644c02400d739b82f737a4e90aee8c886b3189;hb=ceae2a27dfc58310c5bab7e3aa3fedf0fa9a1f49;hpb=8f2430208cfa7bb9dc5bd655dde88acc21db54d2 diff --git a/source/program.cpp b/source/program.cpp index 01644c02..b3773a63 100644 --- a/source/program.cpp +++ b/source/program.cpp @@ -76,7 +76,7 @@ void Program::set_del_shaders(bool ds) del_shaders=ds; } -void Program::bind_attribute(uint index, const string &name) +void Program::bind_attribute(unsigned index, const string &name) { static RequireExtension _ext("GL_ARB_vertex_shader"); glBindAttribLocationARB(id, index, name.c_str()); @@ -102,9 +102,9 @@ int Program::get_param(GLenum param) const string Program::get_info_log() const { - sizei len=get_param(GL_INFO_LOG_LENGTH); + GLsizei len=get_param(GL_INFO_LOG_LENGTH); char log[len+1]; - glGetInfoLogARB(id, len+1, reinterpret_cast(&len), log); + glGetInfoLogARB(id, len+1, &len, log); return string(log, len); } @@ -160,7 +160,7 @@ void Program::Loader::fragment_shader(const string &src) obj.attach_shader(*new Shader(FRAGMENT_SHADER, src)); } -void Program::Loader::attribute(uint i, const string &n) +void Program::Loader::attribute(unsigned i, const string &n) { obj.bind_attribute(i, n); }