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: dcadd77921b1
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: 5d28cb82d764
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 24, 2020

  1. glscopeclient: Fix up shader syntax to avoid embedded struct definitions 

    This is a fix for the error :

ERROR: Compile of shader shaders/waveform-compute.glsl failed:
 0:13(4): error: embedded structure declarations are not allowed

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
    @smunaut
    smunaut committed Feb 24, 2020
    Copy the full SHA
    d064b23 View commit details

  2. Merge pull request #62 from smunaut/shader_fix 

    glscopeclient: Fix up shader syntax to avoid embedded struct definitions
    @azonenberg
    azonenberg authored Feb 24, 2020
    Copy the full SHA
    5d28cb8 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 glscopeclient/shaders/waveform-compute.glsl
12 changes: 7 additions & 5 deletions glscopeclient/shaders/waveform-compute.glsl
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,15 @@
layout(binding=0, rgba32f) uniform image2D outputTex;

//Voltage data
struct data_point
{
float x; //x pixel position (fractional)
float voltage; //y value of this sample, in pixels
};

layout(std430, binding=1) buffer waveform
{
struct
{
float x; //x pixel position (fractional)
float voltage; //y value of this sample, in pixels
} data[];
data_point data[];
};

//Global configuration for the run