From 38748de8faf6c53b4d15f321b8b9a164c48a9349 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Tue, 25 Nov 2008 05:17:41 +0000 Subject: [PATCH] different s3 bug workaround git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3753 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/rendergl.cpp | 3 --- source/src/vertmodel.h | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp index b88bee4b..bcf46fa0 100644 --- a/source/src/rendergl.cpp +++ b/source/src/rendergl.cpp @@ -39,7 +39,6 @@ int glext(char *ext) COMMAND(glext, ARG_1EST); VAR(ati_mda_bug, 0, 0, 1); -VAR(s3_dlist_bug, 0, 0, 1); void gl_checkextensions() { @@ -50,8 +49,6 @@ void gl_checkextensions() conoutf("Renderer: %s (%s)", renderer, vendor); conoutf("Driver: %s", version); - if(strstr(vendor, "S3 Graphics")) s3_dlist_bug = 1; - if(strstr(exts, "GL_EXT_texture_env_combine") || strstr(exts, "GL_ARB_texture_env_combine")) hasTE = true; else conoutf("WARNING: cannot use overbright lighting, using old lighting model!"); diff --git a/source/src/vertmodel.h b/source/src/vertmodel.h index b0929045..0fbcd327 100644 --- a/source/src/vertmodel.h +++ b/source/src/vertmodel.h @@ -519,13 +519,12 @@ struct vertmodel : model return; } - extern int s3_dlist_bug; - bool builddlist = isstat && !owner->model->vertexlight && !s3_dlist_bug; + bool builddlist = isstat && !owner->model->vertexlight; if(builddlist) glNewList(statlist = glGenLists(1), GL_COMPILE); loopi(numdyndraws) { const drawcall &d = dyndraws[i]; - if(hasDRE) glDrawRangeElements_(d.type, d.minvert, d.maxvert, d.count, GL_UNSIGNED_SHORT, &dynidx[d.start]); + if(hasDRE && !builddlist) glDrawRangeElements_(d.type, d.minvert, d.maxvert, d.count, GL_UNSIGNED_SHORT, &dynidx[d.start]); else glDrawElements(d.type, d.count, GL_UNSIGNED_SHORT, &dynidx[d.start]); } if(builddlist)