mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-01 11:32:11 +01:00
refactor: change typedef, nullptr, scoped_lock and others
This commit is contained in:
@@ -91,14 +91,14 @@ void gl::framebuffer::blit(framebuffer *src, framebuffer *dst, int sx, int sy, i
|
||||
|
||||
{
|
||||
GLenum outputs[8] = { GL_NONE };
|
||||
outputs[attachment_n] = src != 0 ? attachment : GL_BACK_LEFT;
|
||||
outputs[attachment_n] = src != nullptr ? attachment : GL_BACK_LEFT;
|
||||
|
||||
glReadBuffer(attachment);
|
||||
}
|
||||
|
||||
{
|
||||
GLenum outputs[8] = { GL_NONE };
|
||||
outputs[attachment_n] = dst != 0 ? attachment : GL_BACK_LEFT;
|
||||
outputs[attachment_n] = dst != nullptr ? attachment : GL_BACK_LEFT;
|
||||
|
||||
glDrawBuffers(attachment_n + 1, outputs);
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ void gl::pbo::request_read(int x, int y, int lx, int ly, int pixsize, GLenum for
|
||||
sync.reset();
|
||||
|
||||
bind(PIXEL_PACK_BUFFER);
|
||||
glReadPixels(x, y, lx, ly, format, type, 0);
|
||||
glReadPixels(x, y, lx, ly, format, type, nullptr);
|
||||
unbind(PIXEL_PACK_BUFFER);
|
||||
|
||||
sync.emplace();
|
||||
|
||||
@@ -313,7 +313,7 @@ gl::shader::shader(const std::string &filename)
|
||||
const GLchar *cstr = source.second.c_str();
|
||||
|
||||
**this = glCreateShader(source.first);
|
||||
glShaderSource(*this, 1, &cstr, 0);
|
||||
glShaderSource(*this, 1, &cstr, nullptr);
|
||||
glCompileShader(*this);
|
||||
|
||||
GLint status;
|
||||
@@ -321,7 +321,7 @@ gl::shader::shader(const std::string &filename)
|
||||
if (!status)
|
||||
{
|
||||
GLchar info[512];
|
||||
glGetShaderInfoLog(*this, 512, 0, info);
|
||||
glGetShaderInfoLog(*this, 512, nullptr, info);
|
||||
log_error(std::string(info));
|
||||
|
||||
throw shader_exception("failed to compile " + filename + ": " + std::string(info));
|
||||
@@ -395,7 +395,7 @@ void gl::program::link()
|
||||
if (!status)
|
||||
{
|
||||
GLchar info[512];
|
||||
glGetProgramInfoLog(*this, 512, 0, info);
|
||||
glGetProgramInfoLog(*this, 512, nullptr, info);
|
||||
throw shader_exception("failed to link program: " + std::string(info));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user