diff options
author | Miodrag Milanović <mmicko@gmail.com> | 2019-05-23 23:53:52 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-23 23:53:52 -0700 |
commit | 0d1c7118e3f35ed90744ee5319e32b8ef720d1a5 (patch) | |
tree | fbcef378b8269f21c64d53fa359478b8c1921594 /gui/lineshader.h | |
parent | 95f3d4cc6ed3a4516893f1b0756a2104be5e995b (diff) | |
parent | d00288198f14d9179c7983148812f2956299a54e (diff) | |
download | nextpnr-0d1c7118e3f35ed90744ee5319e32b8ef720d1a5.tar.gz nextpnr-0d1c7118e3f35ed90744ee5319e32b8ef720d1a5.tar.bz2 nextpnr-0d1c7118e3f35ed90744ee5319e32b8ef720d1a5.zip |
Merge pull request #169 from ajeakins/master
Fix device view not showing anything on macOS.
Diffstat (limited to 'gui/lineshader.h')
-rw-r--r-- | gui/lineshader.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gui/lineshader.h b/gui/lineshader.h index 98042051..4c54bf46 100644 --- a/gui/lineshader.h +++ b/gui/lineshader.h @@ -172,10 +172,10 @@ class LineShader LineShader(QObject *parent) : parent_(parent), program_(nullptr) {} static constexpr const char *vertexShaderSource_ = - "#version 110\n" - "attribute highp vec2 position;\n" - "attribute highp vec2 normal;\n" - "attribute highp float miter;\n" + "#version 150\n" + "in highp vec2 position;\n" + "in highp vec2 normal;\n" + "in highp float miter;\n" "uniform highp float thickness;\n" "uniform highp mat4 projection;\n" "void main() {\n" @@ -183,10 +183,11 @@ class LineShader " gl_Position = projection * vec4(p, 0.0, 1.0);\n" "}\n"; - static constexpr const char *fragmentShaderSource_ = "#version 110\n" + static constexpr const char *fragmentShaderSource_ = "#version 150\n" "uniform lowp vec4 color;\n" + "out vec4 Out_Color;\n" "void main() {\n" - " gl_FragColor = color;\n" + " Out_Color = color;\n" "}\n"; // Must be called on initialization. |