From 9f2b7d84dc928c9fbb0cf2c6dc8db152bfa78dc3 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 17 May 2026 15:43:10 +1000 Subject: [PATCH] add gl function loading --- dlib/platform.d | 2 ++ opengl/opengl.d | 62 ++++++++++++++++++++++++++++++++++++++++++ opengl/opengl_native.d | 6 +++- 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/dlib/platform.d b/dlib/platform.d index 7282402..2afaa32 100644 --- a/dlib/platform.d +++ b/dlib/platform.d @@ -842,6 +842,8 @@ CreateWindow( } glXMakeCurrent(window.display, window.window, context); + + GLLoadFuncs(); } return true; diff --git a/opengl/opengl.d b/opengl/opengl.d index 3da2223..29b56dd 100644 --- a/opengl/opengl.d +++ b/opengl/opengl.d @@ -14,6 +14,68 @@ else public import glenum; +__gshared bool FUNCS_LOADED = false; + +version(linux) +{ + alias GLLoadFunc = glXGetProcAddressARB; +} +else static assert(false, "GL function loader alias not set for platform"); + +bool +GLLoadFuncs() +{ + glDeleteRenderbuffers = cast(typeof(glDeleteRenderbuffers))GLLoadFunc(cast(u8*)"glDeleteRenderbuffers".ptr); + glGenRenderbuffers = cast(typeof(glGenRenderbuffers))GLLoadFunc(cast(u8*)"glGenRenderbuffers".ptr); + glGenVertexArrays = cast(typeof(glGenVertexArrays))GLLoadFunc(cast(u8*)"glGenVertexArrays".ptr); + glDeleteVertexArrays = cast(typeof(glDeleteVertexArrays))GLLoadFunc(cast(u8*)"glDeleteVertexArrays".ptr); + glGenBuffers = cast(typeof(glGenBuffers))GLLoadFunc(cast(u8*)"glGenBuffers".ptr); + glCompileShader = cast(typeof(glCompileShader))GLLoadFunc(cast(u8*)"glCompileShader".ptr); + glUseProgram = cast(typeof(glUseProgram))GLLoadFunc(cast(u8*)"glUseProgram".ptr); + glValidateProgram = cast(typeof(glValidateProgram))GLLoadFunc(cast(u8*)"glValidateProgram".ptr); + glBindBufferBase = cast(typeof(glBindBufferBase))GLLoadFunc(cast(u8*)"glBindBufferBase".ptr); + glGetUniformBlockIndex = cast(typeof(glGetUniformBlockIndex))GLLoadFunc(cast(u8*)"glGetUniformBlockIndex".ptr); + glEnableVertexAttribArray = cast(typeof(glEnableVertexAttribArray))GLLoadFunc(cast(u8*)"glEnableVertexAttribArray".ptr); + glDisableVertexAttribArray = cast(typeof(glDisableVertexAttribArray))GLLoadFunc(cast(u8*)"glDisableVertexAttribArray".ptr); + glBlendFuncSeparate = cast(typeof(glBlendFuncSeparate))GLLoadFunc(cast(u8*)"glBlendFuncSeparate".ptr); + glBindVertexArray = cast(typeof(glBindVertexArray))GLLoadFunc(cast(u8*)"glBindVertexArray".ptr); + glBindBuffer = cast(typeof(glBindBuffer))GLLoadFunc(cast(u8*)"glBindBuffer".ptr); + glBufferData = cast(typeof(glBufferData))GLLoadFunc(cast(u8*)"glBufferData".ptr); + glBufferSubData = cast(typeof(glBufferSubData))GLLoadFunc(cast(u8*)"glBufferSubData".ptr); + glVertexAttribDivisor = cast(typeof(glVertexAttribDivisor))GLLoadFunc(cast(u8*)"glVertexAttribDivisor".ptr); + glVertexAttribPointer = cast(typeof(glVertexAttribPointer))GLLoadFunc(cast(u8*)"glVertexAttribPointer".ptr); + glDrawArraysInstanced = cast(typeof(glDrawArraysInstanced))GLLoadFunc(cast(u8*)"glDrawArraysInstanced".ptr); + glDrawElementsInstanced = cast(typeof(glDrawElementsInstanced))GLLoadFunc(cast(u8*)"glDrawElementsInstanced".ptr); + glGetUniformLocation = cast(typeof(glGetUniformLocation))GLLoadFunc(cast(u8*)"glGetUniformLocation".ptr); + glUniform1f = cast(typeof(glUniform1f))GLLoadFunc(cast(u8*)"glUniform1f".ptr); + glUniform2f = cast(typeof(glUniform2f))GLLoadFunc(cast(u8*)"glUniform2f".ptr); + glUniform3f = cast(typeof(glUniform3f))GLLoadFunc(cast(u8*)"glUniform3f".ptr); + glUniform4f = cast(typeof(glUniform4f))GLLoadFunc(cast(u8*)"glUniform4f".ptr); + glUniform1i = cast(typeof(glUniform1i))GLLoadFunc(cast(u8*)"glUniform1i".ptr); + glUniform2i = cast(typeof(glUniform2i))GLLoadFunc(cast(u8*)"glUniform2i".ptr); + glUniform3i = cast(typeof(glUniform3i))GLLoadFunc(cast(u8*)"glUniform3i".ptr); + glUniform4i = cast(typeof(glUniform4i))GLLoadFunc(cast(u8*)"glUniform4i".ptr); + glCreateProgram = cast(typeof(glCreateProgram))GLLoadFunc(cast(u8*)"glCreateProgram".ptr); + glCreateShader = cast(typeof(glCreateShader))GLLoadFunc(cast(u8*)"glCreateShader".ptr); + glDeleteFramebuffers = cast(typeof(glDeleteFramebuffers))GLLoadFunc(cast(u8*)"glDeleteFramebuffers".ptr); + glDeleteProgram = cast(typeof(glDeleteProgram))GLLoadFunc(cast(u8*)"glDeleteProgram".ptr); + glDeleteShader = cast(typeof(glDeleteShader))GLLoadFunc(cast(u8*)"glDeleteShader".ptr); + glShaderSource = cast(typeof(glShaderSource))GLLoadFunc(cast(u8*)"glShaderSource".ptr); + glGetProgramiv = cast(typeof(glGetProgramiv))GLLoadFunc(cast(u8*)"glGetProgramiv".ptr); + glGetProgramInfoLog = cast(typeof(glGetProgramInfoLog))GLLoadFunc(cast(u8*)"glGetProgramInfoLog".ptr); + glGetShaderiv = cast(typeof(glGetShaderiv))GLLoadFunc(cast(u8*)"glGetShaderiv".ptr); + glGetShaderInfoLog = cast(typeof(glGetShaderInfoLog))GLLoadFunc(cast(u8*)"glGetShaderInfoLog".ptr); + glAttachShader = cast(typeof(glAttachShader))GLLoadFunc(cast(u8*)"glAttachShader".ptr); + glLinkProgram = cast(typeof(glLinkProgram))GLLoadFunc(cast(u8*)"glLinkProgram".ptr); + + static if(!__traits(compiles, { glActiveTexture(0x84C0); })) + { + glActiveTexture = cast(typeof(glActiveTexture))GLLoadFunc(cast(u8*)"glActiveTexture".ptr); + } + + return glDeleteRenderbuffers != null; +} + u32 GLCreateShader(GLEnum shader_type, string[] shader_src) { diff --git a/opengl/opengl_native.d b/opengl/opengl_native.d index 2ecd3be..dcdb48f 100644 --- a/opengl/opengl_native.d +++ b/opengl/opengl_native.d @@ -26,7 +26,6 @@ PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor; PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer; PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced; PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced; -PFNGLACTIVETEXTUREPROC glActiveTexture; PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation; PFNGLUNIFORM1FPROC glUniform1f; PFNGLUNIFORM2FPROC glUniform2f; @@ -48,3 +47,8 @@ PFNGLGETSHADERIVPROC glGetShaderiv; PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog; PFNGLATTACHSHADERPROC glAttachShader; PFNGLLINKPROGRAMPROC glLinkProgram; + +static if(!__traits(compiles, { glActiveTexture(0x84C0); })) +{ + PFNGLACTIVETEXTUREPROC glActiveTexture; +}