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: b19e7132af93
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: 9464c9e0c974
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Feb 21, 2020

  1. Fixed incorrect index calculation on very zoomed-out waveforms causin… 

    …g extremely poor performance
    @azonenberg
    azonenberg committed Feb 21, 2020
    Copy the full SHA
    9464c9e View commit details
Showing with 4 additions and 0 deletions.
  1. +3 −0 glscopeclient/WaveformArea_rendering.cpp
  2. +1 −0 glscopeclient/shaders/waveform-compute.glsl
3 changes: 3 additions & 0 deletions glscopeclient/WaveformArea_rendering.cpp
View file
Original file line number Diff line number Diff line change
@@ -117,6 +117,9 @@ bool WaveformArea::PrepareGeometry()
size_t nsample = 0;
for(int j=0; j<m_width; j++)
{
//Default to drawing nothing
m_indexBuffer[j] = count;

//Move forward until we find a sample that starts in the current column
for(; nsample < count-1; nsample ++)
{
1 change: 1 addition & 0 deletions glscopeclient/shaders/waveform-compute.glsl
View file
Original file line number Diff line number Diff line change
@@ -98,6 +98,7 @@ void main()
g_workingBuffer[y] += alpha;

//TODO: antialiasing
//TODO: decimation at very wide zooms
}

//Copy working buffer to RGB output