Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3b4d77968f83
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3845945dec3b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 12, 2020

  1. Fixed bug in OpenGL extension detection

    @azonenberg
    azonenberg committed Dec 12, 2020
    Copy the full SHA
    3845945 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/glscopeclient/WaveformArea.cpp
8 changes: 4 additions & 4 deletions src/glscopeclient/WaveformArea.cpp
View file
Original file line number Diff line number Diff line change
@@ -524,10 +524,10 @@ void WaveformArea::on_realize()

//Make sure we have the required extensions
if( !GLEW_EXT_blend_equation_separate ||
!GL_EXT_framebuffer_object ||
!GL_ARB_vertex_array_object ||
!GL_ARB_shader_storage_buffer_object ||
!GL_ARB_compute_shader)
!GLEW_EXT_framebuffer_object ||
!GLEW_ARB_vertex_array_object ||
!GLEW_ARB_shader_storage_buffer_object ||
!GLEW_ARB_compute_shader)
{
string err =
"Your graphics card or driver does not appear to support one or more of the following required extensions:\n"