From 839106a2c57329317fd3e4fa0d178cedb1683eb7 Mon Sep 17 00:00:00 2001 From: svdijk Date: Sat, 2 Mar 2013 13:10:02 +0000 Subject: [PATCH] Simplify the Intel video hack, make the PowerVR hack do the same git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@831 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/gl_rmisc.c | 3 --- Quake/gl_vidsdl.c | 7 ++----- Quake/glquake.h | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Quake/gl_rmisc.c b/Quake/gl_rmisc.c index 5e46db3a..84e8f491 100644 --- a/Quake/gl_rmisc.c +++ b/Quake/gl_rmisc.c @@ -176,9 +176,6 @@ void R_Init (void) Sky_Init (); //johnfitz Fog_Init (); //johnfitz - - if (isIntelVideo) //intel video workarounds from Baker - Cvar_SetQuick (&gl_clear, "1"); } /* diff --git a/Quake/gl_vidsdl.c b/Quake/gl_vidsdl.c index 0deeb27d..78ebba5d 100644 --- a/Quake/gl_vidsdl.c +++ b/Quake/gl_vidsdl.c @@ -63,8 +63,6 @@ static SDL_Surface *draw_context; static qboolean vid_locked = false; //johnfitz static qboolean vid_changed = false; -static qboolean fullsbardraw = false; - static void VID_Menu_Init (void); //johnfitz static void VID_Menu_f (void); //johnfitz static void VID_MenuDraw (void); @@ -78,7 +76,6 @@ viddef_t vid; // global video state modestate_t modestate = MS_UNINIT; qboolean scr_skipupdate; -qboolean isIntelVideo = false; //johnfitz -- intel video workarounds from Baker qboolean gl_mtexable = false; qboolean gl_texture_env_combine = false; //johnfitz qboolean gl_texture_env_add = false; //johnfitz @@ -683,12 +680,12 @@ static void GL_Init (void) GL_CheckExtensions (); //johnfitz if (SDL_strncasecmp(gl_renderer,"PowerVR",7)==0) - fullsbardraw = true; + Cbuf_AddText ("gl_clear 1"); //johnfitz -- intel video workarounds from Baker if (!strcmp(gl_vendor, "Intel")) { Con_Printf ("Intel Display Adapter detected\n"); - isIntelVideo = true; + Cbuf_AddText ("gl_clear 1"); } //johnfitz } diff --git a/Quake/glquake.h b/Quake/glquake.h index bfa138d1..97818f4d 100644 --- a/Quake/glquake.h +++ b/Quake/glquake.h @@ -193,8 +193,6 @@ extern qboolean gl_texture_env_combine; extern qboolean gl_texture_env_add; // for GL_EXT_texture_env_add //johnfitz -extern qboolean isIntelVideo; //johnfitz -- intel video workarounds from Baker - //johnfitz -- rendering statistics extern int rs_brushpolys, rs_aliaspolys, rs_skypolys, rs_particles, rs_fogpolys; extern int rs_dynamiclightmaps, rs_brushpasses, rs_aliaspasses, rs_skypasses;