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: 8fafafcc8c89
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: 15fb2f653ade
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 26, 2019

  1. Suppress error message when we fall back from MSAA to non-AA

    @azonenberg
    azonenberg committed Jun 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    15fb2f6 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 glscopeclient/WaveformArea_events.cpp
3 changes: 3 additions & 0 deletions glscopeclient/WaveformArea_events.cpp
View file
Original file line number Diff line number Diff line change
@@ -92,6 +92,9 @@ void WaveformArea::on_resize(int width, int height)
m_msaaEnabled = true;
if(!m_waveformFramebuffer.IsComplete())
{
//if MSAA failed to initialize, ignore the error
glGetError();

//Failed to allocate the texture as multisample. Try doing non-multisample.
m_waveformTexture.Destroy();
m_waveformTexture.Bind();