refine states and ssbo example

Author: cgcostume

source/examples/commandlineoutput/CMakeLists.txt

@@ -29,7 +29,6 @@ message(STATUS "Example ${target}")
 
 set(sources
     main.cpp
-    contextinfo.inl
 )
 
 

source/examples/commandlineoutput/contextinfo.inl

@@ -22,9 +22,6 @@
 #include <globjects/TransformFeedback.h>
 #include <globjects/VertexArray.h>
 
-// example commons
-#include "contextinfo.inl"
-
 
 using namespace gl;
 using namespace globjects;
@@ -53,7 +50,11 @@ int main(int /*argc*/, char * /*argv*/[])
 
     // Initialize globjects (internally initializes glbinding, and registers the current context)
     globjects::init();
-    common::printContextInfo();
+
+    std::cout << std::endl
+        << "OpenGL Version:  " << glbinding::ContextInfo::version() << std::endl
+        << "OpenGL Vendor:   " << glbinding::ContextInfo::vendor() << std::endl
+        << "OpenGL Renderer: " << glbinding::ContextInfo::renderer() << std::endl << std::endl;
 
     std::cout << std::endl;
     std::cout << "Test Logging of Standard Types:" << std::endl;

source/examples/commandlineoutput/main.cpp

@@ -31,7 +31,6 @@ set(sources
     main.cpp
     ScreenAlignedQuad.h
     ScreenAlignedQuad.cpp
-    contextinfo.inl
     datapath.inl
 )
 

source/examples/computeshader/CMakeLists.txt

@@ -29,9 +29,6 @@
 #include <globjects/Texture.h>
 
 #include "ScreenAlignedQuad.h"
-
-// example commons
-#include "contextinfo.inl"
 #include "datapath.inl"
 
 
@@ -155,7 +152,11 @@ int main()
 
     // Initialize globjects (internally initializes glbinding, and registers the current context)
     globjects::init();
-    common::printContextInfo();
+
+    std::cout << std::endl
+        << "OpenGL Version:  " << glbinding::ContextInfo::version() << std::endl
+        << "OpenGL Vendor:   " << glbinding::ContextInfo::vendor() << std::endl
+        << "OpenGL Renderer: " << glbinding::ContextInfo::renderer() << std::endl << std::endl;
 
     globjects::DebugMessage::enable();
 

source/examples/computeshader/contextinfo.inl

@@ -29,7 +29,6 @@ message(STATUS "Example ${target}")
 
 set(sources
     main.cpp
-    contextinfo.inl
 )
 
 

source/examples/computeshader/main.cpp

@@ -1,4 +1,6 @@
 
+#include <iostream>
+
 #include <glm/vec2.hpp>
 
 #include <glbinding/gl/gl.h>
@@ -19,9 +21,6 @@
 #include <globjects/VertexAttributeBinding.h>
 #include <globjects/base/StaticStringSource.h>
 
-// example commons
-#include "contextinfo.inl"
-
 
 using namespace gl;
 
@@ -70,8 +69,6 @@ void main()
 
 void initialize()
 {
-    glClearColor(0.2f, 0.3f, 0.4f, 1.f);
-
     g_cornerBuffer = new globjects::Buffer();
     g_cornerBuffer->ref();
     g_vertexProgram = new globjects::Program();
@@ -167,10 +164,11 @@ int main(int /*argc*/, char * /*argv*/[])
 
     // Initialize globjects (internally initializes glbinding, and registers the current context)
     globjects::init();
-    common::printContextInfo();
-
-    globjects::info() << "Press F5 to reload shaders." << std::endl << std::endl;
 
+    std::cout << std::endl
+        << "OpenGL Version:  " << glbinding::ContextInfo::version() << std::endl
+        << "OpenGL Vendor:   " << glbinding::ContextInfo::vendor() << std::endl
+        << "OpenGL Renderer: " << glbinding::ContextInfo::renderer() << std::endl << std::endl;
 
     initialize();
     glfwGetFramebufferSize(window, &g_size[0], &g_size[1]);

source/examples/programpipelines/CMakeLists.txt

@@ -43,7 +43,6 @@ set(sources
 
     WindowQt.cpp
     WindowQt.h
-    contextinfo.inl
     datapath.inl
 )