From 398a896d6edcbf15a242683a1eb8fa1830334534 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 3 Jun 2023 02:10:28 -0500 Subject: [PATCH] opengl32.lib doesn't provide glActiveTexture --- src/gui/render/renderGL.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/render/renderGL.cpp b/src/gui/render/renderGL.cpp index 1c6e2e2d3..f76ffaac0 100644 --- a/src/gui/render/renderGL.cpp +++ b/src/gui/render/renderGL.cpp @@ -29,6 +29,7 @@ PFNGLBINDBUFFERPROC furBindBuffer=NULL; PFNGLBUFFERDATAPROC furBufferData=NULL; PFNGLVERTEXATTRIBPOINTERPROC furVertexAttribPointer=NULL; PFNGLENABLEVERTEXATTRIBARRAYPROC furEnableVertexAttribArray=NULL; +PFNGLACTIVETEXTUREPROC furActiveTexture=NULL; PFNGLCREATESHADERPROC furCreateShader=NULL; PFNGLSHADERSOURCEPROC furShaderSource=NULL; @@ -163,7 +164,7 @@ void* FurnaceGUIRenderGL::createTexture(bool dynamic, int width, int height) { C(glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR)); C(glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR)); C(glTexImage2D(GL_TEXTURE_2D,0,GL_RGBA,width,height,0,GL_RGBA,GL_UNSIGNED_INT_8_8_8_8_REV,NULL)); - C(glActiveTexture(GL_TEXTURE0)); + C(furActiveTexture(GL_TEXTURE0)); t->width=width; t->height=height; return t; @@ -321,6 +322,7 @@ bool FurnaceGUIRenderGL::init(SDL_Window* win) { LOAD_PROC_MANDATORY(furBufferData,PFNGLBUFFERDATAPROC,"glBufferData"); LOAD_PROC_MANDATORY(furVertexAttribPointer,PFNGLVERTEXATTRIBPOINTERPROC,"glVertexAttribPointer"); LOAD_PROC_MANDATORY(furEnableVertexAttribArray,PFNGLENABLEVERTEXATTRIBARRAYPROC,"glEnableVertexAttribArray"); + LOAD_PROC_MANDATORY(furActiveTexture,PFNGLACTIVETEXTUREPROC,"glActiveTexture"); LOAD_PROC_OPTIONAL(furCreateShader,PFNGLCREATESHADERPROC,"glCreateShader"); LOAD_PROC_OPTIONAL(furShaderSource,PFNGLSHADERSOURCEPROC,"glShaderSource");