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: 72a976bc4e75
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: c9292cc7ac21
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 13, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c9292cc View commit details
Showing with 6 additions and 7 deletions.
  1. +6 −7 src/glscopeclient/WaveformArea.cpp
13 changes: 6 additions & 7 deletions src/glscopeclient/WaveformArea.cpp
Original file line number Diff line number Diff line change
@@ -470,13 +470,7 @@ void WaveformArea::on_realize()
LogDebug("GL_RENDERER = %s\n", glGetString(GL_RENDERER));
LogDebug("GL_VERSION = %s\n", glGetString(GL_VERSION));
LogDebug("GL_SHADING_LANGUAGE_VERSION = %s\n", glGetString(GL_SHADING_LANGUAGE_VERSION));

if(GLEW_ARB_gpu_shader_int64)
LogDebug("GL_ARB_gpu_shader_int64: supported\n");
else
LogDebug("GL_ARB_gpu_shader_int64: not supported\n");

LogDebug("Initial GL error code: %d\n", glGetError());
LogDebug("Initial GL error code = %d\n", glGetError());
}

//Initialize GLEW
@@ -502,6 +496,11 @@ void WaveformArea::on_realize()
exit(1);
}

if(GLEW_ARB_gpu_shader_int64)
LogDebug(" GL_ARB_gpu_shader_int64 = supported\n");
else
LogDebug(" GL_ARB_gpu_shader_int64 = not supported\n");

//Check for GL 4.2 (required for glBindImageTexture)
if(!GLEW_VERSION_4_2)
{