X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=a6912c049398f40e30d428d6ab206366f360685e;hb=1da6c44635f21581e349b289a47c5f7fc715b398;hp=843707b48f7b9ba2f9ea03cd7ca4b62fdad2d620;hpb=d935102f6ffdbfed14a50ee67f0231407c2073db;p=xonotic%2Fdarkplaces.git diff --git a/vid_shared.c b/vid_shared.c index 843707b4..a6912c04 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -5,15 +5,6 @@ #endif #include "image.h" -#ifdef SUPPORTD3D -#include -#ifdef _MSC_VER -#pragma comment(lib, "d3d9.lib") -#endif - -LPDIRECT3DDEVICE9 vid_d3d9dev; -#endif - #ifdef WIN32 //#include #define XINPUT_GAMEPAD_DPAD_UP 0x0001 @@ -135,14 +126,6 @@ cvar_t joy_x360_sensitivitypitch = {0, "joy_x360_sensitivitypitch", "-1", "movem cvar_t joy_x360_sensitivityyaw = {0, "joy_x360_sensitivityyaw", "-1", "movement multiplier"}; cvar_t joy_x360_sensitivityroll = {0, "joy_x360_sensitivityroll", "1", "movement multiplier"}; -// cvars for DPSOFTRAST -cvar_t vid_soft = {CVAR_SAVE, "vid_soft", "0", "enables use of the DarkPlaces Software Rasterizer rather than OpenGL or Direct3D"}; -cvar_t vid_soft_threads = {CVAR_SAVE, "vid_soft_threads", "8", "the number of threads the DarkPlaces Software Rasterizer should use"}; -cvar_t vid_soft_interlace = {CVAR_SAVE, "vid_soft_interlace", "1", "whether the DarkPlaces Software Rasterizer should interlace the screen bands occupied by each thread"}; - -// we don't know until we try it! -cvar_t vid_hardwaregammasupported = {CVAR_READONLY,"vid_hardwaregammasupported","1", "indicates whether hardware gamma is supported (updated by attempts to set hardware gamma ramps)"}; - // VorteX: more info cvars, mostly set in VID_CheckExtensions cvar_t gl_info_vendor = {CVAR_READONLY, "gl_info_vendor", "", "indicates brand of graphics chip"}; cvar_t gl_info_renderer = {CVAR_READONLY, "gl_info_renderer", "", "indicates graphics chip model and other information"}; @@ -151,17 +134,10 @@ cvar_t gl_info_extensions = {CVAR_READONLY, "gl_info_extensions", "", "indicates cvar_t gl_info_platform = {CVAR_READONLY, "gl_info_platform", "", "indicates GL platform: WGL, GLX, or AGL."}; cvar_t gl_info_driver = {CVAR_READONLY, "gl_info_driver", "", "name of driver library (opengl32.dll, libGL.so.1, or whatever)."}; -// whether hardware gamma ramps are currently in effect -qboolean vid_usinghwgamma = false; - -int vid_gammarampsize = 0; -unsigned short *vid_gammaramps = NULL; -unsigned short *vid_systemgammaramps = NULL; - cvar_t vid_fullscreen = {CVAR_SAVE, "vid_fullscreen", "1", "use fullscreen (1) or windowed (0)"}; cvar_t vid_width = {CVAR_SAVE, "vid_width", "640", "resolution"}; cvar_t vid_height = {CVAR_SAVE, "vid_height", "480", "resolution"}; -cvar_t vid_bitsperpixel = {CVAR_SAVE, "vid_bitsperpixel", "32", "how many bits per pixel to render at (32 or 16, 32 is recommended)"}; +cvar_t vid_bitsperpixel = {CVAR_READONLY, "vid_bitsperpixel", "32", "how many bits per pixel to render at (this is not currently configurable)"}; cvar_t vid_samples = {CVAR_SAVE, "vid_samples", "1", "how many anti-aliasing samples per pixel to request from the graphics driver (4 is recommended, 1 is faster)"}; cvar_t vid_refreshrate = {CVAR_SAVE, "vid_refreshrate", "60", "refresh rate to use, in hz (higher values flicker less, if supported by your monitor)"}; cvar_t vid_userefreshrate = {CVAR_SAVE, "vid_userefreshrate", "0", "set this to 1 to make vid_refreshrate used, or to 0 to let the engine choose a sane default"}; @@ -178,8 +154,6 @@ cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1", "whether to use the mouse in wi cvar_t vid_grabkeyboard = {CVAR_SAVE, "vid_grabkeyboard", "0", "whether to grab the keyboard when mouse is active (prevents use of volume control keys, music player keys, etc on some keyboards)"}; cvar_t vid_minwidth = {0, "vid_minwidth", "0", "minimum vid_width that is acceptable (to be set in default.cfg in mods)"}; cvar_t vid_minheight = {0, "vid_minheight", "0", "minimum vid_height that is acceptable (to be set in default.cfg in mods)"}; -cvar_t vid_gl13 = {0, "vid_gl13", "1", "enables faster rendering using OpenGL 1.3 features (such as GL_ARB_texture_env_combine extension)"}; -cvar_t vid_gl20 = {0, "vid_gl20", "1", "enables faster rendering using OpenGL 2.0 features (such as GL_ARB_fragment_shader extension)"}; cvar_t gl_finish = {0, "gl_finish", "0", "make the cpu wait for the graphics processor at the end of each rendered frame (can help with strange input or video lag problems on some machines)"}; cvar_t vid_sRGB = {CVAR_SAVE, "vid_sRGB", "0", "if hardware is capable, modify rendering to be gamma corrected for the sRGB color standard (computer monitors, TVs), recommended"}; cvar_t vid_sRGB_fallback = {CVAR_SAVE, "vid_sRGB_fallback", "0", "do an approximate sRGB fallback if not properly supported by hardware (2: also use the fallback if framebuffer is 8bit, 3: always use the fallback even if sRGB is supported)"}; @@ -189,7 +163,7 @@ cvar_t vid_touchscreen_showkeyboard = {0, "vid_touchscreen_showkeyboard", "0", " cvar_t vid_touchscreen_supportshowkeyboard = {CVAR_READONLY, "vid_touchscreen_supportshowkeyboard", "0", "indicates if the platform supports a virtual keyboard"}; cvar_t vid_stick_mouse = {CVAR_SAVE, "vid_stick_mouse", "0", "have the mouse stuck in the center of the screen" }; cvar_t vid_resizable = {CVAR_SAVE, "vid_resizable", "0", "0: window not resizable, 1: resizable, 2: window can be resized but the framebuffer isn't adjusted" }; -cvar_t vid_desktopfullscreen = {CVAR_SAVE, "vid_desktopfullscreen", "0", "force desktop resolution for fullscreen; also use some OS dependent tricks for better fullscreen integration"}; +cvar_t vid_desktopfullscreen = {CVAR_SAVE, "vid_desktopfullscreen", "1", "force desktop resolution for fullscreen; also use some OS dependent tricks for better fullscreen integration"}; cvar_t v_gamma = {CVAR_SAVE, "v_gamma", "1", "inverse gamma correction value, a brightness effect that does not affect white or black, and tends to make the image grey and dull"}; cvar_t v_contrast = {CVAR_SAVE, "v_contrast", "1", "brightness of white (values above 1 give a brighter image with increased color saturation, unlike v_gamma)"}; @@ -205,10 +179,8 @@ cvar_t v_color_grey_b = {CVAR_SAVE, "v_color_grey_b", "0.5", "desired color of g cvar_t v_color_white_r = {CVAR_SAVE, "v_color_white_r", "1", "desired color of white"}; cvar_t v_color_white_g = {CVAR_SAVE, "v_color_white_g", "1", "desired color of white"}; cvar_t v_color_white_b = {CVAR_SAVE, "v_color_white_b", "1", "desired color of white"}; -cvar_t v_hwgamma = {CVAR_SAVE, "v_hwgamma", "0", "enables use of hardware gamma correction ramps if available (note: does not work very well on Windows2000 and above), values are 0 = off, 1 = attempt to use hardware gamma, 2 = use hardware gamma whether it works or not"}; -cvar_t v_glslgamma = {CVAR_SAVE, "v_glslgamma", "1", "enables use of GLSL to apply gamma correction ramps if available (note: overrides v_hwgamma)"}; -cvar_t v_glslgamma_2d = {CVAR_SAVE, "v_glslgamma_2d", "0", "applies GLSL gamma to 2d pictures (HUD, fonts)"}; -cvar_t v_psycho = {0, "v_psycho", "0", "easter egg"}; +cvar_t v_glslgamma_2d = {CVAR_SAVE, "v_glslgamma_2d", "1", "applies GLSL gamma to 2d pictures (HUD, fonts)"}; +cvar_t v_psycho = {0, "v_psycho", "0", "easter egg - R.I.P. zinx http://obits.al.com/obituaries/birmingham/obituary.aspx?n=christopher-robert-lais&pid=186080667"}; // brand of graphics chip const char *gl_vendor; @@ -228,12 +200,7 @@ char gl_driver[256]; #ifndef USE_GLES2 // GL_ARB_multitexture -void (GLAPIENTRY *qglMultiTexCoord1f) (GLenum, GLfloat); -void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat); -void (GLAPIENTRY *qglMultiTexCoord3f) (GLenum, GLfloat, GLfloat, GLfloat); -void (GLAPIENTRY *qglMultiTexCoord4f) (GLenum, GLfloat, GLfloat, GLfloat, GLfloat); void (GLAPIENTRY *qglActiveTexture) (GLenum); -void (GLAPIENTRY *qglClientActiveTexture) (GLenum); // general GL functions @@ -241,7 +208,6 @@ void (GLAPIENTRY *qglClearColor)(GLclampf red, GLclampf green, GLclampf blue, GL void (GLAPIENTRY *qglClear)(GLbitfield mask); -void (GLAPIENTRY *qglAlphaFunc)(GLenum func, GLclampf ref); void (GLAPIENTRY *qglBlendFunc)(GLenum sfactor, GLenum dfactor); void (GLAPIENTRY *qglCullFace)(GLenum mode); @@ -251,9 +217,6 @@ 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); @@ -271,44 +234,10 @@ void (GLAPIENTRY *qglDepthRange)(GLclampd near_val, GLclampd far_val); void (GLAPIENTRY *qglDepthRangef)(GLclampf near_val, GLclampf 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 *qglDrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices); void (GLAPIENTRY *qglDrawArrays)(GLenum mode, GLint first, GLsizei count); -void (GLAPIENTRY *qglVertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr); -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 *qglColor4ub)(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); -void (GLAPIENTRY *qglColor4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -void (GLAPIENTRY *qglTexCoord1f)(GLfloat s); -void (GLAPIENTRY *qglTexCoord2f)(GLfloat s, GLfloat t); -void (GLAPIENTRY *qglTexCoord3f)(GLfloat s, GLfloat t, GLfloat r); -void (GLAPIENTRY *qglTexCoord4f)(GLfloat s, GLfloat t, GLfloat r, GLfloat q); -void (GLAPIENTRY *qglVertex2f)(GLfloat x, GLfloat y); -void (GLAPIENTRY *qglVertex3f)(GLfloat x, GLfloat y, GLfloat z); -void (GLAPIENTRY *qglVertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); -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 *qglFrustum)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val); + void (GLAPIENTRY *qglViewport)(GLint x, GLint y, GLsizei width, GLsizei height); -//void (GLAPIENTRY *qglPushMatrix)(void); -//void (GLAPIENTRY *qglPopMatrix)(void); -void (GLAPIENTRY *qglLoadIdentity)(void); -//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 *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 *qglReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); @@ -317,9 +246,6 @@ void (GLAPIENTRY *qglStencilMask)(GLuint mask); 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 *qglTexEnvfv)(GLenum target, GLenum pname, const GLfloat *params); -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 *qglTexParameteri)(GLenum target, GLenum pname, GLint param); @@ -333,26 +259,14 @@ void (GLAPIENTRY *qglHint)(GLenum target, GLenum mode); 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); -//GLboolean (GLAPIENTRY *qglIsTexture)(GLuint texture); -//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 *qglTexImage2D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -//void (GLAPIENTRY *qglTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); void (GLAPIENTRY *qglTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -//void (GLAPIENTRY *qglCopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); void (GLAPIENTRY *qglCopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -//void (GLAPIENTRY *qglCopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); void (GLAPIENTRY *qglCopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); - -void (GLAPIENTRY *qglDrawRangeElementsEXT)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); - -//void (GLAPIENTRY *qglColorTableEXT)(int, int, int, int, int, const void *); - void (GLAPIENTRY *qglTexImage3D)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, 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); @@ -361,13 +275,7 @@ void (GLAPIENTRY *qglScissor)(GLint x, GLint y, GLsizei width, GLsizei height); void (GLAPIENTRY *qglPolygonOffset)(GLfloat factor, GLfloat units); void (GLAPIENTRY *qglPolygonMode)(GLenum face, GLenum mode); -void (GLAPIENTRY *qglPolygonStipple)(const GLubyte *mask); - -//void (GLAPIENTRY *qglClipPlane)(GLenum plane, const GLdouble *equation); -//void (GLAPIENTRY *qglGetClipPlane)(GLenum plane, GLdouble *equation); -//[515]: added on 29.07.2005 -void (GLAPIENTRY *qglLineWidth)(GLfloat width); void (GLAPIENTRY *qglPointSize)(GLfloat size); void (GLAPIENTRY *qglBlendEquationEXT)(GLenum); @@ -378,7 +286,6 @@ void (GLAPIENTRY *qglActiveStencilFaceEXT)(GLenum); void (GLAPIENTRY *qglDeleteShader)(GLuint obj); void (GLAPIENTRY *qglDeleteProgram)(GLuint obj); -//GLuint (GLAPIENTRY *qglGetHandle)(GLenum pname); void (GLAPIENTRY *qglDetachShader)(GLuint containerObj, GLuint attachedObj); GLuint (GLAPIENTRY *qglCreateShader)(GLenum shaderType); void (GLAPIENTRY *qglShaderSource)(GLuint shaderObj, GLsizei count, const GLchar **string, const GLint *length); @@ -467,14 +374,14 @@ void (GLAPIENTRY *qglGetVertexAttribiv)(GLuint index, GLenum pname, GLint *param void (GLAPIENTRY *qglGetVertexAttribPointerv)(GLuint index, GLenum pname, GLvoid **pointer); //GL_ARB_vertex_buffer_object -void (GLAPIENTRY *qglBindBufferARB) (GLenum target, GLuint buffer); -void (GLAPIENTRY *qglDeleteBuffersARB) (GLsizei n, const GLuint *buffers); -void (GLAPIENTRY *qglGenBuffersARB) (GLsizei n, GLuint *buffers); -GLboolean (GLAPIENTRY *qglIsBufferARB) (GLuint buffer); -GLvoid* (GLAPIENTRY *qglMapBufferARB) (GLenum target, GLenum access); -GLboolean (GLAPIENTRY *qglUnmapBufferARB) (GLenum target); -void (GLAPIENTRY *qglBufferDataARB) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); -void (GLAPIENTRY *qglBufferSubDataARB) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); +void (GLAPIENTRY *qglBindBuffer) (GLenum target, GLuint buffer); +void (GLAPIENTRY *qglDeleteBuffers) (GLsizei n, const GLuint *buffers); +void (GLAPIENTRY *qglGenBuffers) (GLsizei n, GLuint *buffers); +GLboolean (GLAPIENTRY *qglIsBuffer) (GLuint buffer); +GLvoid* (GLAPIENTRY *qglMapBuffer) (GLenum target, GLenum access); +GLboolean (GLAPIENTRY *qglUnmapBuffer) (GLenum target); +void (GLAPIENTRY *qglBufferData) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); +void (GLAPIENTRY *qglBufferSubData) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); //GL_ARB_framebuffer_object GLboolean (GLAPIENTRY *qglIsRenderbuffer)(GLuint renderbuffer); @@ -613,11 +520,11 @@ qboolean GL_CheckExtension(const char *minglver_or_ext, const dllfunction_t *fun } #ifndef USE_GLES2 -static dllfunction_t opengl110funcs[] = +// functions we require from the driver - some of these are OpenGL 2.0, some are a bit newer +static dllfunction_t openglfuncs[] = { {"glClearColor", (void **) &qglClearColor}, {"glClear", (void **) &qglClear}, - {"glAlphaFunc", (void **) &qglAlphaFunc}, {"glBlendFunc", (void **) &qglBlendFunc}, {"glCullFace", (void **) &qglCullFace}, {"glDrawBuffer", (void **) &qglDrawBuffer}, @@ -625,8 +532,6 @@ static dllfunction_t opengl110funcs[] = {"glEnable", (void **) &qglEnable}, {"glDisable", (void **) &qglDisable}, {"glIsEnabled", (void **) &qglIsEnabled}, - {"glEnableClientState", (void **) &qglEnableClientState}, - {"glDisableClientState", (void **) &qglDisableClientState}, {"glGetBooleanv", (void **) &qglGetBooleanv}, {"glGetDoublev", (void **) &qglGetDoublev}, {"glGetFloatv", (void **) &qglGetFloatv}, @@ -642,51 +547,13 @@ static dllfunction_t opengl110funcs[] = {"glDrawElements", (void **) &qglDrawElements}, {"glDrawArrays", (void **) &qglDrawArrays}, {"glColorMask", (void **) &qglColorMask}, - {"glVertexPointer", (void **) &qglVertexPointer}, - {"glNormalPointer", (void **) &qglNormalPointer}, - {"glColorPointer", (void **) &qglColorPointer}, - {"glTexCoordPointer", (void **) &qglTexCoordPointer}, - {"glArrayElement", (void **) &qglArrayElement}, - {"glColor4ub", (void **) &qglColor4ub}, - {"glColor4f", (void **) &qglColor4f}, - {"glTexCoord1f", (void **) &qglTexCoord1f}, - {"glTexCoord2f", (void **) &qglTexCoord2f}, - {"glTexCoord3f", (void **) &qglTexCoord3f}, - {"glTexCoord4f", (void **) &qglTexCoord4f}, - {"glVertex2f", (void **) &qglVertex2f}, - {"glVertex3f", (void **) &qglVertex3f}, - {"glVertex4f", (void **) &qglVertex4f}, - {"glBegin", (void **) &qglBegin}, - {"glEnd", (void **) &qglEnd}, -//[515]: added on 29.07.2005 - {"glLineWidth", (void**) &qglLineWidth}, {"glPointSize", (void**) &qglPointSize}, -// - {"glMatrixMode", (void **) &qglMatrixMode}, -// {"glOrtho", (void **) &qglOrtho}, -// {"glFrustum", (void **) &qglFrustum}, {"glViewport", (void **) &qglViewport}, -// {"glPushMatrix", (void **) &qglPushMatrix}, -// {"glPopMatrix", (void **) &qglPopMatrix}, - {"glLoadIdentity", (void **) &qglLoadIdentity}, -// {"glLoadMatrixd", (void **) &qglLoadMatrixd}, - {"glLoadMatrixf", (void **) &qglLoadMatrixf}, -// {"glMultMatrixd", (void **) &qglMultMatrixd}, -// {"glMultMatrixf", (void **) &qglMultMatrixf}, -// {"glRotated", (void **) &qglRotated}, -// {"glRotatef", (void **) &qglRotatef}, -// {"glScaled", (void **) &qglScaled}, -// {"glScalef", (void **) &qglScalef}, -// {"glTranslated", (void **) &qglTranslated}, -// {"glTranslatef", (void **) &qglTranslatef}, {"glReadPixels", (void **) &qglReadPixels}, {"glStencilFunc", (void **) &qglStencilFunc}, {"glStencilMask", (void **) &qglStencilMask}, {"glStencilOp", (void **) &qglStencilOp}, {"glClearStencil", (void **) &qglClearStencil}, - {"glTexEnvf", (void **) &qglTexEnvf}, - {"glTexEnvfv", (void **) &qglTexEnvfv}, - {"glTexEnvi", (void **) &qglTexEnvi}, {"glTexParameterf", (void **) &qglTexParameterf}, {"glTexParameterfv", (void **) &qglTexParameterfv}, {"glTexParameteri", (void **) &qglTexParameteri}, @@ -696,93 +563,23 @@ static dllfunction_t opengl110funcs[] = {"glGetTexLevelParameterfv", (void **) &qglGetTexLevelParameterfv}, {"glGetTexLevelParameteriv", (void **) &qglGetTexLevelParameteriv}, {"glHint", (void **) &qglHint}, -// {"glPixelStoref", (void **) &qglPixelStoref}, {"glPixelStorei", (void **) &qglPixelStorei}, {"glGenTextures", (void **) &qglGenTextures}, {"glDeleteTextures", (void **) &qglDeleteTextures}, {"glBindTexture", (void **) &qglBindTexture}, -// {"glPrioritizeTextures", (void **) &qglPrioritizeTextures}, -// {"glAreTexturesResident", (void **) &qglAreTexturesResident}, -// {"glIsTexture", (void **) &qglIsTexture}, -// {"glTexImage1D", (void **) &qglTexImage1D}, {"glTexImage2D", (void **) &qglTexImage2D}, -// {"glTexSubImage1D", (void **) &qglTexSubImage1D}, {"glTexSubImage2D", (void **) &qglTexSubImage2D}, -// {"glCopyTexImage1D", (void **) &qglCopyTexImage1D}, {"glCopyTexImage2D", (void **) &qglCopyTexImage2D}, -// {"glCopyTexSubImage1D", (void **) &qglCopyTexSubImage1D}, {"glCopyTexSubImage2D", (void **) &qglCopyTexSubImage2D}, {"glScissor", (void **) &qglScissor}, {"glPolygonOffset", (void **) &qglPolygonOffset}, {"glPolygonMode", (void **) &qglPolygonMode}, - {"glPolygonStipple", (void **) &qglPolygonStipple}, -// {"glClipPlane", (void **) &qglClipPlane}, -// {"glGetClipPlane", (void **) &qglGetClipPlane}, - {NULL, NULL} -}; - -static dllfunction_t drawrangeelementsfuncs[] = -{ - {"glDrawRangeElements", (void **) &qglDrawRangeElements}, - {NULL, NULL} -}; - -static dllfunction_t drawrangeelementsextfuncs[] = -{ - {"glDrawRangeElementsEXT", (void **) &qglDrawRangeElementsEXT}, - {NULL, NULL} -}; - -static dllfunction_t multitexturefuncs[] = -{ - {"glMultiTexCoord1fARB", (void **) &qglMultiTexCoord1f}, - {"glMultiTexCoord2fARB", (void **) &qglMultiTexCoord2f}, - {"glMultiTexCoord3fARB", (void **) &qglMultiTexCoord3f}, - {"glMultiTexCoord4fARB", (void **) &qglMultiTexCoord4f}, - {"glActiveTextureARB", (void **) &qglActiveTexture}, - {"glClientActiveTextureARB", (void **) &qglClientActiveTexture}, - {NULL, NULL} -}; - -static dllfunction_t texture3dextfuncs[] = -{ - {"glTexImage3DEXT", (void **) &qglTexImage3D}, - {"glTexSubImage3DEXT", (void **) &qglTexSubImage3D}, - {"glCopyTexSubImage3DEXT", (void **) &qglCopyTexSubImage3D}, - {NULL, NULL} -}; - -static dllfunction_t atiseparatestencilfuncs[] = -{ - {"glStencilOpSeparateATI", (void **) &qglStencilOpSeparate}, - {"glStencilFuncSeparateATI", (void **) &qglStencilFuncSeparate}, - {NULL, NULL} -}; - -static dllfunction_t gl2separatestencilfuncs[] = -{ - {"glStencilOpSeparate", (void **) &qglStencilOpSeparate}, - {"glStencilFuncSeparate", (void **) &qglStencilFuncSeparate}, - {NULL, NULL} -}; - -static dllfunction_t stenciltwosidefuncs[] = -{ - {"glActiveStencilFaceEXT", (void **) &qglActiveStencilFaceEXT}, - {NULL, NULL} -}; - -static dllfunction_t blendequationfuncs[] = -{ - {"glBlendEquationEXT", (void **) &qglBlendEquationEXT}, - {NULL, NULL} -}; - -static dllfunction_t gl20shaderfuncs[] = -{ + {"glActiveTexture", (void **) &qglActiveTexture}, + {"glTexImage3D", (void **) &qglTexImage3D}, + {"glTexSubImage3D", (void **) &qglTexSubImage3D}, + {"glCopyTexSubImage3D", (void **) &qglCopyTexSubImage3D}, {"glDeleteShader", (void **) &qglDeleteShader}, {"glDeleteProgram", (void **) &qglDeleteProgram}, -// {"glGetHandle", (void **) &qglGetHandle}, {"glDetachShader", (void **) &qglDetachShader}, {"glCreateShader", (void **) &qglCreateShader}, {"glShaderSource", (void **) &qglShaderSource}, @@ -867,51 +664,20 @@ static dllfunction_t gl20shaderfuncs[] = {"glGetVertexAttribfv", (void **) &qglGetVertexAttribfv}, {"glGetVertexAttribiv", (void **) &qglGetVertexAttribiv}, {"glGetVertexAttribPointerv", (void **) &qglGetVertexAttribPointerv}, - {NULL, NULL} -}; - -static dllfunction_t glsl130funcs[] = -{ - {"glBindFragDataLocation", (void **) &qglBindFragDataLocation}, - {NULL, NULL} -}; - -static dllfunction_t vbofuncs[] = -{ - {"glBindBufferARB" , (void **) &qglBindBufferARB}, - {"glDeleteBuffersARB" , (void **) &qglDeleteBuffersARB}, - {"glGenBuffersARB" , (void **) &qglGenBuffersARB}, - {"glIsBufferARB" , (void **) &qglIsBufferARB}, - {"glMapBufferARB" , (void **) &qglMapBufferARB}, - {"glUnmapBufferARB" , (void **) &qglUnmapBufferARB}, - {"glBufferDataARB" , (void **) &qglBufferDataARB}, - {"glBufferSubDataARB" , (void **) &qglBufferSubDataARB}, - {NULL, NULL} -}; - -static dllfunction_t ubofuncs[] = -{ - {"glGetUniformIndices" , (void **) &qglGetUniformIndices}, - {"glGetActiveUniformsiv" , (void **) &qglGetActiveUniformsiv}, - {"glGetActiveUniformName" , (void **) &qglGetActiveUniformName}, - {"glGetUniformBlockIndex" , (void **) &qglGetUniformBlockIndex}, - {"glGetActiveUniformBlockiv" , (void **) &qglGetActiveUniformBlockiv}, - {"glGetActiveUniformBlockName", (void **) &qglGetActiveUniformBlockName}, - {"glBindBufferRange" , (void **) &qglBindBufferRange}, - {"glBindBufferBase" , (void **) &qglBindBufferBase}, - {"glGetIntegeri_v" , (void **) &qglGetIntegeri_v}, - {"glUniformBlockBinding" , (void **) &qglUniformBlockBinding}, - {NULL, NULL} -}; - -static dllfunction_t arbfbofuncs[] = -{ + {"glBindBuffer" , (void **) &qglBindBuffer}, + {"glDeleteBuffers" , (void **) &qglDeleteBuffers}, + {"glGenBuffers" , (void **) &qglGenBuffers}, + {"glIsBuffer" , (void **) &qglIsBuffer}, + {"glMapBuffer" , (void **) &qglMapBuffer}, + {"glUnmapBuffer" , (void **) &qglUnmapBuffer}, + {"glBufferData" , (void **) &qglBufferData}, + {"glBufferSubData" , (void **) &qglBufferSubData}, {"glIsRenderbuffer" , (void **) &qglIsRenderbuffer}, {"glBindRenderbuffer" , (void **) &qglBindRenderbuffer}, {"glDeleteRenderbuffers" , (void **) &qglDeleteRenderbuffers}, {"glGenRenderbuffers" , (void **) &qglGenRenderbuffers}, {"glRenderbufferStorage" , (void **) &qglRenderbufferStorage}, - {"glRenderbufferStorageMultisample" , (void **) &qglRenderbufferStorageMultisample}, // not in GL_EXT_framebuffer_object + {"glRenderbufferStorageMultisample" , (void **) &qglRenderbufferStorageMultisample}, {"glGetRenderbufferParameteriv" , (void **) &qglGetRenderbufferParameteriv}, {"glIsFramebuffer" , (void **) &qglIsFramebuffer}, {"glBindFramebuffer" , (void **) &qglBindFramebuffer}, @@ -921,33 +687,33 @@ static dllfunction_t arbfbofuncs[] = {"glFramebufferTexture1D" , (void **) &qglFramebufferTexture1D}, {"glFramebufferTexture2D" , (void **) &qglFramebufferTexture2D}, {"glFramebufferTexture3D" , (void **) &qglFramebufferTexture3D}, - {"glFramebufferTextureLayer" , (void **) &qglFramebufferTextureLayer}, // not in GL_EXT_framebuffer_object + {"glFramebufferTextureLayer" , (void **) &qglFramebufferTextureLayer}, {"glFramebufferRenderbuffer" , (void **) &qglFramebufferRenderbuffer}, {"glGetFramebufferAttachmentParameteriv" , (void **) &qglGetFramebufferAttachmentParameteriv}, - {"glBlitFramebuffer" , (void **) &qglBlitFramebuffer}, // not in GL_EXT_framebuffer_object + {"glBlitFramebuffer" , (void **) &qglBlitFramebuffer}, {"glGenerateMipmap" , (void **) &qglGenerateMipmap}, + {"glGetUniformIndices" , (void **) &qglGetUniformIndices}, + {"glGetActiveUniformsiv" , (void **) &qglGetActiveUniformsiv}, + {"glGetActiveUniformName" , (void **) &qglGetActiveUniformName}, + {"glGetUniformBlockIndex" , (void **) &qglGetUniformBlockIndex}, + {"glGetActiveUniformBlockiv" , (void **) &qglGetActiveUniformBlockiv}, + {"glGetActiveUniformBlockName", (void **) &qglGetActiveUniformBlockName}, + {"glBindBufferRange" , (void **) &qglBindBufferRange}, + {"glBindBufferBase" , (void **) &qglBindBufferBase}, + {"glGetIntegeri_v" , (void **) &qglGetIntegeri_v}, + {"glUniformBlockBinding" , (void **) &qglUniformBlockBinding}, {NULL, NULL} }; -static dllfunction_t extfbofuncs[] = +static dllfunction_t blendequationfuncs[] = { - {"glIsRenderbufferEXT" , (void **) &qglIsRenderbuffer}, - {"glBindRenderbufferEXT" , (void **) &qglBindRenderbuffer}, - {"glDeleteRenderbuffersEXT" , (void **) &qglDeleteRenderbuffers}, - {"glGenRenderbuffersEXT" , (void **) &qglGenRenderbuffers}, - {"glRenderbufferStorageEXT" , (void **) &qglRenderbufferStorage}, - {"glGetRenderbufferParameterivEXT" , (void **) &qglGetRenderbufferParameteriv}, - {"glIsFramebufferEXT" , (void **) &qglIsFramebuffer}, - {"glBindFramebufferEXT" , (void **) &qglBindFramebuffer}, - {"glDeleteFramebuffersEXT" , (void **) &qglDeleteFramebuffers}, - {"glGenFramebuffersEXT" , (void **) &qglGenFramebuffers}, - {"glCheckFramebufferStatusEXT" , (void **) &qglCheckFramebufferStatus}, - {"glFramebufferTexture1DEXT" , (void **) &qglFramebufferTexture1D}, - {"glFramebufferTexture2DEXT" , (void **) &qglFramebufferTexture2D}, - {"glFramebufferTexture3DEXT" , (void **) &qglFramebufferTexture3D}, - {"glFramebufferRenderbufferEXT" , (void **) &qglFramebufferRenderbuffer}, - {"glGetFramebufferAttachmentParameterivEXT" , (void **) &qglGetFramebufferAttachmentParameteriv}, - {"glGenerateMipmapEXT" , (void **) &qglGenerateMipmap}, + {"glBlendEquationEXT", (void **) &qglBlendEquationEXT}, + {NULL, NULL} +}; + +static dllfunction_t glsl130funcs[] = +{ + {"glBindFragDataLocation", (void **) &qglBindFragDataLocation}, {NULL, NULL} }; @@ -955,10 +721,8 @@ static dllfunction_t texturecompressionfuncs[] = { {"glCompressedTexImage3DARB", (void **) &qglCompressedTexImage3DARB}, {"glCompressedTexImage2DARB", (void **) &qglCompressedTexImage2DARB}, -// {"glCompressedTexImage1DARB", (void **) &qglCompressedTexImage1DARB}, {"glCompressedTexSubImage3DARB", (void **) &qglCompressedTexSubImage3DARB}, {"glCompressedTexSubImage2DARB", (void **) &qglCompressedTexSubImage2DARB}, -// {"glCompressedTexSubImage1DARB", (void **) &qglCompressedTexSubImage1DARB}, {"glGetCompressedTexImageARB", (void **) &qglGetCompressedTexImageARB}, {NULL, NULL} }; @@ -1003,11 +767,9 @@ void VID_ClearExtensions(void) // clear the extension flags memset(&vid.support, 0, sizeof(vid.support)); - vid.renderpath = RENDERPATH_GL11; + vid.renderpath = RENDERPATH_GL20; vid.sRGBcapable2D = false; vid.sRGBcapable3D = false; - vid.useinterleavedarrays = false; - vid.forcevbo = false; vid.maxtexturesize_2d = 0; vid.maxtexturesize_3d = 0; vid.maxtexturesize_cubemap = 0; @@ -1019,11 +781,8 @@ void VID_ClearExtensions(void) #ifndef USE_GLES2 // this is a complete list of all functions that are directly checked in the renderer - qglDrawRangeElements = NULL; qglDrawBuffer = NULL; - qglPolygonStipple = NULL; qglFlush = NULL; - qglActiveTexture = NULL; qglGetCompressedTexImageARB = NULL; qglFramebufferTexture2D = NULL; qglDrawBuffersARB = NULL; @@ -1033,66 +792,40 @@ void VID_ClearExtensions(void) #ifndef USE_GLES2 void VID_CheckExtensions(void) { - if (!GL_CheckExtension("glbase", opengl110funcs, NULL, false)) - Sys_Error("OpenGL 1.1.0 functions not found"); - vid.support.gl20shaders = GL_CheckExtension("2.0", gl20shaderfuncs, "-noshaders", true); + char *s; + if (!GL_CheckExtension("glbase", openglfuncs, NULL, false)) + Sys_Error("OpenGL driver/hardware lacks required features"); CHECKGLERROR Con_DPrint("Checking OpenGL extensions...\n"); - if (vid.support.gl20shaders) - { - char *s; - // detect what GLSL version is available, to enable features like r_glsl_skeletal and higher quality reliefmapping + // detect what GLSL version is available, to enable features like r_glsl_skeletal and higher quality reliefmapping + vid.support.glshaderversion = 100; + s = (char *) qglGetString(GL_SHADING_LANGUAGE_VERSION); + if (s) + vid.support.glshaderversion = (int)(atof(s) * 100.0f + 0.5f); + if (vid.support.glshaderversion < 100) vid.support.glshaderversion = 100; - s = (char *) qglGetString(GL_SHADING_LANGUAGE_VERSION); - if (s) - vid.support.glshaderversion = (int)(atof(s) * 100.0f + 0.5f); - if (vid.support.glshaderversion < 100) - vid.support.glshaderversion = 100; - Con_DPrintf("Detected GLSL #version %i\n", vid.support.glshaderversion); - // get the glBindFragDataLocation function - if (vid.support.glshaderversion >= 130) - vid.support.gl20shaders130 = GL_CheckExtension("glshaders130", glsl130funcs, "-noglsl130", true); - } + Con_DPrintf("Detected GLSL #version %i\n", vid.support.glshaderversion); + // get the glBindFragDataLocation function + if (vid.support.glshaderversion >= 130) + vid.support.gl20shaders130 = GL_CheckExtension("glshaders130", glsl130funcs, "-noglsl130", true); // GL drivers generally prefer GL_BGRA vid.forcetextype = GL_BGRA; vid.support.amd_texture_texture4 = GL_CheckExtension("GL_AMD_texture_texture4", NULL, "-notexture4", false); - vid.support.arb_depth_texture = GL_CheckExtension("GL_ARB_depth_texture", NULL, "-nodepthtexture", false); vid.support.arb_draw_buffers = GL_CheckExtension("GL_ARB_draw_buffers", drawbuffersfuncs, "-nodrawbuffers", false); - vid.support.arb_multitexture = GL_CheckExtension("GL_ARB_multitexture", multitexturefuncs, "-nomtex", false); vid.support.arb_occlusion_query = GL_CheckExtension("GL_ARB_occlusion_query", occlusionqueryfuncs, "-noocclusionquery", false); vid.support.arb_query_buffer_object = GL_CheckExtension("GL_ARB_query_buffer_object", NULL, "-noquerybuffer", true); - vid.support.arb_shadow = GL_CheckExtension("GL_ARB_shadow", NULL, "-noshadow", false); vid.support.arb_texture_compression = GL_CheckExtension("GL_ARB_texture_compression", texturecompressionfuncs, "-notexturecompression", false); - vid.support.arb_texture_cube_map = GL_CheckExtension("GL_ARB_texture_cube_map", NULL, "-nocubemap", false); - vid.support.arb_texture_env_combine = GL_CheckExtension("GL_ARB_texture_env_combine", NULL, "-nocombine", false) || GL_CheckExtension("GL_EXT_texture_env_combine", NULL, "-nocombine", false); vid.support.arb_texture_gather = GL_CheckExtension("GL_ARB_texture_gather", NULL, "-notexturegather", false); -#ifndef __APPLE__ - // LordHavoc: too many bugs on OSX! - vid.support.arb_texture_non_power_of_two = GL_CheckExtension("GL_ARB_texture_non_power_of_two", NULL, "-notexturenonpoweroftwo", false); -#endif - vid.support.arb_vertex_buffer_object = GL_CheckExtension("GL_ARB_vertex_buffer_object", vbofuncs, "-novbo", false); - vid.support.arb_uniform_buffer_object = GL_CheckExtension("GL_ARB_uniform_buffer_object", ubofuncs, "-noubo", false); - vid.support.ati_separate_stencil = GL_CheckExtension("separatestencil", gl2separatestencilfuncs, "-noseparatestencil", true) || GL_CheckExtension("GL_ATI_separate_stencil", atiseparatestencilfuncs, "-noseparatestencil", false); vid.support.ext_blend_minmax = GL_CheckExtension("GL_EXT_blend_minmax", blendequationfuncs, "-noblendminmax", false); vid.support.ext_blend_subtract = GL_CheckExtension("GL_EXT_blend_subtract", blendequationfuncs, "-noblendsubtract", false); vid.support.ext_blend_func_separate = GL_CheckExtension("GL_EXT_blend_func_separate", blendfuncseparatefuncs, "-noblendfuncseparate", false); - vid.support.ext_draw_range_elements = GL_CheckExtension("drawrangeelements", drawrangeelementsfuncs, "-nodrawrangeelements", true) || GL_CheckExtension("GL_EXT_draw_range_elements", drawrangeelementsextfuncs, "-nodrawrangeelements", false); - vid.support.arb_framebuffer_object = GL_CheckExtension("GL_ARB_framebuffer_object", arbfbofuncs, "-nofbo", false); - if (vid.support.arb_framebuffer_object) - vid.support.ext_framebuffer_object = true; - else - vid.support.ext_framebuffer_object = GL_CheckExtension("GL_EXT_framebuffer_object", extfbofuncs, "-nofbo", false); - vid.support.ext_packed_depth_stencil = GL_CheckExtension("GL_EXT_packed_depth_stencil", NULL, "-nopackeddepthstencil", false); - vid.support.ext_stencil_two_side = GL_CheckExtension("GL_EXT_stencil_two_side", stenciltwosidefuncs, "-nostenciltwoside", false); - vid.support.ext_texture_3d = GL_CheckExtension("GL_EXT_texture3D", texture3dextfuncs, "-notexture3d", false); vid.support.ext_texture_compression_s3tc = GL_CheckExtension("GL_EXT_texture_compression_s3tc", NULL, "-nos3tc", false); - vid.support.ext_texture_edge_clamp = GL_CheckExtension("GL_EXT_texture_edge_clamp", NULL, "-noedgeclamp", false) || GL_CheckExtension("GL_SGIS_texture_edge_clamp", NULL, "-noedgeclamp", false); vid.support.ext_texture_filter_anisotropic = GL_CheckExtension("GL_EXT_texture_filter_anisotropic", NULL, "-noanisotropy", false); vid.support.ext_texture_srgb = GL_CheckExtension("GL_EXT_texture_sRGB", NULL, "-nosrgb", false); vid.support.arb_texture_float = GL_CheckExtension("GL_ARB_texture_float", NULL, "-notexturefloat", false); @@ -1116,9 +849,7 @@ void VID_CheckExtensions(void) // COMMANDLINEOPTION: GL: -noocclusionquery disables GL_ARB_occlusion_query (which allows coronas to fade according to visibility, and potentially used for rendering optimizations) // COMMANDLINEOPTION: GL: -noquerybuffer disables GL_ARB_query_buffer_object (which allows corona fading without synchronous rendering) // COMMANDLINEOPTION: GL: -nos3tc disables GL_EXT_texture_compression_s3tc (which allows use of .dds texture caching) -// COMMANDLINEOPTION: GL: -noseparatestencil disables use of OpenGL2.0 glStencilOpSeparate and GL_ATI_separate_stencil extensions (which accelerate shadow rendering) // COMMANDLINEOPTION: GL: -noshadow disables use of GL_ARB_shadow (required for hardware shadowmap filtering) -// COMMANDLINEOPTION: GL: -nostenciltwoside disables GL_EXT_stencil_two_side (which accelerate shadow rendering) // COMMANDLINEOPTION: GL: -notexture3d disables GL_EXT_texture3D (required for spherical lights, otherwise they render as a column) // COMMANDLINEOPTION: GL: -notexture4 disables GL_AMD_texture_texture4 (which provides fetch4 sampling) // COMMANDLINEOPTION: GL: -notexturecompression disables GL_ARB_texture_compression (which saves video memory if it is supported, but can also degrade image quality, see gl_texturecompression cvar documentation for more information) @@ -1131,78 +862,25 @@ void VID_CheckExtensions(void) if (vid.support.arb_draw_buffers) qglGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, (GLint*)&vid.maxdrawbuffers); - // disable non-power-of-two textures on Radeon X1600 and other cards that do not accelerate it with some filtering modes / repeat modes that we use - // we detect these cards by checking if the hardware supports vertex texture fetch (Geforce6 does, Radeon X1600 does not, all GL3-class hardware does) - if(vid.support.arb_texture_non_power_of_two && vid.support.gl20shaders) - { - int val = 0; - qglGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &val);CHECKGLERROR - if (val < 1) - vid.support.arb_texture_non_power_of_two = false; - } - - // we don't care if it's an extension or not, they are identical functions, so keep it simple in the rendering code - if (qglDrawRangeElements == NULL) - qglDrawRangeElements = qglDrawRangeElementsEXT; - qglGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint*)&vid.maxtexturesize_2d); - if (vid.support.ext_texture_filter_anisotropic) - qglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, (GLint*)&vid.max_anisotropy); - if (vid.support.arb_texture_cube_map) - qglGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE, (GLint*)&vid.maxtexturesize_cubemap); - if (vid.support.ext_texture_3d) - qglGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, (GLint*)&vid.maxtexturesize_3d); - - // verify that 3d textures are really supported - if (vid.support.ext_texture_3d && vid.maxtexturesize_3d < 32) - { - vid.support.ext_texture_3d = false; - Con_Printf("GL_EXT_texture3D reported bogus GL_MAX_3D_TEXTURE_SIZE, disabled\n"); - } + qglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, (GLint*)&vid.max_anisotropy); + qglGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE, (GLint*)&vid.maxtexturesize_cubemap); + qglGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, (GLint*)&vid.maxtexturesize_3d); vid.texunits = vid.teximageunits = vid.texarrayunits = 1; - if (vid.support.arb_multitexture) - qglGetIntegerv(GL_MAX_TEXTURE_UNITS, (GLint*)&vid.texunits); - if (vid_gl20.integer && vid.support.gl20shaders) - { - qglGetIntegerv(GL_MAX_TEXTURE_UNITS, (GLint*)&vid.texunits); - qglGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, (int *)&vid.teximageunits);CHECKGLERROR - qglGetIntegerv(GL_MAX_TEXTURE_COORDS, (int *)&vid.texarrayunits);CHECKGLERROR - vid.texunits = bound(4, vid.texunits, MAX_TEXTUREUNITS); - vid.teximageunits = bound(16, vid.teximageunits, MAX_TEXTUREUNITS); - vid.texarrayunits = bound(8, vid.texarrayunits, MAX_TEXTUREUNITS); - Con_DPrintf("Using GL2.0 rendering path - %i texture matrix, %i texture images, %i texcoords%s\n", vid.texunits, vid.teximageunits, vid.texarrayunits, vid.support.ext_framebuffer_object ? ", shadowmapping supported" : ""); - vid.renderpath = RENDERPATH_GL20; - vid.sRGBcapable2D = false; - vid.sRGBcapable3D = true; - vid.useinterleavedarrays = false; - Con_Printf("vid.support.arb_multisample %i\n", vid.support.arb_multisample); - Con_Printf("vid.support.gl20shaders %i\n", vid.support.gl20shaders); - vid.allowalphatocoverage = true; // but see below, it may get turned to false again if GL_SAMPLES_ARB is <= 1 - } - else if (vid.support.arb_texture_env_combine && vid.texunits >= 2 && vid_gl13.integer) - { - qglGetIntegerv(GL_MAX_TEXTURE_UNITS, (GLint*)&vid.texunits); - vid.texunits = bound(1, vid.texunits, MAX_TEXTUREUNITS); - vid.teximageunits = vid.texunits; - vid.texarrayunits = vid.texunits; - Con_DPrintf("Using GL1.3 rendering path - %i texture units, single pass rendering\n", vid.texunits); - vid.renderpath = RENDERPATH_GL13; - vid.sRGBcapable2D = false; - vid.sRGBcapable3D = false; - vid.useinterleavedarrays = false; - } - else - { - vid.texunits = bound(1, vid.texunits, MAX_TEXTUREUNITS); - vid.teximageunits = vid.texunits; - vid.texarrayunits = vid.texunits; - Con_DPrintf("Using GL1.1 rendering path - %i texture units, two pass rendering\n", vid.texunits); - vid.renderpath = RENDERPATH_GL11; - vid.sRGBcapable2D = false; - vid.sRGBcapable3D = false; - vid.useinterleavedarrays = false; - } + qglGetIntegerv(GL_MAX_TEXTURE_UNITS, (GLint*)&vid.texunits); + qglGetIntegerv(GL_MAX_TEXTURE_UNITS, (GLint*)&vid.texunits); + qglGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, (int *)&vid.teximageunits);CHECKGLERROR + qglGetIntegerv(GL_MAX_TEXTURE_COORDS, (int *)&vid.texarrayunits);CHECKGLERROR + vid.texunits = bound(4, vid.texunits, MAX_TEXTUREUNITS); + vid.teximageunits = bound(16, vid.teximageunits, MAX_TEXTUREUNITS); + vid.texarrayunits = bound(8, vid.texarrayunits, MAX_TEXTUREUNITS); + Con_DPrint("Using GL2+extensions rendering path\n"); + vid.renderpath = RENDERPATH_GL20; + vid.sRGBcapable2D = false; + vid.sRGBcapable3D = true; + Con_DPrintf("vid.support.arb_multisample %i\n", vid.support.arb_multisample); + vid.allowalphatocoverage = true; // but see below, it may get turned to false again if GL_SAMPLES_ARB is <= 1 // enable multisample antialiasing if possible if(vid.support.arb_multisample) @@ -1474,7 +1152,7 @@ static void Force_CenterView_f (void) static int gamma_forcenextframe = false; static float cachegamma, cachebrightness, cachecontrast, cacheblack[3], cachegrey[3], cachewhite[3], cachecontrastboost; -static int cachecolorenable, cachehwgamma; +static int cachecolorenable; void VID_ApplyGammaToColor(const float *rgb, float *out) { @@ -1518,6 +1196,8 @@ void VID_BuildGammaTables(unsigned short *ramps, int rampsize) // LordHavoc: this code came from Ben Winslow and Zinx Verituse, I have // immensely butchered it to work with variable framerates and fit in with // the rest of darkplaces. + // + // R.I.P. zinx http://obits.al.com/obituaries/birmingham/obituary.aspx?n=christopher-robert-lais&pid=186080667 if (v_psycho.integer) { int x, y; @@ -1555,36 +1235,12 @@ void VID_BuildGammaTables(unsigned short *ramps, int rampsize) } } -void VID_UpdateGamma(qboolean force, int rampsize) +void VID_UpdateGamma(void) { cvar_t *c; float f; - int wantgamma; qboolean gamma_changed = false; - // LordHavoc: don't mess with gamma tables if running dedicated - if (cls.state == ca_dedicated) - return; - - wantgamma = v_hwgamma.integer; - switch(vid.renderpath) - { - case RENDERPATH_GL20: - case RENDERPATH_D3D9: - case RENDERPATH_D3D10: - case RENDERPATH_D3D11: - case RENDERPATH_SOFT: - case RENDERPATH_GLES2: - if (v_glslgamma.integer) - wantgamma = 0; - break; - case RENDERPATH_GL11: - case RENDERPATH_GL13: - case RENDERPATH_GLES1: - break; - } - if(!vid_activewindow) - wantgamma = 0; #define BOUNDCVAR(cvar, m1, m2) c = &(cvar);f = bound(m1, c->value, m2);if (c->value != f) Cvar_SetValueQuick(c, f); BOUNDCVAR(v_gamma, 0.1, 5); BOUNDCVAR(v_contrast, 0.2, 5); @@ -1630,6 +1286,7 @@ void VID_UpdateGamma(qboolean force, int rampsize) } } + // if any gamma settings were changed, bump vid_gammatables_serial so we regenerate the gamma ramp texture #define GAMMACHECK(cache, value) if (cache != (value)) gamma_changed = true;cache = (value) if(v_psycho.integer) gamma_changed = true; @@ -1650,64 +1307,7 @@ void VID_UpdateGamma(qboolean force, int rampsize) if(gamma_changed) ++vid_gammatables_serial; - - GAMMACHECK(cachehwgamma , wantgamma); #undef GAMMACHECK - - if (!force && !gamma_forcenextframe && !gamma_changed) - return; - - gamma_forcenextframe = false; - - if (cachehwgamma) - { - if (!vid_usinghwgamma) - { - vid_usinghwgamma = true; - if (vid_gammarampsize != rampsize || !vid_gammaramps) - { - vid_gammarampsize = rampsize; - if (vid_gammaramps) - Z_Free(vid_gammaramps); - vid_gammaramps = (unsigned short *)Z_Malloc(6 * vid_gammarampsize * sizeof(unsigned short)); - vid_systemgammaramps = vid_gammaramps + 3 * vid_gammarampsize; - } - VID_GetGamma(vid_systemgammaramps, vid_gammarampsize); - } - - VID_BuildGammaTables(vid_gammaramps, vid_gammarampsize); - - // set vid_hardwaregammasupported to true if VID_SetGamma succeeds, OR if vid_hwgamma is >= 2 (forced gamma - ignores driver return value) - Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_gammaramps, vid_gammarampsize) || cachehwgamma >= 2); - // if custom gamma ramps failed (Windows stupidity), restore to system gamma - if(!vid_hardwaregammasupported.integer) - { - if (vid_usinghwgamma) - { - vid_usinghwgamma = false; - VID_SetGamma(vid_systemgammaramps, vid_gammarampsize); - } - } - } - else - { - if (vid_usinghwgamma) - { - vid_usinghwgamma = false; - VID_SetGamma(vid_systemgammaramps, vid_gammarampsize); - } - } -} - -void VID_RestoreSystemGamma(void) -{ - if (vid_usinghwgamma) - { - vid_usinghwgamma = false; - Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_systemgammaramps, vid_gammarampsize)); - // force gamma situation to be reexamined next frame - gamma_forcenextframe = true; - } } #ifdef WIN32 @@ -1729,21 +1329,6 @@ static dllhandle_t xinputdll_dll = NULL; void VID_Shared_Init(void) { -#ifdef SSE_POSSIBLE - if (Sys_HaveSSE2()) - { - Con_Printf("DPSOFTRAST available (SSE2 instructions detected)\n"); - Cvar_RegisterVariable(&vid_soft); - Cvar_RegisterVariable(&vid_soft_threads); - Cvar_RegisterVariable(&vid_soft_interlace); - } - else - Con_Printf("DPSOFTRAST not available (SSE2 disabled or not detected)\n"); -#else - Con_Printf("DPSOFTRAST not available (SSE2 not compiled in)\n"); -#endif - - Cvar_RegisterVariable(&vid_hardwaregammasupported); Cvar_RegisterVariable(&gl_info_vendor); Cvar_RegisterVariable(&gl_info_renderer); Cvar_RegisterVariable(&gl_info_version); @@ -1766,8 +1351,6 @@ void VID_Shared_Init(void) Cvar_RegisterVariable(&v_color_white_g); Cvar_RegisterVariable(&v_color_white_b); - Cvar_RegisterVariable(&v_hwgamma); - Cvar_RegisterVariable(&v_glslgamma); Cvar_RegisterVariable(&v_glslgamma_2d); Cvar_RegisterVariable(&v_psycho); @@ -1794,8 +1377,6 @@ void VID_Shared_Init(void) Cvar_RegisterVariable(&vid_desktopfullscreen); Cvar_RegisterVariable(&vid_minwidth); Cvar_RegisterVariable(&vid_minheight); - Cvar_RegisterVariable(&vid_gl13); - Cvar_RegisterVariable(&vid_gl20); Cvar_RegisterVariable(&gl_finish); Cvar_RegisterVariable(&vid_sRGB); Cvar_RegisterVariable(&vid_sRGB_fallback); @@ -1889,8 +1470,6 @@ static int VID_Mode(int fullscreen, int width, int height, int bpp, float refres switch(vid.renderpath) { - case RENDERPATH_GL11: - case RENDERPATH_GL13: case RENDERPATH_GL20: #ifdef GL_STEREO { @@ -1900,6 +1479,7 @@ static int VID_Mode(int fullscreen, int width, int height, int bpp, float refres } #endif break; + case RENDERPATH_GLES2: default: vid.stereobuffer = false; break; @@ -1909,7 +1489,7 @@ static int VID_Mode(int fullscreen, int width, int height, int bpp, float refres (vid_sRGB_fallback.integer >= 3) // force fallback || (vid_sRGB_fallback.integer >= 2 && // fallback if framebuffer is 8bit - !(r_viewfbo.integer >= 2 && vid.support.ext_framebuffer_object && vid.support.arb_texture_non_power_of_two && vid.samples < 2)) + r_viewfbo.integer < 2) ) vid.sRGB2D = vid.sRGB3D = false; @@ -1941,6 +1521,7 @@ static int VID_Mode(int fullscreen, int width, int height, int bpp, float refres static void VID_OpenSystems(void) { + Key_ReleaseAll(); R_Modules_Start(); S_Startup(); } @@ -1949,6 +1530,7 @@ static void VID_CloseSystems(void) { S_Shutdown(); R_Modules_Shutdown(); + Key_ReleaseAll(); } qboolean vid_commandlinecheck = true; @@ -1989,7 +1571,7 @@ const char *vidfallbacks[][2] = {"vid_userefreshrate", "0"}, {"vid_width", "640"}, {"vid_height", "480"}, - {"vid_bitsperpixel", "16"}, + {"vid_bitsperpixel", "32"}, {NULL, NULL} }; @@ -2023,9 +1605,6 @@ void VID_Start(void) Cvar_SetValueQuick(&vid_width, width); if (height) Cvar_SetValueQuick(&vid_height, height); -// COMMANDLINEOPTION: Video: -bpp performs +vid_bitsperpixel (example -bpp 32 or -bpp 16) - if ((i = COM_CheckParm("-bpp")) != 0) - Cvar_SetQuick(&vid_bitsperpixel, com_argv[i+1]); // COMMANDLINEOPTION: Video: -density performs +vid_touchscreen_density (example -density 1 or -density 1.5) if ((i = COM_CheckParm("-density")) != 0) Cvar_SetQuick(&vid_touchscreen_density, com_argv[i+1]); @@ -2120,75 +1699,3 @@ size_t VID_SortModes(vid_mode_t *modes, size_t count, qboolean usebpp, qboolean } return count; } - -void VID_Soft_SharedSetup(void) -{ - gl_platform = "DPSOFTRAST"; - gl_platformextensions = ""; - - gl_renderer = "DarkPlaces-Soft"; - gl_vendor = "Forest Hale"; - gl_version = "0.0"; - gl_extensions = ""; - - // clear the extension flags - memset(&vid.support, 0, sizeof(vid.support)); - Cvar_SetQuick(&gl_info_extensions, ""); - - // DPSOFTRAST requires BGRA - vid.forcetextype = TEXTYPE_BGRA; - - vid.forcevbo = false; - vid.support.arb_depth_texture = true; - vid.support.arb_draw_buffers = true; - vid.support.arb_occlusion_query = true; - vid.support.arb_query_buffer_object = false; - vid.support.arb_shadow = true; - //vid.support.arb_texture_compression = true; - vid.support.arb_texture_cube_map = true; - vid.support.arb_texture_non_power_of_two = false; - vid.support.arb_vertex_buffer_object = true; - vid.support.ext_blend_subtract = true; - vid.support.ext_draw_range_elements = true; - vid.support.ext_framebuffer_object = true; - - vid.support.ext_texture_3d = true; - //vid.support.ext_texture_compression_s3tc = true; - vid.support.ext_texture_filter_anisotropic = true; - vid.support.ati_separate_stencil = true; - vid.support.ext_texture_srgb = false; - - vid.maxtexturesize_2d = 16384; - vid.maxtexturesize_3d = 512; - vid.maxtexturesize_cubemap = 16384; - vid.texunits = 4; - vid.teximageunits = 32; - vid.texarrayunits = 8; - vid.max_anisotropy = 1; - vid.maxdrawbuffers = 4; - - vid.texunits = bound(4, vid.texunits, MAX_TEXTUREUNITS); - vid.teximageunits = bound(16, vid.teximageunits, MAX_TEXTUREUNITS); - vid.texarrayunits = bound(8, vid.texarrayunits, MAX_TEXTUREUNITS); - Con_DPrintf("Using DarkPlaces Software Rasterizer rendering path\n"); - vid.renderpath = RENDERPATH_SOFT; - vid.sRGBcapable2D = false; - vid.sRGBcapable3D = false; - vid.useinterleavedarrays = false; - - Cvar_SetQuick(&gl_info_vendor, gl_vendor); - Cvar_SetQuick(&gl_info_renderer, gl_renderer); - Cvar_SetQuick(&gl_info_version, gl_version); - Cvar_SetQuick(&gl_info_platform, gl_platform ? gl_platform : ""); - Cvar_SetQuick(&gl_info_driver, gl_driver); - - // LordHavoc: report supported extensions -#ifdef CONFIG_MENU - Con_DPrintf("\nQuakeC extensions for server and client: %s\nQuakeC extensions for menu: %s\n", vm_sv_extensions, vm_m_extensions ); -#else - Con_DPrintf("\nQuakeC extensions for server and client: %s\n", vm_sv_extensions ); -#endif - - // clear to black (loading plaque will be seen over this) - GL_Clear(GL_COLOR_BUFFER_BIT, NULL, 1.0f, 128); -}