force r_vbos to 0 for Polymost on ATI R520

git-svn-id: https://svn.eduke32.com/eduke32@1602 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2010-03-01 09:13:25 +00:00
parent 55acd2b3fa
commit abee6af03e

View file

@ -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,"3Dfx Interactive Inc.")) err = 1;
else if (!Bstrcmp(glinfo.vendor,"Intel")) 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; err = 0;
else if (!Bstrcmp(glinfo.renderer,"Intel 865G")) else if (!Bstrncmp(glinfo.renderer,"Intel 9", 7)) // 915G, 945GM, 965/963 GMA confirmed to work
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"))
err = 0; err = 0;
else if (!Bstrcmp(glinfo.renderer,"Intel Cantiga")) else if (!Bstrcmp(glinfo.renderer,"Intel Cantiga"))
err = 0; err = 0;
@ -3389,26 +3383,32 @@ static int32_t SetupOpenGL(int32_t width, int32_t height, int32_t bitspp)
err = 0; err = 0;
else err = 1; else err = 1;
} }
#ifdef POLYMER
else else
{ {
if (!Bstrcmp(glinfo.vendor,"ATI Technologies Inc.")) if (!Bstrcmp(glinfo.vendor,"ATI Technologies Inc."))
{ {
#ifdef POLYMER
pr_ati_fboworkaround = 1; pr_ati_fboworkaround = 1;
initprintf("Enabling ATI FBO color attachment workaround.\n"); initprintf("Enabling ATI FBO color attachment workaround.\n");
#endif
if (!Bstrncmp(glinfo.renderer,"Radeon X1", 9)) if (!Bstrncmp(glinfo.renderer,"Radeon X1", 9))
{ {
r_vbos = 0;
#ifdef POLYMER
pr_ati_nodepthoffset = 1; pr_ati_nodepthoffset = 1;
initprintf("Enabling ATI R520 polygon offset workaround.\n"); initprintf("Enabling ATI R520 polygon offset workaround.\n");
#endif
} }
#ifdef POLYMER
else else
pr_ati_nodepthoffset = 0; pr_ati_nodepthoffset = 0;
#endif
} }
#ifdef POLYMER
else else
pr_ati_fboworkaround = 0; pr_ati_fboworkaround = 0;
}
#endif #endif
}
if (!forcegl && err) if (!forcegl && err)
{ {
OSD_Printf("Unsupported OpenGL driver detected. GL modes will be unavailable. Use -forcegl to override.\n"); OSD_Printf("Unsupported OpenGL driver detected. GL modes will be unavailable. Use -forcegl to override.\n");