Replace gl_traits glTexParameter with glTexture::parameter DSA wrapperHEADmain

1 files changed, 6 insertions, 20 deletions

diff --git a/lib/gl_traits.h b/lib/gl_traits.h
index 35ae9e8..eff9304 100644
--- a/lib/gl_traits.h
+++ b/lib/gl_traits.h
@@ -48,8 +48,8 @@ template<> struct gl_traits<glm::f32> : public gl_traits_float {
 	static constexpr auto glUniformFunc {&glUniform1f};
 	static constexpr std::array glUniformvFunc {&glUniform1fv, &glUniform2fv, &glUniform3fv, &glUniform4fv};
 	static constexpr std::array glUniformmFunc {&glUniformMatrix2fv, &glUniformMatrix3fv, &glUniformMatrix4fv};
-	static constexpr auto glTexParameterFunc {&glTexParameterf};
-	static constexpr auto glTexParameterfFunc {&glTexParameterfv};
+	static constexpr auto glTextureParameterFunc {&glTextureParameterf};
+	static constexpr auto glTextureParametervFunc {&glTextureParameterfv};
 	static constexpr auto vertexArrayAttribFormat {&vertexAttribFormatFunc<type, 1>};
 };
 
@@ -72,8 +72,8 @@ template<> struct gl_traits<glm::int32> : public gl_traits_integer {
 	static constexpr GLenum type {GL_INT};
 	static constexpr auto glUniformFunc {&glUniform1i};
 	static constexpr std::array glUniformvFunc {&glUniform1iv, &glUniform2iv, &glUniform3iv, &glUniform4iv};
-	static constexpr auto glTexParameterFunc {&glTexParameteri};
-	static constexpr auto glTexParameterfFunc {&glTexParameteriv};
+	static constexpr auto glTextureParameterFunc {&glTextureParameteri};
+	static constexpr auto glTextureParametervFunc {&glTextureParameteriv};
 	static constexpr auto vertexArrayAttribFormat {&vertexAttribFormatFunc<type, 1>};
 };
 
@@ -139,9 +139,9 @@ concept has_glUniformNv = requires { gl_traits<T>::glUniformvFunc; };
 template<typename T>
 concept has_glUniformMatrixNv = requires { gl_traits<T>::glUniformmFunc; };
 template<typename T>
-concept has_glTexParameter = requires { gl_traits<T>::glTexParameterFunc; };
+concept has_glTextureParameter = requires { gl_traits<T>::glTextureParameterFunc; };
 template<typename T>
-concept has_glTexParameterf = requires { gl_traits<T>::glTexParameterfFunc; };
+concept has_glTextureParameterv = requires { gl_traits<T>::glTextureParametervFunc; };
 
 template<has_glUniform1 T>
 void
@@ -185,17 +185,3 @@ glUniform(GLint location, std::span<const glm::mat<L, L, T, Q>> v)
 	(*gl_traits<T>::glUniformmFunc[L - 2])(
 			location, static_cast<GLsizei>(v.size()), GL_FALSE, glm::value_ptr(v.front()));
 }
-
-template<has_glTexParameter T>
-void
-glTexParameter(GLenum target, GLenum pname, T param)
-{
-	(*gl_traits<T>::glTexParameterFunc)(target, pname, param);
-}
-
-template<glm::length_t L, has_glTexParameterf T, glm::qualifier Q>
-void
-glTexParameter(GLenum target, GLenum pname, const glm::vec<L, T, Q> & param)
-{
-	(*gl_traits<T>::glTexParameterfFunc)(target, pname, glm::value_ptr(param));
-}