yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.kde.org:kde-workspace

Browse source
This commit is contained in:
Hugo Pereira Da Costa 2011-05-01 11:53:07 +02:00
commit c2367fabe0
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
opengltest/opengltest.cpp
View file

@ -81,16 +81,9 @@ int main(int argc, char *argv[])
if ((major == 1 && minor < 3) && !strstr(glxExtensions, "GLX_EXT_texture_from_pixmap")) if ((major == 1 && minor < 3) && !strstr(glxExtensions, "GLX_EXT_texture_from_pixmap"))
return 1; return 1;
// Assume that direct rendering works with DRI2 drivers // Assume that all Mesa drivers support direct rendering
const GLubyte *renderer = glGetString(GL_RENDERER); const GLubyte *version = glGetString(GL_VERSION);
if (strstr((const char *)renderer, "DRI2")) if (strstr((const char *)version, "Mesa"))
return 0;
// The Intel driver doesn't have DRI2 in the renderer string
if (strstr((const char *)renderer, "GEM"))
return 0;
if (strstr((const char *)renderer, "Gallium"))
return 0; return 0;
// Direct contexts also work with the NVidia driver // Direct contexts also work with the NVidia driver