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

Jump to bottom

Switch from deprecated tbb::atomic to std::atomic #2

Open
wants to merge 1 commit into
base: release
Choose a base branch
from
Open

Switch from deprecated tbb::atomic to std::atomic #2

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
4 changes: 1 addition & 3 deletions cmd/moonray_gui/RenderGui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
#include <mcrt_denoise/denoiser/Denoiser.h>
#include <moonray/rendering/rndr/rndr.h>

#include <tbb/atomic.h>

#define NUM_TILE_FADE_STEPS 4

namespace moonray_gui {
Expand Down Expand Up @@ -119,7 +117,7 @@ class RenderGui
/// The renderering code will strive to render this frame. If it's rendering
/// a frame with a lower timestamp then we know the frame it's currently
/// rendering is old.
tbb::atomic<uint32_t> mMasterTimestamp;
std::atomic<uint32_t> mMasterTimestamp;

/// The timestamp of the frame the renderer is currently processing.
uint32_t mRenderTimestamp;
Expand Down