Skip to content

feat: testing opengl core 3.2 #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
pollend wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: testing opengl core 3.2 #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions source/qcommon/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ void Com_Printf( const char *format, ... )
Sys_ConsoleOutput( msg );

Con_Print( msg );
printf("%s\n", msg);

if( log_file )
{
Expand Down
123 changes: 53 additions & 70 deletions source/ref_gl/qgl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,37 @@ typedef unsigned short GLhalfARB;
#define QGL_FUNC
#endif

#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242
#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
#define GL_DEBUG_CALLBACK_FUNCTION 0x8244
#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245
#define GL_DEBUG_SOURCE_API 0x8246
#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247
#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248
#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249
#define GL_DEBUG_SOURCE_APPLICATION 0x824A
#define GL_DEBUG_SOURCE_OTHER 0x824B
#define GL_DEBUG_TYPE_ERROR 0x824C
#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E
#define GL_DEBUG_TYPE_PORTABILITY 0x824F
#define GL_DEBUG_TYPE_PERFORMANCE 0x8250
#define GL_DEBUG_TYPE_OTHER 0x8251
#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143
#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144
#define GL_DEBUG_LOGGED_MESSAGES 0x9145
#define GL_DEBUG_SEVERITY_HIGH 0x9146
#define GL_DEBUG_SEVERITY_MEDIUM 0x9147
#define GL_DEBUG_SEVERITY_LOW 0x9148
#define GL_DEBUG_TYPE_MARKER 0x8268
#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269
#define GL_DEBUG_TYPE_POP_GROUP 0x826A
#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B
#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C
#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D



// WGL Functions
QGL_WGL(PROC, wglGetProcAddress, (LPCSTR));
QGL_WGL(int, wglChoosePixelFormat, (HDC, CONST PIXELFORMATDESCRIPTOR *));
Expand Down Expand Up @@ -592,6 +623,17 @@ QGL_EGL(EGLBoolean, eglSwapInterval, (EGLDisplay dpy, EGLint interval));
QGL_EGL(EGLBoolean, eglTerminate, (EGLDisplay dpy));
#endif

typedef void (APIENTRY *DEBUGPROC)(GLenum source,
GLenum type,
GLuint id,
GLenum severity,
GLsizei length,
const char*message,
const void *userParam);

QGL_FUNC(void, glDebugMessageCallback, (DEBUGPROC cb, const void* userParam));


// GL Functions
QGL_FUNC(void, glBindTexture, (GLenum target, GLuint texture));
QGL_FUNC(void, glClear, (GLbitfield mask));
Expand Down Expand Up @@ -640,7 +682,6 @@ QGL_FUNC(void, glGetShaderPrecisionFormat, (GLenum shaderType, GLenum precisionT
#endif
#endif

#ifndef GL_ES_VERSION_2_0
QGL_EXT(void, glActiveTextureARB, (GLenum ));
QGL_EXT(void, glClientActiveTextureARB, (GLenum ));
QGL_EXT(void, glDrawRangeElementsEXT, (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *));
Expand All @@ -649,24 +690,16 @@ QGL_EXT(void, glDeleteBuffersARB, (GLsizei n, const GLuint *buffers));
QGL_EXT(void, glGenBuffersARB, (GLsizei n, GLuint *buffers));
QGL_EXT(void, glBufferDataARB, (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage));
QGL_EXT(void, glBufferSubDataARB, (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data));
#else

QGL_EXT(void, glClientActiveTexture, (GLenum ));

QGL_FUNC(void, glActiveTexture, (GLenum ));
QGL_FUNC_OPT(void, glDrawRangeElements, (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *));
QGL_FUNC(void, glBindBuffer, (GLenum target, GLuint buffer));
QGL_FUNC(void, glDeleteBuffers, (GLsizei n, const GLuint *buffers));
QGL_FUNC(void, glGenBuffers, (GLsizei n, GLuint *buffers));
QGL_FUNC(void, glBufferData, (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage));
QGL_FUNC(void, glBufferSubData, (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data));
#ifndef qglActiveTextureARB
#define qglActiveTextureARB qglActiveTexture
#define qglDrawRangeElementsEXT qglDrawRangeElements
#define qglBindBufferARB qglBindBuffer
#define qglDeleteBuffersARB qglDeleteBuffers
#define qglGenBuffersARB qglGenBuffers
#define qglBufferDataARB qglBufferData
#define qglBufferSubDataARB qglBufferSubData
#endif
#endif

#ifndef GL_ES_VERSION_2_0
QGL_EXT(void, glDeleteObjectARB, (GLhandleARB obj));
Expand Down Expand Up @@ -719,7 +752,7 @@ QGL_EXT(void, glGetShaderiv, (GLhandleARB shaderObj, GLenum pname, GLint *params
QGL_EXT(void, glGetProgramInfoLog, (GLhandleARB programObj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog));
QGL_EXT(void, glGetShaderInfoLog, (GLhandleARB shaderObj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog));
QGL_EXT(void, glGetAttachedShaders, (GLhandleARB programObj, GLsizei maxCount, GLsizei *count, GLhandleARB *shaders));
#else

QGL_FUNC(void, glDeleteProgram, (GLhandleARB programObj));
QGL_FUNC(void, glDeleteShader, (GLhandleARB shaderObj));
QGL_FUNC(void, glDetachShader, (GLhandleARB programObj, GLhandleARB shaderObj));
Expand Down Expand Up @@ -760,6 +793,9 @@ QGL_FUNC(void, glGetActiveUniform, (GLhandleARB programObj, GLuint index, GLsize
QGL_FUNC(void, glGetUniformfv, (GLhandleARB programObj, GLint location, GLfloat *params));
QGL_FUNC(void, glGetUniformiv, (GLhandleARB programObj, GLint location, GLint *params));
QGL_FUNC(void, glGetShaderSource, (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source));


#else
#ifndef qglShaderSourceARB
#define qglShaderSourceARB qglShaderSource
#define qglCompileShaderARB qglCompileShader
Expand Down Expand Up @@ -792,50 +828,30 @@ QGL_FUNC(void, glGetShaderSource, (GLhandleARB obj, GLsizei maxLength, GLsizei *
#endif
#endif

#ifndef GL_ES_VERSION_2_0
QGL_EXT(void, glVertexAttribPointerARB, (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer));
QGL_EXT(void, glEnableVertexAttribArrayARB, (GLuint index));
QGL_EXT(void, glDisableVertexAttribArrayARB, (GLuint index));
QGL_EXT(void, glBindAttribLocationARB, (GLhandleARB programObj, GLuint index, const GLcharARB *name));
QGL_EXT(void, glGetActiveAttribARB, (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name));
QGL_EXT(GLint, glGetAttribLocationARB, (GLhandleARB programObj, const GLcharARB *name));
#else

QGL_FUNC(void, glVertexAttribPointer, (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer));
QGL_FUNC(void, glEnableVertexAttribArray, (GLuint index));
QGL_FUNC(void, glDisableVertexAttribArray, (GLuint index));
QGL_FUNC(void, glBindAttribLocation, (GLhandleARB programObj, GLuint index, const GLcharARB *name));
QGL_FUNC(void, glGetActiveAttrib, (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name));
QGL_FUNC(GLint, glGetAttribLocation, (GLhandleARB programObj, const GLcharARB *name));
#ifndef qglVertexAttribPointerARB
#define qglVertexAttribPointerARB qglVertexAttribPointer
#define qglEnableVertexAttribArrayARB qglEnableVertexAttribArray
#define qglDisableVertexAttribArrayARB qglDisableVertexAttribArray
#define qglBindAttribLocationARB qglBindAttribLocation
#define qglGetActiveAttribARB qglGetActiveAttrib
#define qglGetAttribLocationARB qglGetAttribLocationARB
#endif
#endif

#ifndef GL_ES_VERSION_2_0
QGL_EXT(void, glBindFragDataLocation, (GLuint programObj, GLuint index, const GLcharARB *name));
#endif

#ifndef GL_ES_VERSION_2_0
QGL_EXT(void, glDrawArraysInstancedARB, (GLenum mode, GLint first, GLsizei count, GLsizei primcount));
QGL_EXT(void, glDrawElementsInstancedARB, (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount));
QGL_EXT(void, glVertexAttribDivisorARB, (GLuint index, GLuint divisor));
#else

QGL_FUNC_OPT(void, glDrawArraysInstanced, (GLenum mode, GLint first, GLsizei count, GLsizei primcount));
QGL_FUNC_OPT(void, glDrawElementsInstanced, (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount));
QGL_FUNC_OPT(void, glVertexAttribDivisor, (GLuint index, GLuint divisor));
#ifndef qglDrawArraysInstancedARB
#define qglDrawArraysInstancedARB qglDrawArraysInstanced
#define qglDrawElementsInstancedARB qglDrawElementsInstanced
#define qglVertexAttribDivisorARB qglVertexAttribDivisor
#endif
#endif

#ifndef GL_ES_VERSION_2_0
QGL_EXT(GLboolean, glIsRenderbufferEXT, (GLuint));
QGL_EXT(void, glBindRenderbufferEXT, (GLenum, GLuint));
QGL_EXT(void, glDeleteRenderbuffersEXT, (GLsizei, const GLuint *));
Expand All @@ -852,7 +868,7 @@ QGL_EXT(void, glFramebufferTexture2DEXT, (GLenum, GLenum, GLenum, GLuint, GLint)
QGL_EXT(void, glFramebufferRenderbufferEXT, (GLenum, GLenum, GLenum, GLuint));
QGL_EXT(void, glGetFramebufferAttachmentParameterivEXT, (GLenum, GLenum, GLenum, GLint *));
QGL_EXT(void, glGenerateMipmapEXT, (GLenum));
#else

QGL_FUNC(GLboolean, glIsRenderbuffer, (GLuint));
QGL_FUNC(void, glBindRenderbuffer, (GLenum, GLuint));
QGL_FUNC(void, glDeleteRenderbuffers, (GLsizei, const GLuint *));
Expand All @@ -868,24 +884,6 @@ QGL_FUNC(void, glFramebufferTexture2D, (GLenum, GLenum, GLenum, GLuint, GLint));
QGL_FUNC(void, glFramebufferRenderbuffer, (GLenum, GLenum, GLenum, GLuint));
QGL_FUNC(void, glGetFramebufferAttachmentParameteriv, (GLenum, GLenum, GLenum, GLint *));
QGL_FUNC(void, glGenerateMipmap, (GLenum));
#ifndef qglIsRenderbufferEXT
#define qglIsRenderbufferEXT qglIsRenderbuffer
#define qglBindRenderbufferEXT qglBindRenderbuffer
#define qglDeleteRenderbuffersEXT qglDeleteRenderbuffers
#define qglGenRenderbuffersEXT qglGenRenderbuffers
#define qglRenderbufferStorageEXT qglRenderbufferStorage
#define qglGetRenderbufferParameterivEXT qglGetRenderbufferParameteriv
#define qglIsFramebufferEXT qglIsFramebuffer
#define qglBindFramebufferEXT qglBindFramebuffer
#define qglDeleteFramebuffersEXT qglDeleteFramebuffers
#define qglGenFramebuffersEXT qglGenFramebuffers
#define qglCheckFramebufferStatusEXT qglCheckFramebufferStatus
#define qglFramebufferTexture2DEXT qglFramebufferTexture2D
#define qglFramebufferRenderbufferEXT qglFramebufferRenderbuffer
#define qglGetFramebufferAttachmentParameterivEXT qglGetFramebufferAttachmentParameteriv
#define qglGenerateMipmapEXT qglGenerateMipmap
#endif
#endif

#ifndef GL_ES_VERSION_2_0
QGL_EXT(void, glBlitFramebufferEXT, (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum));
Expand Down Expand Up @@ -915,17 +913,10 @@ QGL_FUNC_OPT(void, glGetProgramBinary, (GLuint program, GLsizei bufSize, GLsizei
QGL_FUNC_OPT(void, glProgramBinary, (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length));
#endif

#ifndef GL_ES_VERSION_2_0
QGL_EXT(void, glCompressedTexImage2DARB, (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *));
QGL_EXT(void, glCompressedTexSubImage2DARB, (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *));
#else
QGL_FUNC(void, glCompressedTexImage2D, (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *));
QGL_FUNC(void, glCompressedTexSubImage2D, (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *));
#ifndef qglCompressedTexImage2DARB
#define qglCompressedTexImage2DARB qglCompressedTexImage2D
#define qglCompressedTexSubImage2DARB qglCompressedTexSubImage2D
#endif
#endif

#ifndef GL_ES_VERSION_2_0
QGL_EXT(void, glBlendFuncSeparateEXT, (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha));
Expand All @@ -936,19 +927,11 @@ QGL_FUNC(void, glBlendFuncSeparate, (GLenum sfactorRGB, GLenum dfactorRGB, GLenu
#endif
#endif

#ifndef GL_ES_VERSION_2_0
QGL_EXT(void, glTexImage3DEXT, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels));
QGL_EXT(void, glTexSubImage3DEXT, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels));
#else
QGL_EXT(void, glTexImage3DOES, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels));
QGL_EXT(void, glTexSubImage3DOES, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels));

QGL_FUNC_OPT(void, glTexImage3D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels));
QGL_FUNC_OPT(void, glTexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels));
#ifndef qglTexImage3DEXT
#define qglTexImage3DEXT qglTexImage3DOES
#define qglTexSubImage3DEXT qglTexSubImage3DOES
#endif
#endif

// WGL_EXT Functions
QGL_WGL_EXT(const char *, wglGetExtensionsStringEXT, (void));
Expand Down
5 changes: 5 additions & 0 deletions source/ref_gl/r_backend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,7 @@ void RB_FlushDynamicMeshes( void )
m[13] = transy;
RB_LoadObjectMatrix( m );
}
assert( qglGetError() == GL_NO_ERROR );
}

/*
Expand All @@ -960,6 +961,8 @@ static void RB_EnableVertexAttribs( void )
RB_EnableVertexAttrib( VATTRIB_POSITION, true );
qglVertexAttribPointerARB( VATTRIB_POSITION, 4, FLOAT_VATTRIB_GL_TYPE( VATTRIB_POSITION_BIT, hfa ),
GL_FALSE, vbo->vertexSize, ( const GLvoid * )0 );
assert( qglGetError() == GL_NO_ERROR );


// normal
if( vattribs & VATTRIB_NORMAL_BIT ) {
Expand Down Expand Up @@ -1078,6 +1081,7 @@ static void RB_EnableVertexAttribs( void )
RB_EnableVertexAttrib( VATTRIB_INSTANCE_QUAT, false );
RB_EnableVertexAttrib( VATTRIB_INSTANCE_XYZS, false );
}
assert( qglGetError() == GL_NO_ERROR );
}

/*
Expand Down Expand Up @@ -1161,6 +1165,7 @@ void RB_DrawElementsReal( rbDrawElements_t *de )
if( rb.primitive == GL_TRIANGLES ) {
rb.stats.c_totalTris += numElems * numInstances / 3;
}
assert( qglGetError() == GL_NO_ERROR );
}

/*
Expand Down
Loading