Uhhhhh big big changes
This commit is contained in:
@@ -78,8 +78,8 @@ class Shader : public OpenGLObject {
|
||||
for (int i=0; i < num_srcs; ++i) {
|
||||
src_ptrs[i] = _sources[i].data();
|
||||
}
|
||||
glShaderSource(_id, num_srcs, src_ptrs.data(), NULL);
|
||||
glCompileShader(_id);
|
||||
OPENGL_CALL(glShaderSource(_id, num_srcs, src_ptrs.data(), NULL));
|
||||
OPENGL_CALL(glCompileShader(_id));
|
||||
_success = status(GL_COMPILE_STATUS);
|
||||
if (!_success) {
|
||||
WARN(log(), 0x0FE);
|
||||
@@ -88,14 +88,14 @@ class Shader : public OpenGLObject {
|
||||
|
||||
virtual GLuint declare() override {
|
||||
if (!_id) {
|
||||
_id = _id = glCreateShader(target);
|
||||
_id = _id = OPENGL_CALL(glCreateShader(target));
|
||||
}
|
||||
return _id;
|
||||
}
|
||||
|
||||
virtual void remove() override {
|
||||
if (_id) {
|
||||
glDeleteShader(_id);
|
||||
OPENGL_CALL(glDeleteShader(_id));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ class Program : public OpenGLObject {
|
||||
operator bool();
|
||||
~Program() { remove(); }
|
||||
virtual void bind() const override {
|
||||
glUseProgram(_id);
|
||||
OPENGL_CALL(glUseProgram(_id));
|
||||
}
|
||||
virtual void unbind() const override { /* TODO: Some warning of some kind perhaps*/ }
|
||||
GLint status(GLenum) const;
|
||||
@@ -125,13 +125,13 @@ class Program : public OpenGLObject {
|
||||
GLint _success;
|
||||
virtual GLuint declare() override {
|
||||
if (!_id) {
|
||||
_id = glCreateProgram();
|
||||
_id = OPENGL_CALL(glCreateProgram());
|
||||
}
|
||||
return _id;
|
||||
}
|
||||
virtual void remove() override {
|
||||
if (_id) {
|
||||
glDeleteProgram(_id);
|
||||
OPENGL_CALL(glDeleteProgram(_id));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user