light7734/light
light7734/light
1
1
Fork 0
Code Issues 20 Pull requests 1 Projects 1 Releases Packages Wiki Activity

fix: build issues with NULL on some compilers
Some checks reported errors
continuous-integration/drone/push Build was killed
Details

Browse source
This commit is contained in:
light7734 2025-07-16 11:31:58 +03:30
parent b25ea41096
commit a88aa739b1
Signed by: light7734
GPG key ID: 8C30176798F1A6BA
5 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/renderer/src/gl/buffers.cpp
View file

@ -7,7 +7,7 @@ namespace lt {
//==================== CONSTANT_BUFFER ====================//
glConstantBuffer::glConstantBuffer(ConstantBufferIndex index, unsigned int size)
: m_buffer_id(NULL)
: m_buffer_id()
, m_index(static_cast<int>(index))
{
glCreateBuffers(1, &m_buffer_id);
@ -40,7 +40,7 @@ void glConstantBuffer::un_map()
//==================== VERTEX_BUFFER ====================//
glVertexBuffer::glVertexBuffer(float *vertices, unsigned int stride, unsigned int count)
: m_buffer_id(NULL)
: m_buffer_id()
{
glCreateBuffers(1, &m_buffer_id);
glNamedBufferData(
@ -63,7 +63,7 @@ void glVertexBuffer::bind()
void glVertexBuffer::un_bind()
{
glBindBuffer(GL_ARRAY_BUFFER, NULL);
glBindBuffer(GL_ARRAY_BUFFER, {});
}
auto glVertexBuffer::map() -> void *
@ -78,7 +78,7 @@ void glVertexBuffer::un_map()
//==================== VERTEX_BUFFER ====================//
//==================== INDEX_BUFFER ====================//
glIndexBuffer::glIndexBuffer(unsigned int *indices, unsigned int count): m_buffer_id(NULL)
glIndexBuffer::glIndexBuffer(unsigned int *indices, unsigned int count): m_buffer_id()
{
// generate indices if not provided
auto hasIndices = !!indices;
@ -132,7 +132,7 @@ void glIndexBuffer::bind()
void glIndexBuffer::un_bind()
{
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, NULL);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, {});
}
//==================== INDEX_BUFFER ====================//

19
modules/renderer/src/gl/framebuffers.cpp
View file

@ -6,9 +6,9 @@ namespace lt {
glFramebuffer::glFramebuffer(const FramebufferSpecification &specification)
: m_specification(specification)
, m_buffer_id(NULL)
, m_color_attachment_id(NULL)
, m_depth_stencil_attachment_id(NULL)
, m_buffer_id()
, m_color_attachment_id()
, m_depth_stencil_attachment_id()
{
resize({ specification.width, specification.height });
}
@ -59,7 +59,7 @@ void glFramebuffer::resize(const glm::uvec2 &size)
GL_RGBA8,
m_specification.width,
m_specification.height,
NULL,
{},
GL_RGBA,
GL_UNSIGNED_BYTE,
nullptr
@ -74,17 +74,6 @@ void glFramebuffer::resize(const glm::uvec2 &size)
0
);
// glTextureStorage2D(m_color_attachment_id, 0, GL_RGBA8, m_specification.width,
// m_specification.height);
// glCreateTextures(GL_TEXTURE_2D, 1, &m_depth_stencil_attachment_id);
// glBindTexture(GL_TEXTURE_2D, m_depth_stencil_attachment_id);
// glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, m_specification.width,
// m_specification.height, NULL, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
// // glTextureStorage2D(m_depth_stencil_attachment_id, 0, GL_DEPTH24_STENCIL8,
// m_specification.width, m_specification.height); glFramebufferTexture2D(GL_FRAMEBUFFER,
// GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, m_depth_stencil_attachment_id, 0);
ensure(
(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE),
"Framebuffer is incomplete"

2
modules/renderer/src/gl/render_command.cpp
View file

@ -33,7 +33,7 @@ void glRenderCommand::draw_indexed(unsigned int count)
void glRenderCommand::default_target_framebuffer()
{
glBindFramebuffer(GL_FRAMEBUFFER, NULL);
glBindFramebuffer(GL_FRAMEBUFFER, {});
}
void glRenderCommand::set_viewport(

6
modules/renderer/src/gl/shader.cpp
View file

@ -56,7 +56,7 @@ void glShader::bind()
void glShader::un_bind()
{
glUseProgram(NULL);
glUseProgram({});
}
auto glShader::compile_shader(const std::string &source, Shader::Stage stage) -> unsigned int
@ -67,7 +67,7 @@ auto glShader::compile_shader(const std::string &source, Shader::Stage stage) ->
stage == Shader::Stage::vertex ? GL_VERTEX_SHADER :
stage == Shader::Stage::pixel ? GL_FRAGMENT_SHADER :
stage == Shader::Stage::geometry ? GL_GEOMETRY_SHADER :
NULL
0
);
// compile
@ -91,7 +91,7 @@ auto glShader::compile_shader(const std::string &source, Shader::Stage stage) ->
errorLog
);
return NULL;
return {};
}
#define LIGHT_OPENGL_ENABLE_SHADER_INFO_LOG
#ifdef LIGHT_OPENGL_ENABLE_SHADER_INFO_LOG

4
modules/renderer/src/gl/vertex_layout.cpp
View file

@ -9,7 +9,7 @@ glVertexLayout::glVertexLayout(
const Ref<VertexBuffer> &buffer,
const std::vector<std::pair<std::string, VertexElementType>> &elements
)
: m_array_id(NULL)
: m_array_id()
{
// check
ensure(
@ -65,7 +65,7 @@ void glVertexLayout::bind()
void glVertexLayout::un_bind()
{
glBindVertexArray(NULL);
glBindVertexArray({});
}
auto glVertexLayout::get_element_desc(VertexElementType type, unsigned int offset)