Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct glsl debug issue #12776

Merged
merged 1 commit into from
Mar 20, 2024
Merged

Correct glsl debug issue #12776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions src/frame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "core/depth-frame.h"
#include "composite-frame.h"
#include "core/stream-profile-interface.h"
#include "archive.h"

#include "metadata-parser.h"
#include "core/enum-helpers.h"

Expand Down Expand Up @@ -60,32 +60,7 @@ std::ostream & operator<<( std::ostream & os, frame_holder const & f )
}


frame::frame( frame && r )
: ref_count( r.ref_count.exchange( 0 ) )
, owner( r.owner )
, on_release()
, _kept( r._kept.exchange( false ) )
{
*this = std::move( r );
if( owner )
metadata_parsers = owner->get_md_parsers();
}

frame & frame::operator=( frame && r )
{
data = std::move( r.data );
owner = r.owner;
ref_count = r.ref_count.exchange( 0 );
_kept = r._kept.exchange( false );
on_release = std::move( r.on_release );
additional_data = std::move( r.additional_data );
r.owner.reset();
if( owner )
metadata_parsers = owner->get_md_parsers();
if( r.metadata_parsers )
metadata_parsers = std::move( r.metadata_parsers );
return *this;
}
archive_interface * frame::get_owner() const
{
return owner.get();
Expand Down
29 changes: 27 additions & 2 deletions src/frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <atomic>
#include <vector>
#include <memory>
#include "archive.h"


namespace librealsense {
Expand All @@ -31,10 +32,34 @@ class LRS_EXTENSION_API frame : public frame_interface
{
}
frame( const frame & r ) = delete;
frame( frame && r );
frame(frame&& r)
: ref_count(r.ref_count.exchange(0))
, owner(r.owner)
, on_release()
, _kept(r._kept.exchange(false))
{
*this = std::move(r);
if (owner)
metadata_parsers = owner->get_md_parsers();
}

frame& operator=(frame&& r)
{
data = std::move(r.data);
owner = r.owner;
ref_count = r.ref_count.exchange(0);
_kept = r._kept.exchange(false);
on_release = std::move(r.on_release);
additional_data = std::move(r.additional_data);
r.owner.reset();
if (owner)
metadata_parsers = owner->get_md_parsers();
if (r.metadata_parsers)
metadata_parsers = std::move(r.metadata_parsers);
return *this;
}

frame & operator=( const frame & r ) = delete;
frame & operator=( frame && r );

virtual ~frame() { on_release.reset(); }
frame_header const & get_header() const override { return additional_data; }
Expand Down
Loading