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: 81347647bcea
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: 93fcf267deac
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on May 13, 2021

  1. Unified dense pack shaders to use same GLSL source as normal ones wit… 

    …h a different #define
    @azonenberg
    azonenberg committed May 13, 2021

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    93fcf26 View commit details
2 changes: 2 additions & 0 deletions src/glscopeclient/Shader.cpp
View file
Original file line number Diff line number Diff line change
@@ -66,6 +66,8 @@ bool Shader::Load(const char* path, ...)
const char* arg = va_arg(list, const char*);
if(arg == NULL)
break;
else if(arg[0] == '#')
shaderbuf += string(arg) + "\n";
else
shaderbuf += ReadDataFile(arg);
}
6 changes: 4 additions & 2 deletions src/glscopeclient/WaveformArea.cpp
View file
Original file line number Diff line number Diff line change
@@ -674,7 +674,8 @@ void WaveformArea::InitializeWaveformPass()
NULL))
LogFatal("failed to load analog waveform compute shader, aborting\n");
if(!adwc.Load(
"shaders/waveform-compute-head-dense.glsl",
"shaders/waveform-compute-head.glsl",
"#define DENSE_PACK"
"shaders/waveform-compute-analog.glsl",
"shaders/waveform-compute-core.glsl",
NULL))
@@ -701,7 +702,8 @@ void WaveformArea::InitializeWaveformPass()
NULL))
LogFatal("failed to load analog waveform compute shader, aborting\n");
if(!adwc.Load(
"shaders/waveform-compute-head-dense-noint64.glsl",
"shaders/waveform-compute-head-noint64.glsl",
"#define DENSE_PACK"
"shaders/waveform-compute-analog.glsl",
"shaders/waveform-compute-core.glsl",
NULL))
96 changes: 0 additions & 96 deletions src/glscopeclient/shaders/waveform-compute-head-dense-noint64.glsl
View file

This file was deleted.

67 changes: 0 additions & 67 deletions src/glscopeclient/shaders/waveform-compute-head-dense.glsl
View file

This file was deleted.