history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-18 00:15:45 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

GL: Improve error handling with texture creation

Browse Source
This commit is contained in:
Connor McLaughlin
2019-12-11 00:01:29 +10:00
parent 05e6d4c401
commit 6f78fea159
8 changed files with 328 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/common/gl/texture.cpp
View File

@ -5,32 +5,96 @@ Log_SetChannel(GL);
namespace GL {
Texture::Texture(u32 width, u32 height, GLenum format, GLenum type, const void* data /* = nullptr */,
bool linear_filter /* = false */, bool create_framebuffer /* = false */)
: m_width(width), m_height(height)
Texture::Texture() = default;
Texture::Texture(Texture&& moved)
: m_id(moved.m_id), m_width(moved.m_width), m_height(moved.m_height), m_fbo_id(moved.m_fbo_id)
{
glGenTextures(1, &m_id);
glBindTexture(GL_TEXTURE_2D, m_id);
moved.m_id = 0;
moved.m_width = 0;
moved.m_height = 0;
moved.m_fbo_id = 0;
}
Texture::~Texture()
{
Destroy();
}
bool Texture::Create(u32 width, u32 height, GLenum format, GLenum type, const void* data, bool linear_filter)
{
glGetError();
GLuint id;
glGenTextures(1, &id);
glBindTexture(GL_TEXTURE_2D, id);
glTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0, format, type, data);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, linear_filter ? GL_LINEAR : GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, linear_filter ? GL_LINEAR : GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 1);
if (create_framebuffer)
if (glGetError() != GL_NO_ERROR)
{
glGenFramebuffers(1, &m_fbo_id);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_fbo_id);
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_id, 0);
Assert(glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE);
glDeleteTextures(1, &id);
return false;
}
if (IsValid())
Destroy();
m_id = id;
m_width = width;
m_height = height;
return true;
}
Texture::~Texture()
void Texture::SetLinearFilter(bool enabled)
{
Bind();
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, enabled ? GL_LINEAR : GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, enabled ? GL_LINEAR : GL_NEAREST);
}
bool Texture::CreateFramebuffer()
{
if (!IsValid())
return false;
glGetError();
GLuint fbo_id;
glGenFramebuffers(1, &fbo_id);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo_id);
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_id, 0);
if (glGetError() != GL_NO_ERROR || glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
{
glDeleteFramebuffers(1, &fbo_id);
return false;
}
if (m_fbo_id != 0)
glDeleteFramebuffers(1, &m_fbo_id);
glDeleteTextures(1, &m_id);
m_fbo_id = fbo_id;
return true;
}
void Texture::Destroy()
{
if (m_fbo_id != 0)
{
glDeleteFramebuffers(1, &m_fbo_id);
m_fbo_id = 0;
}
if (m_id != 0)
{
glDeleteTextures(1, &m_id);
m_id = 0;
}
m_width = 0;
m_height = 0;
}
void Texture::Bind()
@ -49,4 +113,20 @@ void Texture::Unbind()
glBindTexture(GL_TEXTURE_2D, 0);
}
Texture& Texture::operator=(Texture&& moved)
{
Destroy();
m_id = moved.m_id;
m_width = moved.m_width;
m_height = moved.m_height;
m_fbo_id = moved.m_fbo_id;
moved.m_id = 0;
moved.m_width = 0;
moved.m_height = 0;
moved.m_fbo_id = 0;
return *this;
}
} // namespace GL

25
src/common/gl/texture.h
View File

@ -1,15 +1,24 @@
#pragma once
#include <glad.h>
#include "../types.h"
#include <glad.h>
namespace GL {
class Texture
{
public:
Texture(u32 width, u32 height, GLenum format, GLenum type, const void* data = nullptr, bool linear_filter = false,
bool create_framebuffer = false);
Texture();
Texture(Texture&& moved);
~Texture();
bool Create(u32 width, u32 height, GLenum format, GLenum type, const void* data = nullptr,
bool linear_filter = false);
bool CreateFramebuffer();
void Destroy();
void SetLinearFilter(bool enabled);
bool IsValid() const { return m_id != 0; }
GLuint GetGLId() const { return m_id; }
u32 GetWidth() const { return m_width; }
u32 GetHeight() const { return m_height; }
@ -21,10 +30,14 @@ public:
static void Unbind();
Texture& operator=(const Texture& copy) = delete;
Texture& operator=(Texture&& moved);
private:
GLuint m_id;
u32 m_width;
u32 m_height;
GLuint m_id = 0;
u32 m_width = 0;
u32 m_height = 0;
GLuint m_fbo_id = 0;
};