Differential D6565 Diff 16377 Modules/opengl/opengl.cpp

Changeset View

Standalone View

View Options

Modules/opengl/opengl.cpp

Context not available.
122 return newItem(parent, NULL, textCol1, textCol2); 122​ return newItem(parent, NULL, textCol1, textCol2);
123} 123​}
124 124​
125​#if KCM_HAVE_GLX
126​static const int coreProfileCtxAttribs[][7] = {
127​ {
128​ GLX_CONTEXT_MAJOR_VERSION_ARB, 4,
129​ GLX_CONTEXT_MINOR_VERSION_ARB, 5,
130​ GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
131​ None
132​ },
133​ {
134​ GLX_CONTEXT_MAJOR_VERSION_ARB, 4,
135​ GLX_CONTEXT_MINOR_VERSION_ARB, 4,
136​ GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
137​ None
138​ },
139​ {
140​ GLX_CONTEXT_MAJOR_VERSION_ARB, 4,
141​ GLX_CONTEXT_MINOR_VERSION_ARB, 3,
142​ GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
143​ None
144​ },
145​ {
146​ GLX_CONTEXT_MAJOR_VERSION_ARB, 4,
147​ GLX_CONTEXT_MINOR_VERSION_ARB, 2,
148​ GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
149​ None
150​ },
151​ {
152​ GLX_CONTEXT_MAJOR_VERSION_ARB, 4,
153​ GLX_CONTEXT_MINOR_VERSION_ARB, 1,
154​ GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
155​ None
156​ },
157​ {
158​ GLX_CONTEXT_MAJOR_VERSION_ARB, 4,
159​ GLX_CONTEXT_MINOR_VERSION_ARB, 0,
160​ GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
161​ None
162​ },
163​ {
164​ GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
165​ GLX_CONTEXT_MINOR_VERSION_ARB, 3,
166​ GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
167​ None
168​ },
169​ {
170​ GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
171​ GLX_CONTEXT_MINOR_VERSION_ARB, 2,
172​ GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
173​ None
174​ },
175​ {
176​ GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
177​ GLX_CONTEXT_MINOR_VERSION_ARB, 1,
178​ GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB, /* Ignored in this case but specified to keep the size same */
179​ None
180​ }
181​};
182​#endif
183​
125static bool IsDirect; 184​static bool IsDirect;
126 185​
127static struct glinfo { 186​static struct glinfo {
Context not available.
142 const char *glVendor; 201​ const char *glVendor;
143 const char *glRenderer; 202​ const char *glRenderer;
144 const char *glVersion; 203​ const char *glVersion;
204​ QString glVersionCoreProfile;
145 const char *glExtensions; 205​ const char *glExtensions;
146#if KCM_HAVE_GLX 206​#if KCM_HAVE_GLX
147 const char *gluVersion; 207​ const char *gluVersion;
Context not available.
587#ifdef KCM_ENABLE_OPENGLES 647​#ifdef KCM_ENABLE_OPENGLES
588 l3 = newItem(l2, l3, i18n("OpenGL ES version"), gli.glVersion); 648​ l3 = newItem(l2, l3, i18n("OpenGL ES version"), gli.glVersion);
589#else 649​#else
590 l3 = newItem(l2, l3, i18n("OpenGL version"), gli.glVersion); 650​ l3 = newItem(l2, l3, i18n("OpenGL version (compat. profile)"), gli.glVersion);
651​ if (!gli.glVersionCoreProfile.isEmpty()) {
652​ l3 = newItem(l2, l3, i18n("OpenGL version (core profile)"), gli.glVersionCoreProfile);
653​ }
591#endif 654​#endif
592 655​
593 if (IsDirect) { 656​ if (IsDirect) {
Context not available.
652#endif 715​#endif
653 716​
654#if KCM_HAVE_GLX 717​#if KCM_HAVE_GLX
718​static bool have_glx14(Display *dpy)
719​{
720​ int glxMajor;
721​ int glxMinor;
722​
723​ if (!glXQueryVersion(dpy, &glxMajor, &glxMinor)) {
724​ qDebug() << "Error: glXQueryVersion failed\n";
725​ return false;
726​ }
727​
728​ if ((glxMajor < 1) || (glxMajor == 1 && glxMinor < 4)) {
729​ qDebug() << "Error: At least GLX 1.4 is required to query OpenGL core profiles\n";
730​ return false;
731​ }
732​
733​ return true;
734​}
735​
736​static void get_gl_core_profile_glx(GLXContext &ctx, GLXFBConfig *&fbc, Display *dpy, int scrnum, Window win)
737​{
738​ typedef GLXContext (*glXCreateContextAttribsARBProc)(Display *, GLXFBConfig, GLXContext, Bool, const int *);
739​ static const QLatin1String extName("GLX_ARB_create_context");
740​ static const int fbcAttrib[] = {
741​ GLX_RED_SIZE, 1,
742​ GLX_GREEN_SIZE, 1,
743​ GLX_BLUE_SIZE, 1,
744​ None };
745​ glXCreateContextAttribsARBProc glXCreateContextAttribsARB;
746​ int fbcElems;
747​
748​ if (!have_glx14(dpy)) {
749​ return;
750​ }
751​
752​ if (!QString(gli.glxExtensions).contains(extName) || !QString(gli.serverExtensions).contains(extName)) {
753​ qDebug() << "Error:" << extName << "extension is not supported\n";
754​ return;
755​ }
756​
757​ glXCreateContextAttribsARB = (glXCreateContextAttribsARBProc) glXGetProcAddressARB((const GLubyte *) "glXCreateContextAttribsARB");
758​ if (!glXCreateContextAttribsARB) {
759​ qDebug() << "Error: Failed to retrieve glXCreateContextAttribsARB\n";
760​ return;
761​ }
762​
763​ fbc = glXChooseFBConfig(dpy, scrnum, fbcAttrib, &fbcElems);
764​ if (!fbc) {
765​ qDebug() << "Error: glXChooseFBConfig failed\n";
766​ return;
767​ }
768​
769​ size_t idx;
770​ size_t end = sizeof(coreProfileCtxAttribs) / sizeof(coreProfileCtxAttribs[0]);
771​ for (idx = 0; idx < end; idx++) {
772​ const int *attribs = coreProfileCtxAttribs[idx];
773​ ctx = glXCreateContextAttribsARB(dpy, *fbc, nullptr, IsDirect, attribs);
774​ if (ctx) {
775​ break;
776​ }
777​ }
778​ if (idx == end) {
graesslinUnsubmitted
Not Done

Please don't add qDebug in new code, use qCDebug instead. Same of course for all the other cases in the change.

graesslin: Please don't add qDebug in new code, use qCDebug instead. Same of course for all the other…
779​ qDebug() << "Error: glXCreateContextAttribsARB failed\n";
780​ return;
781​ }
782​
783​ if (glXMakeCurrent(dpy, win, ctx)) {
784​ gli.glVersionCoreProfile = QLatin1String((const char *) glGetString(GL_VERSION));
785​ } else {
786​ qDebug() << "Error: glXMakeCurrent failed for core profile\n";
787​ }
788​}
789​
graesslinUnsubmitted
Not Done

please use nullptr in new code.

graesslin: please use nullptr in new code.
790​static void get_gl_core_profile_glx_mesaext(Display *dpy)
791​{
792​ typedef Bool (*glXQueryCurrentRendererIntegerMESAProc)(int, int *);
793​ glXQueryCurrentRendererIntegerMESAProc glXQueryCurrentRendererIntegerMESA;
794​ int coreProfileVersion[2];
795​ int mesaVersion[3];
796​ QString mesaVersionTag;
797​
798​ if (!have_glx14(dpy)) {
799​ return;
800​ }
801​
802​ glXQueryCurrentRendererIntegerMESA = (glXQueryCurrentRendererIntegerMESAProc) glXGetProcAddressARB((const GLubyte *) "glXQueryCurrentRendererIntegerMESA");
803​ if (!glXQueryCurrentRendererIntegerMESA) {
804​ qDebug() << "Error: Failed to retrieve glXQueryCurrentRendererIntegerMESA\n";
805​ return;
806​ }
807​
808​ Bool ok = glXQueryCurrentRendererIntegerMESA(GLX_RENDERER_OPENGL_CORE_PROFILE_VERSION_MESA, coreProfileVersion);
809​ if (ok == False) {
810​ qDebug() << "Error: glXQueryCurrentRendererIntegerMESA failed to get core profile version\n";
811​ return;
812​ }
813​
814​ ok = glXQueryCurrentRendererIntegerMESA(GLX_RENDERER_VERSION_MESA, mesaVersion);
815​ if (ok == True) {
816​ mesaVersionTag = QString("Mesa %1.%2.%3").arg(mesaVersion[0]).arg(mesaVersion[1]).arg(mesaVersion[2]);
817​ }
818​ else {
819​ qDebug() << "Warning: glXQueryCurrentRendererIntegerMESA failed to get mesa version\n";
820​ }
821​
822​ gli.glVersionCoreProfile = QString("%1.%2 %3").arg(coreProfileVersion[0]).arg(coreProfileVersion[1]).arg(mesaVersionTag);
823​}
824​
655static QTreeWidgetItem *get_gl_info_glx(Display *dpy, int scrnum, Bool allowDirect, QTreeWidgetItem *l1, QTreeWidgetItem *after) 825​static QTreeWidgetItem *get_gl_info_glx(Display *dpy, int scrnum, Bool allowDirect, QTreeWidgetItem *l1, QTreeWidgetItem *after)
656{ 826​{
657 Window win; 827​ Window win;
Context not available.
659 unsigned long mask; 829​ unsigned long mask;
660 Window root; 830​ Window root;
661 XVisualInfo *visinfo; 831​ XVisualInfo *visinfo;
832​ GLXContext ctxCoreProf = nullptr;
833​ GLXFBConfig *fbcCoreProf = nullptr;
662 int width = 100, height = 100; 834​ int width = 100, height = 100;
663 QTreeWidgetItem *result = after; 835​ QTreeWidgetItem *result = after;
664 836​
Context not available.
683 if (!visinfo) { 855​ if (!visinfo) {
684 visinfo = glXChooseVisual(dpy, scrnum, const_cast<int*>(attribDouble)); 856​ visinfo = glXChooseVisual(dpy, scrnum, const_cast<int*>(attribDouble));
685 if (!visinfo) { 857​ if (!visinfo) {
686 qDebug() << "Error: couldn't find RGB GLX visual\n"; 858​ qDebug() << "Error: couldn't find RGB GLX visual\n";
687 return result; 859​ return result;
688 } 860​ }
689 } 861​ }
Context not available.
699 871​
700 ctx = glXCreateContext( dpy, visinfo, NULL, allowDirect ); 872​ ctx = glXCreateContext( dpy, visinfo, NULL, allowDirect );
701 if (!ctx) { 873​ if (!ctx) {
702 qDebug() << "Error: glXCreateContext failed\n"; 874​ qDebug() << "Error: glXCreateContext failed\n";
703 XDestroyWindow(dpy, win); 875​ XDestroyWindow(dpy, win);
704 return result; 876​ return result;
705 } 877​ }
Context not available.
721 gli.gluExtensions = (const char *) gluGetString(GLU_EXTENSIONS); 893​ gli.gluExtensions = (const char *) gluGetString(GLU_EXTENSIONS);
722 894​
723 IsDirect = glXIsDirect(dpy, ctx); 895​ IsDirect = glXIsDirect(dpy, ctx);
724 ​
725 result = print_screen_info(l1, after, IsDirect ? i18n("Direct Rendering (GLX)") : i18n("Indirect Rendering (GLX)")); ​
726 } 896​ }
727 else { 897​ else {
728 qDebug() << "Error: glXMakeCurrent failed\n"; 898​ qDebug() << "Error: glXMakeCurrent failed\n";
729 } 899​ }
730 900​
901​ if (QString(gli.glxExtensions).contains(QLatin1String("GLX_MESA_query_renderer"))) {
902​ get_gl_core_profile_glx_mesaext(dpy);
903​ }
904​ else {
905​ get_gl_core_profile_glx(ctxCoreProf, fbcCoreProf, dpy, scrnum, win);
906​ }
907​
908​ result = print_screen_info(l1, after, IsDirect ? i18n("Direct Rendering (GLX)") : i18n("Indirect Rendering (GLX)"));
909​
910​ if (ctxCoreProf) {
911​ glXDestroyContext(dpy, ctxCoreProf);
912​ }
913​ if (fbcCoreProf) {
914​ XFree(fbcCoreProf);
915​ }
731 glXDestroyContext(dpy, ctx); 916​ glXDestroyContext(dpy, ctx);
732 XDestroyWindow(dpy, win); 917​ XDestroyWindow(dpy, win);
733 return result; 918​ return result;
Context not available.