From 7c03d93c367b842c464dca30e121bc4c20547c36 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 1 Jan 2022 16:44:19 +0000 Subject: Generic solution for glGen/glDel arrays, then tidy-up the uses --- ui/icon.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'ui/icon.cpp') diff --git a/ui/icon.cpp b/ui/icon.cpp index 371410a..657e953 100644 --- a/ui/icon.cpp +++ b/ui/icon.cpp @@ -1,4 +1,6 @@ #include "icon.h" +#include "glArrays.h" +#include #include #include #include @@ -7,9 +9,8 @@ Icon::Icon(const std::filesystem::path & fileName) : Icon {Image {Resource::mapP { } -Icon::Icon(const Image & tex) : size {tex.width, tex.height}, m_texture {} +Icon::Icon(const Image & tex) : size {tex.width, tex.height} { - glGenTextures(1, &m_texture); glBindTexture(GL_TEXTURE_2D, m_texture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); @@ -21,11 +22,6 @@ Icon::Icon(const Image & tex) : size {tex.width, tex.height}, m_texture {} GL_RGBA, GL_UNSIGNED_BYTE, tex.data.data()); } -Icon::~Icon() -{ - glDeleteTextures(1, &m_texture); -} - void Icon::Bind() const { -- cgit v1.2.3