diff --git a/common/gal/opengl/vertex_container.cpp b/common/gal/opengl/vertex_container.cpp
index e22d77766c..7ade5d415a 100644
--- a/common/gal/opengl/vertex_container.cpp
+++ b/common/gal/opengl/vertex_container.cpp
@@ -41,11 +41,11 @@ VERTEX_CONTAINER* VERTEX_CONTAINER::MakeContainer( bool aCached )
 {
     if( aCached )
     {
-        const unsigned char* vendor = glGetString( GL_VENDOR );
+        const char* vendor = (const char*) glGetString( GL_VENDOR );
 
-        // AMD/ATI cards do not cope well with GPU memory mapping,
+        // Open source drivers do not cope well with GPU memory mapping,
         // so the vertex data has to be kept in RAM
-        if( strstr( (const char*) vendor, "AMD" ) )
+        if( strstr( vendor, "X.Org" ) || strstr( vendor, "nouveau" ) )
             return new CACHED_CONTAINER_RAM;
         else
             return new CACHED_CONTAINER_GPU;