ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zzogl-pg: Revert some changes to CreateFillExtensionsMap for the moment. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4187 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2011-01-09 06:21:47 +00:00
parent 61b5194ccd
commit bdc4e2caf4
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/zzogl-pg/opengl/ZZoglCreate.cpp
View File

@ -374,13 +374,15 @@ inline bool CreateOpenShadersFile()
// Read all extensions name and fill mapGLExtensions
inline bool CreateFillExtensionsMap()
{
// This seems to cause crashes on some systems, so I'm temporarily reverting to the old version.
#if 0
string temp("");
int max_ext = 0;
glGetIntegerv(GL_NUM_EXTENSIONS, &max_ext);
PFNGLGETSTRINGIPROC glGetStringi = 0;
glGetStringi = (PFNGLGETSTRINGIPROC)wglGetProcAddress("glGetStringi");
for (GLint i = 0; i < max_ext; i++)
{
string extension((const char*)glGetStringi(GL_EXTENSIONS, i));
@ -395,6 +397,36 @@ inline bool CreateFillExtensionsMap()
ZZLog::Log("%d supported OpenGL Extensions: %s\n", max_ext, temp.c_str());
#endif
ZZLog::Debug_Log("%d supported OpenGL Extensions: %s\n", max_ext, temp.c_str());
#else
const char* ptoken = (const char*)glGetString(GL_EXTENSIONS);
#ifndef _DEBUG
ZZLog::Log("Supported OpenGL Extensions: %s\n", ptoken);
#endif
ZZLog::Debug_Log("Supported OpenGL Extensions:\n%s\n", ptoken);
if (ptoken == NULL) return false;
const char* pend = NULL;
while (ptoken != NULL)
{
pend = strchr(ptoken, ' ');
if (pend != NULL)
{
mapGLExtensions[string(ptoken, pend-ptoken)];
}
else
{
mapGLExtensions[string(ptoken)];
break;
}
ptoken = pend;
while (*ptoken == ' ') ++ptoken;
}
#endif
return true;
}