i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opengl/glinfo: Fix broken GLinfo app

Browse Source 
* Can't call InfoView() with an unlocked BGLView.
* If unable to obtain to glGetString, show some "unknown" messages

Change-Id: I17d8ff84feed166644d54b0e19e0ef1fce202a74
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3476
Reviewed-by: X512 <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2020-12-08 00:25:45 +00:00
committed by waddlesplash
parent 9adc70887e
commit 9293eadbda
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/kits/opengl/glinfo/InfoView.cpp
+13 -7
View File
@@ -37,17 +37,23 @@ InfoView::InfoView()
: :
BGroupView(B_TRANSLATE("Information"), B_HORIZONTAL) BGroupView(B_TRANSLATE("Information"), B_HORIZONTAL)
{ {
BStringView* rendererView = new BStringView(NULL, const char* glRenderer = (const char*)glGetString(GL_RENDERER);
(const char*)glGetString(GL_RENDERER)); if (glRenderer == NULL)
glRenderer = B_TRANSLATE("Unknown or missing OpenGL renderer.");
BStringView* rendererView = new BStringView(NULL, glRenderer);
rendererView->SetExplicitAlignment(kLabelAlignment); rendererView->SetExplicitAlignment(kLabelAlignment);
rendererView->SetFont(be_bold_font); rendererView->SetFont(be_bold_font);
BStringView* vendorNameView = new BStringView(NULL, const char* glVendor = (const char*)glGetString(GL_VENDOR);
(const char*)glGetString(GL_VENDOR)); if (glVendor == NULL)
vendorNameView->SetExplicitAlignment(kLabelAlignment); glVendor = B_TRANSLATE("Unknown vendor");
BStringView* vendorNameView = new BStringView(NULL, glVendor);
vendorNameView->SetExplicitAlignment(kLabelAlignment);
BStringView* glVersionView = new BStringView(NULL, const char* glVersion = (const char*)glGetString(GL_VERSION);
(const char*)glGetString(GL_VERSION)); if (glVersion == NULL)
glVersion = B_TRANSLATE("Unknown version");
BStringView* glVersionView = new BStringView(NULL, glVersion);
glVersionView->SetExplicitAlignment(kLabelAlignment); glVersionView->SetExplicitAlignment(kLabelAlignment);
BString apiString("GLU "); BString apiString("GLU ");
src/tests/kits/opengl/glinfo/OpenGLView.cpp
+2 -2
View File
@@ -52,8 +52,6 @@ OpenGLView::OpenGLView()
tabView->AddTab(new CapabilitiesView()); tabView->AddTab(new CapabilitiesView());
tabView->AddTab(new ExtensionsView()); tabView->AddTab(new ExtensionsView());
glView->UnlockGL();
GroupLayout()->SetSpacing(0); GroupLayout()->SetSpacing(0);
BLayoutBuilder::Group<>(this) BLayoutBuilder::Group<>(this)
.AddGroup(B_HORIZONTAL, 0) .AddGroup(B_HORIZONTAL, 0)
@@ -66,6 +64,8 @@ OpenGLView::OpenGLView()
.End() .End()
.AddGlue() .AddGlue()
.End(); .End();
glView->UnlockGL();
} }
OpenGLView::~OpenGLView() OpenGLView::~OpenGLView()