OpenGL line width > 1.0 does not seem to work on macOS (gives an INVALID_VALUE).

[dcpomatic.git] / src / wx / gl_video_view.cc

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 1073cb944dbae42fa8bf6f200c01527dcd8a39bb..29d44fcd2a6bf9bbd0126573b432a7dc815347b5 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -466,7 +466,7 @@ GLVideoView::setup_shaders ()
        check_gl_error ("glGetUniformLocation");
        glUniformMatrix4fv (colour_conversion, 1, GL_TRUE, gl_matrix);
 
-       glLineWidth (2.0f);
+       glLineWidth (1.0f);
        check_gl_error ("glLineWidth");
        glEnable (GL_BLEND);
        check_gl_error ("glEnable");
@@ -536,7 +536,7 @@ GLVideoView::draw ()
                check_gl_error ("glDrawElements");
        }
        if (auto guess = _viewer->crop_guess()) {
-               glUniform1i(_fragment_type, 1);
+               glUniform1i(_fragment_type, static_cast<GLint>(FragmentType::CROP_GUESS));
                glDrawElements (GL_LINES, indices_crop_guess_number, GL_UNSIGNED_INT, reinterpret_cast<void*>(indices_crop_guess_offset * sizeof(int)));
                check_gl_error ("glDrawElements");
        }