eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-13 11:19:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch to OpenGL 3.3

Browse Source
This commit is contained in:
brunoherbelin
2020-04-13 15:15:53 +02:00
parent 57fc66c546
commit 7be79a9c96
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RenderingManager.cpp
View File

@@ -76,10 +76,10 @@ bool Rendering::Init()
return false; return false;
} }
// Decide GL+GLSL versions GL 3.2 + GLSL 150 // Decide GL+GLSL versions GL 3.3 + GLSL 150
glsl_version = "#version 150"; glsl_version = "#version 150";
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); // 3.2+ only glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); // 3.2+ only
#if __APPLE__ #if __APPLE__
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); // Required on Mac glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); // Required on Mac

12
UserInterfaceManager.cpp
View File

@@ -473,7 +473,7 @@ void MainWindow::StartScreenshot()
static void ShowAboutOpengl(bool* p_open) static void ShowAboutOpengl(bool* p_open)
{ {
if (!ImGui::Begin("About OpenGL", p_open, ImGuiWindowFlags_AlwaysAutoResize)) if (!ImGui::Begin("About OpenGL", p_open, ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_AlwaysAutoResize))
{ {
ImGui::End(); ImGui::End();
return; return;
@@ -481,7 +481,6 @@ static void ShowAboutOpengl(bool* p_open)
ImGuiToolkit::PushFont(ImGuiToolkit::FONT_BOLD); ImGuiToolkit::PushFont(ImGuiToolkit::FONT_BOLD);
ImGui::Text("OpenGL %s", glGetString(GL_VERSION) ); ImGui::Text("OpenGL %s", glGetString(GL_VERSION) );
ImGui::Text("%s %s", glGetString(GL_RENDERER), glGetString(GL_VENDOR));
ImGui::PopFont(); ImGui::PopFont();
ImGui::Separator(); ImGui::Separator();
ImGui::Text("OpenGL is the premier environment for developing portable, \ninteractive 2D and 3D graphics applications."); ImGui::Text("OpenGL is the premier environment for developing portable, \ninteractive 2D and 3D graphics applications.");
@@ -513,7 +512,9 @@ static void ShowAboutOpengl(bool* p_open)
ImGui::LogText("```\n"); ImGui::LogText("```\n");
} }
ImGui::Text("OpenGL Extensions (runtime) :"); ImGui::Text("OpenGL %s", glGetString(GL_VERSION) );
ImGui::Text("%s %s", glGetString(GL_RENDERER), glGetString(GL_VENDOR));
ImGui::Text("Extensions (runtime) :");
GLint numExtensions = 0; GLint numExtensions = 0;
glGetIntegerv( GL_NUM_EXTENSIONS, &numExtensions ); glGetIntegerv( GL_NUM_EXTENSIONS, &numExtensions );
@@ -539,7 +540,7 @@ static void ShowAboutOpengl(bool* p_open)
static void ShowAboutGStreamer(bool* p_open) static void ShowAboutGStreamer(bool* p_open)
{ {
if (!ImGui::Begin("About Gstreamer", p_open, ImGuiWindowFlags_AlwaysAutoResize)) if (!ImGui::Begin("About Gstreamer", p_open, ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_AlwaysAutoResize))
{ {
ImGui::End(); ImGui::End();
return; return;
@@ -576,7 +577,8 @@ static void ShowAboutGStreamer(bool* p_open)
ImGui::LogText("```\n"); ImGui::LogText("```\n");
} }
ImGui::Text("GStreamer Plugins & features (runtime) :"); ImGui::Text("GStreamer %s", GstToolkit::gst_version().c_str());
ImGui::Text("Plugins & features (runtime) :");
std::list<std::string> filteredlist; std::list<std::string> filteredlist;