From abee6af03ef8b96913a8876afc97b65d1f94ad0d Mon Sep 17 00:00:00 2001 From: terminx Date: Mon, 1 Mar 2010 09:13:25 +0000 Subject: [PATCH] force r_vbos to 0 for Polymost on ATI R520 git-svn-id: https://svn.eduke32.com/eduke32@1602 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/winlayer.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/polymer/eduke32/build/src/winlayer.c b/polymer/eduke32/build/src/winlayer.c index b8dbb1726..566bf09a6 100644 --- a/polymer/eduke32/build/src/winlayer.c +++ b/polymer/eduke32/build/src/winlayer.c @@ -3373,15 +3373,9 @@ static int32_t SetupOpenGL(int32_t width, int32_t height, int32_t bitspp) else if (!Bstrcmp(glinfo.vendor,"3Dfx Interactive Inc.")) err = 1; else if (!Bstrcmp(glinfo.vendor,"Intel")) { - if (!Bstrcmp(glinfo.renderer,"Intel 845G")) + if (!Bstrncmp(glinfo.renderer,"Intel 8", 7)) // 845G and 865G confirmed to work err = 0; - else if (!Bstrcmp(glinfo.renderer,"Intel 865G")) - err = 0; - else if (!Bstrcmp(glinfo.renderer,"Intel 915G")) - err = 0; - else if (!Bstrcmp(glinfo.renderer,"Intel 945GM")) - err = 0; - else if (!Bstrcmp(glinfo.renderer,"Intel 965/963 Graphics Media Accelerator")) + else if (!Bstrncmp(glinfo.renderer,"Intel 9", 7)) // 915G, 945GM, 965/963 GMA confirmed to work err = 0; else if (!Bstrcmp(glinfo.renderer,"Intel Cantiga")) err = 0; @@ -3389,26 +3383,32 @@ static int32_t SetupOpenGL(int32_t width, int32_t height, int32_t bitspp) err = 0; else err = 1; } -#ifdef POLYMER else { if (!Bstrcmp(glinfo.vendor,"ATI Technologies Inc.")) { +#ifdef POLYMER pr_ati_fboworkaround = 1; initprintf("Enabling ATI FBO color attachment workaround.\n"); - +#endif if (!Bstrncmp(glinfo.renderer,"Radeon X1", 9)) { + r_vbos = 0; +#ifdef POLYMER pr_ati_nodepthoffset = 1; initprintf("Enabling ATI R520 polygon offset workaround.\n"); +#endif } +#ifdef POLYMER else pr_ati_nodepthoffset = 0; +#endif } +#ifdef POLYMER else pr_ati_fboworkaround = 0; - } #endif + } if (!forcegl && err) { OSD_Printf("Unsupported OpenGL driver detected. GL modes will be unavailable. Use -forcegl to override.\n");