Skip to content

Commit

Permalink
Properly check for uninitialized texture in CopyTexture class.
Browse files Browse the repository at this point in the history
Before rendering the first frame, there is no output texture present in a preset, so we can't copy anything and should just skip that step.
  • Loading branch information
kblaschke committed Jul 12, 2024
1 parent f94f99d commit 301222e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 5 deletions.
5 changes: 4 additions & 1 deletion src/libprojectM/Renderer/CopyTexture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,10 @@ void CopyTexture::Draw(const std::shared_ptr<class Texture>& originalTexture, co
void CopyTexture::Draw(const std::shared_ptr<class Texture>& originalTexture, Framebuffer& framebuffer, int framebufferIndex,
bool flipVertical, bool flipHorizontal)
{
if (originalTexture == nullptr || framebuffer.GetColorAttachmentTexture(framebufferIndex, 0) == nullptr)
if (originalTexture == nullptr
|| originalTexture->Empty()
|| framebuffer.GetColorAttachmentTexture(framebufferIndex, 0) == nullptr
|| framebuffer.GetColorAttachmentTexture(framebufferIndex, 0)->Empty())
{
return;
}
Expand Down
11 changes: 8 additions & 3 deletions src/libprojectM/Renderer/Texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Texture::Texture(std::string name, const int width, const int height, const bool
, m_format(GL_RGB)
, m_type(GL_UNSIGNED_BYTE)
{
CreateEmptyTexture();
CreateNewTexture();
}

Texture::Texture(std::string name, int width, int height,
Expand All @@ -29,7 +29,7 @@ Texture::Texture(std::string name, int width, int height,
, m_format(format)
, m_type(type)
{
CreateEmptyTexture();
CreateNewTexture();
}

Texture::Texture(std::string name, const GLuint texID, const GLenum target,
Expand Down Expand Up @@ -99,7 +99,12 @@ auto Texture::IsUserTexture() const -> bool
return m_isUserTexture;
}

void Texture::CreateEmptyTexture()
auto Texture::Empty() const -> bool
{
return m_textureId == 0;
}

void Texture::CreateNewTexture()
{
glGenTextures(1, &m_textureId);
glBindTexture(m_target, m_textureId);
Expand Down
11 changes: 10 additions & 1 deletion src/libprojectM/Renderer/Texture.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,17 @@ class Texture
*/
auto IsUserTexture() const -> bool;

/**
* @brief Returns true if the texture is empty/unallocated.
* @return true if the texture is not yet allocated (e.g. the ID 0), false if the object contains a valid texture.
*/
auto Empty() const -> bool;

private:
void CreateEmptyTexture();
/**
* @brief Creates a new, blank texture with the given size.
*/
void CreateNewTexture();

GLuint m_textureId{0}; //!< The OpenGL texture name/ID.
GLenum m_target{GL_NONE}; //!< The OpenGL texture target, e.g. GL_TEXTURE_2D.
Expand Down

0 comments on commit 301222e

Please sign in to comment.