src/plugins/graphicssystems/opengl/main.cpp
changeset 30 5dc02b23752f
parent 18 2f34d5167611
equal deleted inserted replaced
29:b72c6db6890b 30:5dc02b23752f
    54 
    54 
    55 QStringList QGLGraphicsSystemPlugin::keys() const
    55 QStringList QGLGraphicsSystemPlugin::keys() const
    56 {
    56 {
    57     QStringList list;
    57     QStringList list;
    58     list << QLatin1String("OpenGL") << QLatin1String("OpenGL1");
    58     list << QLatin1String("OpenGL") << QLatin1String("OpenGL1");
    59 #if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)
    59 #if !defined(QT_OPENGL_ES_1)
    60     list << QLatin1String("OpenGL2");
    60     list << QLatin1String("OpenGL2");
       
    61 #endif
       
    62 #if defined(Q_WS_X11) && !defined(QT_NO_EGL)
       
    63     list << QLatin1String("X11GL");
    61 #endif
    64 #endif
    62     return list;
    65     return list;
    63 }
    66 }
    64 
    67 
    65 QGraphicsSystem* QGLGraphicsSystemPlugin::create(const QString& system)
    68 QGraphicsSystem* QGLGraphicsSystemPlugin::create(const QString& system)
    66 {
    69 {
    67     if (system.toLower() == QLatin1String("opengl1")) {
    70     if (system.toLower() == QLatin1String("opengl1")) {
    68         QGL::setPreferredPaintEngine(QPaintEngine::OpenGL);
    71         QGL::setPreferredPaintEngine(QPaintEngine::OpenGL);
    69         return new QGLGraphicsSystem;
    72         return new QGLGraphicsSystem(false);
    70     }
    73     }
    71 
    74 
    72 #if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)
    75 #if !defined(QT_OPENGL_ES_1)
    73     if (system.toLower() == QLatin1String("opengl2")) {
    76     if (system.toLower() == QLatin1String("opengl2")) {
    74         QGL::setPreferredPaintEngine(QPaintEngine::OpenGL2);
    77         QGL::setPreferredPaintEngine(QPaintEngine::OpenGL2);
    75         return new QGLGraphicsSystem;
    78         return new QGLGraphicsSystem(false);
    76     }
    79     }
    77 #endif
    80 #endif
    78 
    81 
       
    82 #if defined(Q_WS_X11) && !defined(QT_NO_EGL)
       
    83     if (system.toLower() == QLatin1String("x11gl"))
       
    84         return new QGLGraphicsSystem(true);
       
    85 #endif
       
    86 
    79     if (system.toLower() == QLatin1String("opengl"))
    87     if (system.toLower() == QLatin1String("opengl"))
    80         return new QGLGraphicsSystem;
    88         return new QGLGraphicsSystem(false);
    81 
    89 
    82     return 0;
    90     return 0;
    83 }
    91 }
    84 
    92 
    85 Q_EXPORT_PLUGIN2(opengl, QGLGraphicsSystemPlugin)
    93 Q_EXPORT_PLUGIN2(opengl, QGLGraphicsSystemPlugin)