From fb16b42096b45f02a9b02bee38d5d3ead6d430b0 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 7 Mar 2026 14:21:21 +0000
Subject: Replace gl_traits glTexParameter with glTexture::parameter DSA
 wrapper

---
 ui/font.cpp    |  9 ++++-----
 ui/icon.cpp    | 10 ++++------
 ui/svgIcon.cpp | 10 ++++------
 3 files changed, 12 insertions(+), 17 deletions(-)

(limited to 'ui')

diff --git a/ui/font.cpp b/ui/font.cpp
index d8e1257..b028c52 100644
--- a/ui/font.cpp
+++ b/ui/font.cpp
@@ -4,7 +4,6 @@
 #include <format>
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include "gl_traits.h"
 #include <glRef.h>
 #include <maths.h>
 #include <optional>
@@ -124,10 +123,10 @@ Font::getTextureWithSpace(unsigned int adv) const
 	texture.texture.bind();
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, static_cast<GLsizei>(size.x), static_cast<GLsizei>(size.y), 0, GL_RED,
 			GL_UNSIGNED_BYTE, nullptr);
-	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	texture.texture.parameter(GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	texture.texture.parameter(GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	texture.texture.parameter(GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	texture.texture.parameter(GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
 	return fontTextures.size() - 1;
 }
diff --git a/ui/icon.cpp b/ui/icon.cpp
index 0422804..5ab9c64 100644
--- a/ui/icon.cpp
+++ b/ui/icon.cpp
@@ -1,5 +1,4 @@
 #include "icon.h"
-#include "gl_traits.h"
 #include <gfx/image.h>
 #include <glad/gl.h>
 #include <resource.h>
@@ -13,11 +12,10 @@ Icon::Icon(const Image & tex) : size {tex.width, tex.height}
 {
 	m_texture.bind();
 
-	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-
-	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	m_texture.parameter(GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+	m_texture.parameter(GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+	m_texture.parameter(GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	m_texture.parameter(GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, static_cast<GLsizei>(tex.width), static_cast<GLsizei>(tex.height), 0,
 			GL_RGBA, GL_UNSIGNED_BYTE, tex.data.data());
 }
diff --git a/ui/svgIcon.cpp b/ui/svgIcon.cpp
index 42e046a..82ef69d 100644
--- a/ui/svgIcon.cpp
+++ b/ui/svgIcon.cpp
@@ -1,5 +1,4 @@
 #include "svgIcon.h"
-#include "gl_traits.h"
 #include <resource.h>
 
 SvgIcon::SvgIcon(ImageDimensions dim, const std::filesystem::path & path)
@@ -17,11 +16,10 @@ SvgIcon::SvgIcon(ImageDimensions dim, const std::filesystem::path & path)
 
 	texture.bind();
 
-	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-
-	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	texture.parameter(GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+	texture.parameter(GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+	texture.parameter(GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	texture.parameter(GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, dim.x, dim.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, bitmap.data());
 }
 
-- 
cgit v1.3