From 8cf91a5ae5b2369ee53e8e2412d1c2da30af4f8d Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Thu, 30 Dec 2021 00:38:22 +0100 Subject: [PATCH] LibGL: Change `gl_tex_gen` param to `GLint` The singular form of `glTexGeni/f/d` only supports constants, not floating point values as its parameter. --- Userland/Libraries/LibGL/GLContext.h | 2 +- Userland/Libraries/LibGL/SoftwareGLContext.cpp | 2 +- Userland/Libraries/LibGL/SoftwareGLContext.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Userland/Libraries/LibGL/GLContext.h b/Userland/Libraries/LibGL/GLContext.h index c9999a98e5..7fadc63046 100644 --- a/Userland/Libraries/LibGL/GLContext.h +++ b/Userland/Libraries/LibGL/GLContext.h @@ -119,7 +119,7 @@ public: virtual void gl_copy_tex_image_2d(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border) = 0; virtual void gl_get_tex_parameter_integerv(GLenum target, GLint level, GLenum pname, GLint* params) = 0; virtual void gl_rect(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) = 0; - virtual void gl_tex_gen(GLenum coord, GLenum pname, GLdouble param) = 0; + virtual void gl_tex_gen(GLenum coord, GLenum pname, GLint param) = 0; virtual void gl_tex_gen_floatv(GLenum coord, GLenum pname, GLfloat const* params) = 0; virtual void present() = 0; diff --git a/Userland/Libraries/LibGL/SoftwareGLContext.cpp b/Userland/Libraries/LibGL/SoftwareGLContext.cpp index bff6046ea4..307444380b 100644 --- a/Userland/Libraries/LibGL/SoftwareGLContext.cpp +++ b/Userland/Libraries/LibGL/SoftwareGLContext.cpp @@ -2733,7 +2733,7 @@ void SoftwareGLContext::gl_rect(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble gl_end(); } -void SoftwareGLContext::gl_tex_gen(GLenum coord, GLenum pname, GLdouble param) +void SoftwareGLContext::gl_tex_gen(GLenum coord, GLenum pname, GLint param) { APPEND_TO_CALL_LIST_AND_RETURN_IF_NEEDED(gl_tex_gen, coord, pname, param); RETURN_WITH_ERROR_IF(m_in_draw_state, GL_INVALID_OPERATION); diff --git a/Userland/Libraries/LibGL/SoftwareGLContext.h b/Userland/Libraries/LibGL/SoftwareGLContext.h index 0b893c3a92..1099525e50 100644 --- a/Userland/Libraries/LibGL/SoftwareGLContext.h +++ b/Userland/Libraries/LibGL/SoftwareGLContext.h @@ -132,7 +132,7 @@ public: virtual void gl_copy_tex_image_2d(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border) override; virtual void gl_get_tex_parameter_integerv(GLenum target, GLint level, GLenum pname, GLint* params) override; virtual void gl_rect(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) override; - virtual void gl_tex_gen(GLenum coord, GLenum pname, GLdouble param) override; + virtual void gl_tex_gen(GLenum coord, GLenum pname, GLint param) override; virtual void gl_tex_gen_floatv(GLenum coord, GLenum pname, GLfloat const* params) override; virtual void present() override;