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: 934df1613d53
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: 4b9d6bb52142
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 26, 2019

  1. WaveformArea: added non-multisample fallback

    @azonenberg
    azonenberg committed Jun 26, 2019
    Copy the full SHA
    4b9d6bb View commit details
Showing with 13 additions and 1 deletion.
  1. +13 −1 glscopeclient/WaveformArea_events.cpp
14 changes: 13 additions & 1 deletion glscopeclient/WaveformArea_events.cpp
View file
Original file line number Diff line number Diff line change
@@ -90,7 +90,19 @@ void WaveformArea::on_resize(int width, int height)
ResetTextureFiltering();
m_waveformFramebuffer.SetTexture(m_waveformTexture, GL_TEXTURE_2D_MULTISAMPLE);
if(!m_waveformFramebuffer.IsComplete())
LogError("FBO is incomplete: %x\n", glCheckFramebufferStatus(GL_FRAMEBUFFER));
{
//Failed to allocate the texture as multisample. Try doing non-multisample.
m_waveformTexture.Destroy();
m_waveformTexture.Bind();
m_waveformTexture.SetData(width, height, NULL);
ResetTextureFiltering();
m_waveformFramebuffer.SetTexture(m_waveformTexture, GL_TEXTURE_2D);
if(!m_waveformFramebuffer.IsComplete())
{
LogError("FBO is still incomplete (non-multisample fallback): %x\n",
glCheckFramebufferStatus(GL_FRAMEBUFFER));
}
}

err = glGetError();
if(err != 0)