Quit shortcut Ctrl-Q, GLSL 150 -> 120 according coozoo@01b42d3

Signed-off-by: Ho-Ro <[email protected]>
Ho-Ro · Feb 26, 2019 · 97540df · 97540df
1 parent 1874a81
commit 97540df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/openhantek/src/glscope.cpp b/openhantek/src/glscope.cpp
@@ -202,8 +202,8 @@ void GlScope::initializeGL() {
     )";
 
     const char *vshaderDesktop = R"(
-          #version 150
-          in highp vec3 vertex;
+          #version 120 //150
+          attribute vec3 vertex; //in highp vec3 vertex;
           uniform mat4 matrix;
           void main()
           {
@@ -212,10 +212,10 @@ void GlScope::initializeGL() {
           }
     )";
     const char *fshaderDesktop = R"(
-          #version 150
+          #version 120 //150
           uniform highp vec4 colour;
-          out vec4 flatColor;
-          void main() { flatColor = colour; }
+          //out vec4 flatColor;
+          void main() { gl_FragColor = colour; } //{ flatColor = colour; }
     )";
 
     qDebug() << "compile shaders";

diff --git a/openhantek/src/mainwindow.ui b/openhantek/src/mainwindow.ui
@@ -114,6 +114,9 @@
    <property name="text">
     <string>Exit</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
   </action>
   <action name="actionDigital_phosphor">
    <property name="checkable">