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

OpenGLHostDisplay: Replace GL ID handle with texture class

Browse Source
This commit is contained in:
Connor McLaughlin
2022-10-03 14:04:56 +10:00
parent 971bba07d6
commit 12d400b76a
5 changed files with 63 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,15 @@ bool Texture::Create(u32 width, u32 height, u32 layers, u32 levels, u32 samples,
glTexStorage3D(target, levels, internal_format, width, height, layers);
else
glTexStorage2D(target, levels, internal_format, width, height);
if (data)
{
// TODO: Fix data for mipmaps here.
if (layers > 1)
glTexSubImage3D(target, 0, 0, 0, 0, width, height, layers, format, type, data);
else
glTexSubImage2D(target, 0, 0, 0, width, height, format, type, data);
}
}
else
{
@ -200,7 +209,7 @@ void Texture::ReplaceSubImage(u32 layer, u32 level, u32 x, u32 y, u32 width, u32
glTexSubImage2D(target, level, x, y, width, height, format, type, data);
}
void Texture::SetLinearFilter(bool enabled)
void Texture::SetLinearFilter(bool enabled) const
{
Assert(!IsMultisampled());
@ -255,18 +264,18 @@ void Texture::Destroy()
m_samples = 0;
}
void Texture::Bind()
void Texture::Bind() const
{
glBindTexture(GetGLTarget(), m_id);
}
void Texture::BindFramebuffer(GLenum target /*= GL_DRAW_FRAMEBUFFER*/)
void Texture::BindFramebuffer(GLenum target /*= GL_DRAW_FRAMEBUFFER*/) const
{
DebugAssert(m_fbo_id != 0);
glBindFramebuffer(target, m_fbo_id);
}
void Texture::Unbind()
void Texture::Unbind() const
{
glBindTexture(GetGLTarget(), 0);
}

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

@ -23,7 +23,7 @@ public:
void Destroy();
bool UseTextureStorage() const;
void SetLinearFilter(bool enabled);
void SetLinearFilter(bool enabled) const;
ALWAYS_INLINE bool IsValid() const { return m_id != 0; }
ALWAYS_INLINE bool IsTextureArray() const { return m_layers > 1; }
@ -42,9 +42,9 @@ public:
(IsTextureArray() ? GL_TEXTURE_2D_ARRAY : GL_TEXTURE_2D));
}
void Bind();
void BindFramebuffer(GLenum target = GL_DRAW_FRAMEBUFFER);
void Unbind();
void Bind() const;
void BindFramebuffer(GLenum target = GL_DRAW_FRAMEBUFFER) const;
void Unbind() const;
Texture& operator=(const Texture& copy) = delete;
Texture& operator=(Texture&& moved);