mirror of
https://git.shylie.info/shylie/glerminal.git
synced 2024-11-21 16:40:04 +00:00
Downgrade to OpenGL 4.5
This commit is contained in:
parent
c8e7a28837
commit
eaab60cfda
@ -1,10 +1,10 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
OpenGL loader generated by glad 0.1.36 on Tue May 14 15:22:23 2024.
|
OpenGL loader generated by glad 0.1.36 on Sun May 26 12:09:35 2024.
|
||||||
|
|
||||||
Language/Generator: C/C++
|
Language/Generator: C/C++
|
||||||
Specification: gl
|
Specification: gl
|
||||||
APIs: gl=4.6
|
APIs: gl=4.5
|
||||||
Profile: core
|
Profile: core
|
||||||
Extensions:
|
Extensions:
|
||||||
|
|
||||||
@ -14,9 +14,9 @@
|
|||||||
Reproducible: False
|
Reproducible: False
|
||||||
|
|
||||||
Commandline:
|
Commandline:
|
||||||
--profile="core" --api="gl=4.6" --generator="c" --spec="gl" --extensions=""
|
--profile="core" --api="gl=4.5" --generator="c" --spec="gl" --extensions=""
|
||||||
Online:
|
Online:
|
||||||
https://glad.dav1d.de/#profile=core&language=c&specification=gl&loader=on&api=gl%3D4.6
|
https://glad.dav1d.de/#profile=core&language=c&specification=gl&loader=on&api=gl%3D4.5
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@ -273,7 +273,6 @@ int GLAD_GL_VERSION_4_2 = 0;
|
|||||||
int GLAD_GL_VERSION_4_3 = 0;
|
int GLAD_GL_VERSION_4_3 = 0;
|
||||||
int GLAD_GL_VERSION_4_4 = 0;
|
int GLAD_GL_VERSION_4_4 = 0;
|
||||||
int GLAD_GL_VERSION_4_5 = 0;
|
int GLAD_GL_VERSION_4_5 = 0;
|
||||||
int GLAD_GL_VERSION_4_6 = 0;
|
|
||||||
PFNGLACTIVESHADERPROGRAMPROC glad_glActiveShaderProgram = NULL;
|
PFNGLACTIVESHADERPROGRAMPROC glad_glActiveShaderProgram = NULL;
|
||||||
PFNGLACTIVETEXTUREPROC glad_glActiveTexture = NULL;
|
PFNGLACTIVETEXTUREPROC glad_glActiveTexture = NULL;
|
||||||
PFNGLATTACHSHADERPROC glad_glAttachShader = NULL;
|
PFNGLATTACHSHADERPROC glad_glAttachShader = NULL;
|
||||||
@ -635,11 +634,9 @@ PFNGLMEMORYBARRIERBYREGIONPROC glad_glMemoryBarrierByRegion = NULL;
|
|||||||
PFNGLMINSAMPLESHADINGPROC glad_glMinSampleShading = NULL;
|
PFNGLMINSAMPLESHADINGPROC glad_glMinSampleShading = NULL;
|
||||||
PFNGLMULTIDRAWARRAYSPROC glad_glMultiDrawArrays = NULL;
|
PFNGLMULTIDRAWARRAYSPROC glad_glMultiDrawArrays = NULL;
|
||||||
PFNGLMULTIDRAWARRAYSINDIRECTPROC glad_glMultiDrawArraysIndirect = NULL;
|
PFNGLMULTIDRAWARRAYSINDIRECTPROC glad_glMultiDrawArraysIndirect = NULL;
|
||||||
PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC glad_glMultiDrawArraysIndirectCount = NULL;
|
|
||||||
PFNGLMULTIDRAWELEMENTSPROC glad_glMultiDrawElements = NULL;
|
PFNGLMULTIDRAWELEMENTSPROC glad_glMultiDrawElements = NULL;
|
||||||
PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glad_glMultiDrawElementsBaseVertex = NULL;
|
PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glad_glMultiDrawElementsBaseVertex = NULL;
|
||||||
PFNGLMULTIDRAWELEMENTSINDIRECTPROC glad_glMultiDrawElementsIndirect = NULL;
|
PFNGLMULTIDRAWELEMENTSINDIRECTPROC glad_glMultiDrawElementsIndirect = NULL;
|
||||||
PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC glad_glMultiDrawElementsIndirectCount = NULL;
|
|
||||||
PFNGLMULTITEXCOORDP1UIPROC glad_glMultiTexCoordP1ui = NULL;
|
PFNGLMULTITEXCOORDP1UIPROC glad_glMultiTexCoordP1ui = NULL;
|
||||||
PFNGLMULTITEXCOORDP1UIVPROC glad_glMultiTexCoordP1uiv = NULL;
|
PFNGLMULTITEXCOORDP1UIVPROC glad_glMultiTexCoordP1uiv = NULL;
|
||||||
PFNGLMULTITEXCOORDP2UIPROC glad_glMultiTexCoordP2ui = NULL;
|
PFNGLMULTITEXCOORDP2UIPROC glad_glMultiTexCoordP2ui = NULL;
|
||||||
@ -676,7 +673,6 @@ PFNGLPOINTPARAMETERIVPROC glad_glPointParameteriv = NULL;
|
|||||||
PFNGLPOINTSIZEPROC glad_glPointSize = NULL;
|
PFNGLPOINTSIZEPROC glad_glPointSize = NULL;
|
||||||
PFNGLPOLYGONMODEPROC glad_glPolygonMode = NULL;
|
PFNGLPOLYGONMODEPROC glad_glPolygonMode = NULL;
|
||||||
PFNGLPOLYGONOFFSETPROC glad_glPolygonOffset = NULL;
|
PFNGLPOLYGONOFFSETPROC glad_glPolygonOffset = NULL;
|
||||||
PFNGLPOLYGONOFFSETCLAMPPROC glad_glPolygonOffsetClamp = NULL;
|
|
||||||
PFNGLPOPDEBUGGROUPPROC glad_glPopDebugGroup = NULL;
|
PFNGLPOPDEBUGGROUPPROC glad_glPopDebugGroup = NULL;
|
||||||
PFNGLPRIMITIVERESTARTINDEXPROC glad_glPrimitiveRestartIndex = NULL;
|
PFNGLPRIMITIVERESTARTINDEXPROC glad_glPrimitiveRestartIndex = NULL;
|
||||||
PFNGLPROGRAMBINARYPROC glad_glProgramBinary = NULL;
|
PFNGLPROGRAMBINARYPROC glad_glProgramBinary = NULL;
|
||||||
@ -758,7 +754,6 @@ PFNGLSECONDARYCOLORP3UIVPROC glad_glSecondaryColorP3uiv = NULL;
|
|||||||
PFNGLSHADERBINARYPROC glad_glShaderBinary = NULL;
|
PFNGLSHADERBINARYPROC glad_glShaderBinary = NULL;
|
||||||
PFNGLSHADERSOURCEPROC glad_glShaderSource = NULL;
|
PFNGLSHADERSOURCEPROC glad_glShaderSource = NULL;
|
||||||
PFNGLSHADERSTORAGEBLOCKBINDINGPROC glad_glShaderStorageBlockBinding = NULL;
|
PFNGLSHADERSTORAGEBLOCKBINDINGPROC glad_glShaderStorageBlockBinding = NULL;
|
||||||
PFNGLSPECIALIZESHADERPROC glad_glSpecializeShader = NULL;
|
|
||||||
PFNGLSTENCILFUNCPROC glad_glStencilFunc = NULL;
|
PFNGLSTENCILFUNCPROC glad_glStencilFunc = NULL;
|
||||||
PFNGLSTENCILFUNCSEPARATEPROC glad_glStencilFuncSeparate = NULL;
|
PFNGLSTENCILFUNCSEPARATEPROC glad_glStencilFuncSeparate = NULL;
|
||||||
PFNGLSTENCILMASKPROC glad_glStencilMask = NULL;
|
PFNGLSTENCILMASKPROC glad_glStencilMask = NULL;
|
||||||
@ -1726,13 +1721,6 @@ static void load_GL_VERSION_4_5(GLADloadproc load) {
|
|||||||
glad_glGetnMinmax = (PFNGLGETNMINMAXPROC)load("glGetnMinmax");
|
glad_glGetnMinmax = (PFNGLGETNMINMAXPROC)load("glGetnMinmax");
|
||||||
glad_glTextureBarrier = (PFNGLTEXTUREBARRIERPROC)load("glTextureBarrier");
|
glad_glTextureBarrier = (PFNGLTEXTUREBARRIERPROC)load("glTextureBarrier");
|
||||||
}
|
}
|
||||||
static void load_GL_VERSION_4_6(GLADloadproc load) {
|
|
||||||
if(!GLAD_GL_VERSION_4_6) return;
|
|
||||||
glad_glSpecializeShader = (PFNGLSPECIALIZESHADERPROC)load("glSpecializeShader");
|
|
||||||
glad_glMultiDrawArraysIndirectCount = (PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC)load("glMultiDrawArraysIndirectCount");
|
|
||||||
glad_glMultiDrawElementsIndirectCount = (PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC)load("glMultiDrawElementsIndirectCount");
|
|
||||||
glad_glPolygonOffsetClamp = (PFNGLPOLYGONOFFSETCLAMPPROC)load("glPolygonOffsetClamp");
|
|
||||||
}
|
|
||||||
static int find_extensionsGL(void) {
|
static int find_extensionsGL(void) {
|
||||||
if (!get_exts()) return 0;
|
if (!get_exts()) return 0;
|
||||||
(void)&has_ext;
|
(void)&has_ext;
|
||||||
@ -1794,10 +1782,9 @@ static void find_coreGL(void) {
|
|||||||
GLAD_GL_VERSION_4_3 = (major == 4 && minor >= 3) || major > 4;
|
GLAD_GL_VERSION_4_3 = (major == 4 && minor >= 3) || major > 4;
|
||||||
GLAD_GL_VERSION_4_4 = (major == 4 && minor >= 4) || major > 4;
|
GLAD_GL_VERSION_4_4 = (major == 4 && minor >= 4) || major > 4;
|
||||||
GLAD_GL_VERSION_4_5 = (major == 4 && minor >= 5) || major > 4;
|
GLAD_GL_VERSION_4_5 = (major == 4 && minor >= 5) || major > 4;
|
||||||
GLAD_GL_VERSION_4_6 = (major == 4 && minor >= 6) || major > 4;
|
if (GLVersion.major > 4 || (GLVersion.major >= 4 && GLVersion.minor >= 5)) {
|
||||||
if (GLVersion.major > 4 || (GLVersion.major >= 4 && GLVersion.minor >= 6)) {
|
|
||||||
max_loaded_major = 4;
|
max_loaded_major = 4;
|
||||||
max_loaded_minor = 6;
|
max_loaded_minor = 5;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1825,7 +1812,6 @@ int gladLoadGLLoader(GLADloadproc load) {
|
|||||||
load_GL_VERSION_4_3(load);
|
load_GL_VERSION_4_3(load);
|
||||||
load_GL_VERSION_4_4(load);
|
load_GL_VERSION_4_4(load);
|
||||||
load_GL_VERSION_4_5(load);
|
load_GL_VERSION_4_5(load);
|
||||||
load_GL_VERSION_4_6(load);
|
|
||||||
|
|
||||||
if (!find_extensionsGL()) return 0;
|
if (!find_extensionsGL()) return 0;
|
||||||
return GLVersion.major != 0 || GLVersion.minor != 0;
|
return GLVersion.major != 0 || GLVersion.minor != 0;
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
/*
|
/*
|
||||||
|
|
||||||
OpenGL loader generated by glad 0.1.36 on Tue May 14 15:22:23 2024.
|
OpenGL loader generated by glad 0.1.36 on Sun May 26 12:09:35 2024.
|
||||||
|
|
||||||
Language/Generator: C/C++
|
Language/Generator: C/C++
|
||||||
Specification: gl
|
Specification: gl
|
||||||
APIs: gl=4.6
|
APIs: gl=4.5
|
||||||
Profile: core
|
Profile: core
|
||||||
Extensions:
|
Extensions:
|
||||||
|
|
||||||
@ -14,9 +14,9 @@
|
|||||||
Reproducible: False
|
Reproducible: False
|
||||||
|
|
||||||
Commandline:
|
Commandline:
|
||||||
--profile="core" --api="gl=4.6" --generator="c" --spec="gl" --extensions=""
|
--profile="core" --api="gl=4.5" --generator="c" --spec="gl" --extensions=""
|
||||||
Online:
|
Online:
|
||||||
https://glad.dav1d.de/#profile=core&language=c&specification=gl&loader=on&api=gl%3D4.6
|
https://glad.dav1d.de/#profile=core&language=c&specification=gl&loader=on&api=gl%3D4.5
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@ -1491,28 +1491,6 @@ typedef void (APIENTRY *GLVULKANPROCNV)(void);
|
|||||||
#define GL_MINMAX 0x802E
|
#define GL_MINMAX 0x802E
|
||||||
#define GL_CONTEXT_RELEASE_BEHAVIOR 0x82FB
|
#define GL_CONTEXT_RELEASE_BEHAVIOR 0x82FB
|
||||||
#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC
|
#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC
|
||||||
#define GL_SHADER_BINARY_FORMAT_SPIR_V 0x9551
|
|
||||||
#define GL_SPIR_V_BINARY 0x9552
|
|
||||||
#define GL_PARAMETER_BUFFER 0x80EE
|
|
||||||
#define GL_PARAMETER_BUFFER_BINDING 0x80EF
|
|
||||||
#define GL_CONTEXT_FLAG_NO_ERROR_BIT 0x00000008
|
|
||||||
#define GL_VERTICES_SUBMITTED 0x82EE
|
|
||||||
#define GL_PRIMITIVES_SUBMITTED 0x82EF
|
|
||||||
#define GL_VERTEX_SHADER_INVOCATIONS 0x82F0
|
|
||||||
#define GL_TESS_CONTROL_SHADER_PATCHES 0x82F1
|
|
||||||
#define GL_TESS_EVALUATION_SHADER_INVOCATIONS 0x82F2
|
|
||||||
#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED 0x82F3
|
|
||||||
#define GL_FRAGMENT_SHADER_INVOCATIONS 0x82F4
|
|
||||||
#define GL_COMPUTE_SHADER_INVOCATIONS 0x82F5
|
|
||||||
#define GL_CLIPPING_INPUT_PRIMITIVES 0x82F6
|
|
||||||
#define GL_CLIPPING_OUTPUT_PRIMITIVES 0x82F7
|
|
||||||
#define GL_POLYGON_OFFSET_CLAMP 0x8E1B
|
|
||||||
#define GL_SPIR_V_EXTENSIONS 0x9553
|
|
||||||
#define GL_NUM_SPIR_V_EXTENSIONS 0x9554
|
|
||||||
#define GL_TEXTURE_MAX_ANISOTROPY 0x84FE
|
|
||||||
#define GL_MAX_TEXTURE_MAX_ANISOTROPY 0x84FF
|
|
||||||
#define GL_TRANSFORM_FEEDBACK_OVERFLOW 0x82EC
|
|
||||||
#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW 0x82ED
|
|
||||||
#ifndef GL_VERSION_1_0
|
#ifndef GL_VERSION_1_0
|
||||||
#define GL_VERSION_1_0 1
|
#define GL_VERSION_1_0 1
|
||||||
GLAPI int GLAD_GL_VERSION_1_0;
|
GLAPI int GLAD_GL_VERSION_1_0;
|
||||||
@ -3670,22 +3648,6 @@ typedef void (APIENTRYP PFNGLTEXTUREBARRIERPROC)(void);
|
|||||||
GLAPI PFNGLTEXTUREBARRIERPROC glad_glTextureBarrier;
|
GLAPI PFNGLTEXTUREBARRIERPROC glad_glTextureBarrier;
|
||||||
#define glTextureBarrier glad_glTextureBarrier
|
#define glTextureBarrier glad_glTextureBarrier
|
||||||
#endif
|
#endif
|
||||||
#ifndef GL_VERSION_4_6
|
|
||||||
#define GL_VERSION_4_6 1
|
|
||||||
GLAPI int GLAD_GL_VERSION_4_6;
|
|
||||||
typedef void (APIENTRYP PFNGLSPECIALIZESHADERPROC)(GLuint shader, const GLchar *pEntryPoint, GLuint numSpecializationConstants, const GLuint *pConstantIndex, const GLuint *pConstantValue);
|
|
||||||
GLAPI PFNGLSPECIALIZESHADERPROC glad_glSpecializeShader;
|
|
||||||
#define glSpecializeShader glad_glSpecializeShader
|
|
||||||
typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC)(GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
|
|
||||||
GLAPI PFNGLMULTIDRAWARRAYSINDIRECTCOUNTPROC glad_glMultiDrawArraysIndirectCount;
|
|
||||||
#define glMultiDrawArraysIndirectCount glad_glMultiDrawArraysIndirectCount
|
|
||||||
typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC)(GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
|
|
||||||
GLAPI PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC glad_glMultiDrawElementsIndirectCount;
|
|
||||||
#define glMultiDrawElementsIndirectCount glad_glMultiDrawElementsIndirectCount
|
|
||||||
typedef void (APIENTRYP PFNGLPOLYGONOFFSETCLAMPPROC)(GLfloat factor, GLfloat units, GLfloat clamp);
|
|
||||||
GLAPI PFNGLPOLYGONOFFSETCLAMPPROC glad_glPolygonOffsetClamp;
|
|
||||||
#define glPolygonOffsetClamp glad_glPolygonOffsetClamp
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
@ -293,7 +293,7 @@ namespace glerminal
|
|||||||
glfwInit();
|
glfwInit();
|
||||||
|
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6);
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 5);
|
||||||
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
||||||
// not resizable for now.
|
// not resizable for now.
|
||||||
//
|
//
|
||||||
|
Loading…
Reference in New Issue
Block a user