char gl_driver[256];
// GL_ARB_multitexture
-void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat);
+//void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat);
void (GLAPIENTRY *qglActiveTexture) (GLenum);
void (GLAPIENTRY *qglClientActiveTexture) (GLenum);
void (GLAPIENTRY *qglBlendFunc)(GLenum sfactor, GLenum dfactor);
void (GLAPIENTRY *qglCullFace)(GLenum mode);
-void (GLAPIENTRY *qglDrawBuffer)(GLenum mode);
-void (GLAPIENTRY *qglReadBuffer)(GLenum mode);
+//void (GLAPIENTRY *qglDrawBuffer)(GLenum mode);
+//void (GLAPIENTRY *qglReadBuffer)(GLenum mode);
void (GLAPIENTRY *qglEnable)(GLenum cap);
void (GLAPIENTRY *qglDisable)(GLenum cap);
//GLboolean GLAPIENTRY *qglIsEnabled)(GLenum cap);
void (GLAPIENTRY *qglEnableClientState)(GLenum cap);
void (GLAPIENTRY *qglDisableClientState)(GLenum cap);
-void (GLAPIENTRY *qglGetBooleanv)(GLenum pname, GLboolean *params);
-void (GLAPIENTRY *qglGetDoublev)(GLenum pname, GLdouble *params);
-void (GLAPIENTRY *qglGetFloatv)(GLenum pname, GLfloat *params);
+//void (GLAPIENTRY *qglGetBooleanv)(GLenum pname, GLboolean *params);
+//void (GLAPIENTRY *qglGetDoublev)(GLenum pname, GLdouble *params);
+//void (GLAPIENTRY *qglGetFloatv)(GLenum pname, GLfloat *params);
void (GLAPIENTRY *qglGetIntegerv)(GLenum pname, GLint *params);
GLenum (GLAPIENTRY *qglGetError)(void);
void (GLAPIENTRY *qglClearDepth)(GLclampd depth);
void (GLAPIENTRY *qglDepthFunc)(GLenum func);
void (GLAPIENTRY *qglDepthMask)(GLboolean flag);
-void (GLAPIENTRY *qglDepthRange)(GLclampd near_val, GLclampd far_val);
+//void (GLAPIENTRY *qglDepthRange)(GLclampd near_val, GLclampd far_val);
void (GLAPIENTRY *qglColorMask)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
void (GLAPIENTRY *qglDrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
//void (GLAPIENTRY *qglNormalPointer)(GLenum type, GLsizei stride, const GLvoid *ptr);
void (GLAPIENTRY *qglColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
void (GLAPIENTRY *qglTexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-void (GLAPIENTRY *qglArrayElement)(GLint i);
+//void (GLAPIENTRY *qglArrayElement)(GLint i);
void (GLAPIENTRY *qglColor4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-void (GLAPIENTRY *qglTexCoord2f)(GLfloat s, GLfloat t);
-void (GLAPIENTRY *qglVertex2f)(GLfloat x, GLfloat y);
-void (GLAPIENTRY *qglVertex3f)(GLfloat x, GLfloat y, GLfloat z);
-void (GLAPIENTRY *qglBegin)(GLenum mode);
-void (GLAPIENTRY *qglEnd)(void);
+//void (GLAPIENTRY *qglTexCoord2f)(GLfloat s, GLfloat t);
+//void (GLAPIENTRY *qglVertex2f)(GLfloat x, GLfloat y);
+//void (GLAPIENTRY *qglVertex3f)(GLfloat x, GLfloat y, GLfloat z);
+//void (GLAPIENTRY *qglBegin)(GLenum mode);
+//void (GLAPIENTRY *qglEnd)(void);
void (GLAPIENTRY *qglMatrixMode)(GLenum mode);
void (GLAPIENTRY *qglOrtho)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val);
//void (GLAPIENTRY *qglPushMatrix)(void);
//void (GLAPIENTRY *qglPopMatrix)(void);
void (GLAPIENTRY *qglLoadIdentity)(void);
-void (GLAPIENTRY *qglLoadMatrixd)(const GLdouble *m);
+//void (GLAPIENTRY *qglLoadMatrixd)(const GLdouble *m);
void (GLAPIENTRY *qglLoadMatrixf)(const GLfloat *m);
//void (GLAPIENTRY *qglMultMatrixd)(const GLdouble *m);
//void (GLAPIENTRY *qglMultMatrixf)(const GLfloat *m);
//void (GLAPIENTRY *qglRotated)(GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-void (GLAPIENTRY *qglRotatef)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+//void (GLAPIENTRY *qglRotatef)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
//void (GLAPIENTRY *qglScaled)(GLdouble x, GLdouble y, GLdouble z);
//void (GLAPIENTRY *qglScalef)(GLfloat x, GLfloat y, GLfloat z);
//void (GLAPIENTRY *qglTranslated)(GLdouble x, GLdouble y, GLdouble z);
-void (GLAPIENTRY *qglTranslatef)(GLfloat x, GLfloat y, GLfloat z);
+//void (GLAPIENTRY *qglTranslatef)(GLfloat x, GLfloat y, GLfloat z);
void (GLAPIENTRY *qglReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
void (GLAPIENTRY *qglStencilOp)(GLenum fail, GLenum zfail, GLenum zpass);
void (GLAPIENTRY *qglClearStencil)(GLint s);
-void (GLAPIENTRY *qglTexEnvf)(GLenum target, GLenum pname, GLfloat param);
+//void (GLAPIENTRY *qglTexEnvf)(GLenum target, GLenum pname, GLfloat param);
void (GLAPIENTRY *qglTexEnvi)(GLenum target, GLenum pname, GLint param);
-void (GLAPIENTRY *qglTexParameterf)(GLenum target, GLenum pname, GLfloat param);
-void (GLAPIENTRY *qglTexParameterfv)(GLenum target, GLenum pname, GLfloat *params);
+//void (GLAPIENTRY *qglTexParameterf)(GLenum target, GLenum pname, GLfloat param);
+//void (GLAPIENTRY *qglTexParameterfv)(GLenum target, GLenum pname, GLfloat *params);
void (GLAPIENTRY *qglTexParameteri)(GLenum target, GLenum pname, GLint param);
void (GLAPIENTRY *qglGenTextures)(GLsizei n, GLuint *textures);
void (GLAPIENTRY *qglDeleteTextures)(GLsizei n, const GLuint *textures);
void (GLAPIENTRY *qglBindTexture)(GLenum target, GLuint texture);
-void (GLAPIENTRY *qglPrioritizeTextures)(GLsizei n, const GLuint *textures, const GLclampf *priorities);
-GLboolean (GLAPIENTRY *qglAreTexturesResident)(GLsizei n, const GLuint *textures, GLboolean *residences);
+//void (GLAPIENTRY *qglPrioritizeTextures)(GLsizei n, const GLuint *textures, const GLclampf *priorities);
+//GLboolean (GLAPIENTRY *qglAreTexturesResident)(GLsizei n, const GLuint *textures, GLboolean *residences);
GLboolean (GLAPIENTRY *qglIsTexture)(GLuint texture);
-void (GLAPIENTRY *qglPixelStoref)(GLenum pname, GLfloat param);
+//void (GLAPIENTRY *qglPixelStoref)(GLenum pname, GLfloat param);
void (GLAPIENTRY *qglPixelStorei)(GLenum pname, GLint param);
void (GLAPIENTRY *qglTexImage1D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
void (GLAPIENTRY *qglTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
void (GLAPIENTRY *qglCopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+void (GLAPIENTRY *qglScissor)(GLint x, GLint y, GLsizei width, GLsizei height);
-int GL_CheckExtension(const char *name, const gl_extensionfunctionlist_t *funcs, const char *disableparm, int silent)
+void (GLAPIENTRY *qglPolygonOffset)(GLfloat factor, GLfloat units);
+
+int GL_CheckExtension(const char *name, const dllfunction_t *funcs, const char *disableparm, int silent)
{
int failed = false;
- const gl_extensionfunctionlist_t *func;
+ const dllfunction_t *func;
Con_Printf("checking for %s... ", name);
}
}
-static gl_extensionfunctionlist_t opengl110funcs[] =
+static dllfunction_t opengl110funcs[] =
{
{"glClearColor", (void **) &qglClearColor},
{"glClear", (void **) &qglClear},
// {"glAlphaFunc", (void **) &qglAlphaFunc},
{"glBlendFunc", (void **) &qglBlendFunc},
{"glCullFace", (void **) &qglCullFace},
- {"glDrawBuffer", (void **) &qglDrawBuffer},
- {"glReadBuffer", (void **) &qglReadBuffer},
+// {"glDrawBuffer", (void **) &qglDrawBuffer},
+// {"glReadBuffer", (void **) &qglReadBuffer},
{"glEnable", (void **) &qglEnable},
{"glDisable", (void **) &qglDisable},
// {"glIsEnabled", (void **) &qglIsEnabled},
{"glEnableClientState", (void **) &qglEnableClientState},
{"glDisableClientState", (void **) &qglDisableClientState},
- {"glGetBooleanv", (void **) &qglGetBooleanv},
- {"glGetDoublev", (void **) &qglGetDoublev},
- {"glGetFloatv", (void **) &qglGetFloatv},
+// {"glGetBooleanv", (void **) &qglGetBooleanv},
+// {"glGetDoublev", (void **) &qglGetDoublev},
+// {"glGetFloatv", (void **) &qglGetFloatv},
{"glGetIntegerv", (void **) &qglGetIntegerv},
{"glGetError", (void **) &qglGetError},
{"glGetString", (void **) &qglGetString},
{"glClearDepth", (void **) &qglClearDepth},
{"glDepthFunc", (void **) &qglDepthFunc},
{"glDepthMask", (void **) &qglDepthMask},
- {"glDepthRange", (void **) &qglDepthRange},
+// {"glDepthRange", (void **) &qglDepthRange},
{"glDrawElements", (void **) &qglDrawElements},
{"glColorMask", (void **) &qglColorMask},
{"glVertexPointer", (void **) &qglVertexPointer},
// {"glNormalPointer", (void **) &qglNormalPointer},
{"glColorPointer", (void **) &qglColorPointer},
{"glTexCoordPointer", (void **) &qglTexCoordPointer},
- {"glArrayElement", (void **) &qglArrayElement},
+// {"glArrayElement", (void **) &qglArrayElement},
{"glColor4f", (void **) &qglColor4f},
- {"glTexCoord2f", (void **) &qglTexCoord2f},
- {"glVertex2f", (void **) &qglVertex2f},
- {"glVertex3f", (void **) &qglVertex3f},
- {"glBegin", (void **) &qglBegin},
- {"glEnd", (void **) &qglEnd},
+// {"glTexCoord2f", (void **) &qglTexCoord2f},
+// {"glVertex2f", (void **) &qglVertex2f},
+// {"glVertex3f", (void **) &qglVertex3f},
+// {"glBegin", (void **) &qglBegin},
+// {"glEnd", (void **) &qglEnd},
{"glMatrixMode", (void **) &qglMatrixMode},
{"glOrtho", (void **) &qglOrtho},
{"glFrustum", (void **) &qglFrustum},
// {"glPushMatrix", (void **) &qglPushMatrix},
// {"glPopMatrix", (void **) &qglPopMatrix},
{"glLoadIdentity", (void **) &qglLoadIdentity},
- {"glLoadMatrixd", (void **) &qglLoadMatrixd},
+// {"glLoadMatrixd", (void **) &qglLoadMatrixd},
{"glLoadMatrixf", (void **) &qglLoadMatrixf},
// {"glMultMatrixd", (void **) &qglMultMatrixd},
// {"glMultMatrixf", (void **) &qglMultMatrixf},
// {"glRotated", (void **) &qglRotated},
- {"glRotatef", (void **) &qglRotatef},
+// {"glRotatef", (void **) &qglRotatef},
// {"glScaled", (void **) &qglScaled},
// {"glScalef", (void **) &qglScalef},
// {"glTranslated", (void **) &qglTranslated},
- {"glTranslatef", (void **) &qglTranslatef},
+// {"glTranslatef", (void **) &qglTranslatef},
{"glReadPixels", (void **) &qglReadPixels},
{"glStencilFunc", (void **) &qglStencilFunc},
{"glStencilMask", (void **) &qglStencilMask},
{"glStencilOp", (void **) &qglStencilOp},
{"glClearStencil", (void **) &qglClearStencil},
- {"glTexEnvf", (void **) &qglTexEnvf},
+// {"glTexEnvf", (void **) &qglTexEnvf},
{"glTexEnvi", (void **) &qglTexEnvi},
- {"glTexParameterf", (void **) &qglTexParameterf},
- {"glTexParameterfv", (void **) &qglTexParameterfv},
+// {"glTexParameterf", (void **) &qglTexParameterf},
+// {"glTexParameterfv", (void **) &qglTexParameterfv},
{"glTexParameteri", (void **) &qglTexParameteri},
- {"glPixelStoref", (void **) &qglPixelStoref},
+// {"glPixelStoref", (void **) &qglPixelStoref},
{"glPixelStorei", (void **) &qglPixelStorei},
{"glGenTextures", (void **) &qglGenTextures},
{"glDeleteTextures", (void **) &qglDeleteTextures},
{"glBindTexture", (void **) &qglBindTexture},
- {"glPrioritizeTextures", (void **) &qglPrioritizeTextures},
- {"glAreTexturesResident", (void **) &qglAreTexturesResident},
+// {"glPrioritizeTextures", (void **) &qglPrioritizeTextures},
+// {"glAreTexturesResident", (void **) &qglAreTexturesResident},
{"glIsTexture", (void **) &qglIsTexture},
{"glTexImage1D", (void **) &qglTexImage1D},
{"glTexImage2D", (void **) &qglTexImage2D},
{"glCopyTexImage2D", (void **) &qglCopyTexImage2D},
{"glCopyTexSubImage1D", (void **) &qglCopyTexSubImage1D},
{"glCopyTexSubImage2D", (void **) &qglCopyTexSubImage2D},
+ {"glScissor", (void **) &qglScissor},
+ {"glPolygonOffset", (void **) &qglPolygonOffset},
{NULL, NULL}
};
-static gl_extensionfunctionlist_t drawrangeelementsfuncs[] =
+static dllfunction_t drawrangeelementsfuncs[] =
{
{"glDrawRangeElements", (void **) &qglDrawRangeElements},
{NULL, NULL}
};
-static gl_extensionfunctionlist_t drawrangeelementsextfuncs[] =
+static dllfunction_t drawrangeelementsextfuncs[] =
{
{"glDrawRangeElementsEXT", (void **) &qglDrawRangeElementsEXT},
{NULL, NULL}
};
-static gl_extensionfunctionlist_t multitexturefuncs[] =
+static dllfunction_t multitexturefuncs[] =
{
- {"glMultiTexCoord2fARB", (void **) &qglMultiTexCoord2f},
+ //{"glMultiTexCoord2fARB", (void **) &qglMultiTexCoord2f},
{"glActiveTextureARB", (void **) &qglActiveTexture},
{"glClientActiveTextureARB", (void **) &qglClientActiveTexture},
{NULL, NULL}
};
-static gl_extensionfunctionlist_t compiledvertexarrayfuncs[] =
+static dllfunction_t compiledvertexarrayfuncs[] =
{
{"glLockArraysEXT", (void **) &qglLockArraysEXT},
{"glUnlockArraysEXT", (void **) &qglUnlockArraysEXT},
{NULL, NULL}
};
-static gl_extensionfunctionlist_t texture3dextfuncs[] =
+static dllfunction_t texture3dextfuncs[] =
{
{"glTexImage3DEXT", (void **) &qglTexImage3D},
{"glTexSubImage3DEXT", (void **) &qglTexSubImage3D},
int vid_commandlinecheck = true;
void VID_Open(void)
{
- int i;
+ int i, width, height;
if (vid_commandlinecheck)
{
// interpret command-line parameters
Cvar_SetValueQuick(&vid_fullscreen, false);
if ((i = COM_CheckParm("-fullscreen")) != 0)
Cvar_SetValueQuick(&vid_fullscreen, true);
+ width = 0;
+ height = 0;
if ((i = COM_CheckParm("-width")) != 0)
- Cvar_SetQuick(&vid_width, com_argv[i+1]);
+ width = atoi(com_argv[i+1]);
if ((i = COM_CheckParm("-height")) != 0)
- Cvar_SetQuick(&vid_height, com_argv[i+1]);
+ height = atoi(com_argv[i+1]);
+ if (width == 0)
+ width = height * 4 / 3;
+ if (height == 0)
+ height = width * 3 / 4;
+ if (width)
+ Cvar_SetValueQuick(&vid_width, width);
+ if (height)
+ Cvar_SetValueQuick(&vid_height, height);
if ((i = COM_CheckParm("-bpp")) != 0)
Cvar_SetQuick(&vid_bitsperpixel, com_argv[i+1]);
if ((i = COM_CheckParm("-nostencil")) != 0)
Cvar_SetValueQuick(&vid_stencil, 1);
}
+ if (vid_stencil.integer && vid_bitsperpixel.integer != 32)
+ {
+ Con_Printf("vid_stencil not allowed without vid_bitsperpixel 32, turning off vid_stencil\n");
+ Cvar_SetValueQuick(&vid_stencil, 0);
+ }
+
Con_Printf("Starting video system\n");
if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_stencil.integer))
{
projects / xonotic / darkplaces.git / blobdiff