Skip to content

Commit 7f13107

Browse files
committed
EyePattern: removed hacky edge handling code for center column of pixels, removed some dead code
1 parent f06eeb8 commit 7f13107

File tree

2 files changed

+5
-25
lines changed

2 files changed

+5
-25
lines changed

scopeprotocols/EyePattern.cpp

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,10 @@ void EyePattern::ClearSweeps()
146146
SetData(NULL, 0);
147147
}
148148

149-
void EyePattern::Refresh()
149+
void EyePattern::Refresh(
150+
[[maybe_unused]] vk::raii::CommandBuffer& cmdBuf,
151+
[[maybe_unused]] shared_ptr<QueueHandle> queue)
150152
{
151-
static double total_time = 0;
152-
static double total_frames = 0;
153-
154153
LogIndenter li;
155154

156155
if(!VerifyAllInputsOK())
@@ -163,7 +162,6 @@ void EyePattern::Refresh()
163162
//Get the input data
164163
auto waveform = GetInputWaveform(0);
165164
auto clock = GetInputWaveform(1);
166-
double start = GetTime();
167165

168166
waveform->PrepareForCpuAccess();
169167
clock->PrepareForCpuAccess();
@@ -258,8 +256,7 @@ void EyePattern::Refresh()
258256
auto uwfm = dynamic_cast<UniformAnalogWaveform*>(waveform);
259257
if(m_xscale > FLT_EPSILON)
260258
{
261-
//Optimized inner loop for dense packed waveforms
262-
//We can assume m_offsets[i] = i and m_durations[i] = 0 for all input
259+
//Optimized inner loop for uniformly sampled waveforms
263260
if(uwfm)
264261
{
265262
#ifdef __x86_64__
@@ -275,18 +272,6 @@ void EyePattern::Refresh()
275272
SparsePackedInnerLoop(swfm, clock_edges, data, wend, cend, xmax, ymax, xtimescale, yscale, yoff);
276273
}
277274

278-
//Rightmost column of the eye has some rounding artifacts.
279-
//For now, just replace it with the value from 1 column to its left.
280-
size_t delta = ceil(m_xscale);
281-
size_t xstart = xmax - delta;
282-
size_t xend = xmax;
283-
for(size_t y=0; y<m_height; y++)
284-
{
285-
int64_t* row = data + y*m_width;
286-
for(size_t x=xstart; x<=xend; x++)
287-
row[x] = row[x-delta];
288-
}
289-
290275
//Count total number of UIs we've integrated
291276
cap->IntegrateUIs(clock_edges.size());
292277
cap->Normalize();
@@ -295,11 +280,6 @@ void EyePattern::Refresh()
295280
//If we have an eye mask, prepare it for processing
296281
if(m_mask.GetFileName() != "")
297282
DoMaskTest(cap);
298-
299-
double dt = GetTime() - start;
300-
total_frames ++;
301-
total_time += dt;
302-
LogTrace("Refresh took %.3f ms (avg %.3f)\n", dt * 1000, (total_time * 1000) / total_frames);
303283
}
304284

305285
#ifdef __x86_64__

scopeprotocols/EyePattern.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class EyePattern : public Filter
4444
public:
4545
EyePattern(const std::string& color);
4646

47-
virtual void Refresh() override;
47+
virtual void Refresh(vk::raii::CommandBuffer& cmdBuf, std::shared_ptr<QueueHandle> queue) override;
4848

4949
static std::string GetProtocolName();
5050

0 commit comments

Comments
 (0)