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

refactor frame_asset -> frame_context #63

Merged
merged 1 commit into from
Jun 1, 2024
Merged

refactor frame_asset -> frame_context #63

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
22 changes: 11 additions & 11 deletions include/vierkant/PBRDeferred.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

#include <deque>

#include <vierkant/RayBuilder.hpp>
#include <vierkant/Bloom.hpp>
#include <vierkant/Compute.hpp>
#include <vierkant/DrawContext.hpp>
#include <vierkant/GBuffer.hpp>
#include <vierkant/PipelineCache.hpp>
#include <vierkant/RayBuilder.hpp>
#include <vierkant/SceneRenderer.hpp>
#include <vierkant/Compute.hpp>
#include <vierkant/GBuffer.hpp>
#include <vierkant/ambient_occlusion.hpp>
#include <vierkant/culling.hpp>
#include <vierkant/gpu_culling.hpp>
Expand Down Expand Up @@ -202,7 +202,7 @@ class PBRDeferred : public vierkant::SceneRenderer
*/
const std::deque<statistics_t> &statistics() const { return m_statistics; }

const image_bundle_t& image_bundle() const;
const image_bundle_t &image_bundle() const;

//! settings struct
settings_t settings;
Expand Down Expand Up @@ -258,7 +258,7 @@ class PBRDeferred : public vierkant::SceneRenderer
float weights[61] = {};
};

struct frame_asset_t
struct frame_context_t
{
std::chrono::steady_clock::time_point timestamp;

Expand Down Expand Up @@ -342,17 +342,17 @@ class PBRDeferred : public vierkant::SceneRenderer
float motionblur_gain = 1.f;
};

static const char* to_string(SemaphoreValue v);
static const char *to_string(SemaphoreValue v);

explicit PBRDeferred(const vierkant::DevicePtr &device, const create_info_t &create_info);

void update_timing(frame_asset_t &frame_asset);
void update_timing(frame_context_t &frame_context);

void update_recycling(const SceneConstPtr &scene, const CameraPtr &cam, frame_asset_t &frame_asset);
void update_recycling(const SceneConstPtr &scene, const CameraPtr &cam, frame_context_t &frame_context);

void update_animation_transforms(frame_asset_t &frame_asset);
void update_animation_transforms(frame_context_t &frame_context);

void resize_storage(frame_asset_t &frame_asset, const glm::uvec2 &resolution, const glm::uvec2 &out_resolution);
void resize_storage(frame_context_t &frame_context, const glm::uvec2 &resolution, const glm::uvec2 &out_resolution);

vierkant::Framebuffer &geometry_pass(vierkant::cull_result_t &cull_result);

Expand Down Expand Up @@ -381,7 +381,7 @@ class PBRDeferred : public vierkant::SceneRenderer

size_t m_sample_index = 0;

std::vector<frame_asset_t> m_frame_assets;
std::vector<frame_context_t> m_frame_contexts;

vierkant::DrawContext m_draw_context;

Expand Down
18 changes: 9 additions & 9 deletions include/vierkant/PBRPathTracer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ class PBRPathTracer : public vierkant::SceneRenderer
MAX_VALUE
};

struct frame_asset_t
struct frame_context_t
{
settings_t settings;

Expand Down Expand Up @@ -240,20 +240,20 @@ class PBRPathTracer : public vierkant::SceneRenderer

PBRPathTracer(const vierkant::DevicePtr &device, const create_info_t &create_info);

void pre_render(frame_asset_t &frame_asset);
void pre_render(frame_context_t &frame_context);

void update_acceleration_structures(frame_asset_t &frame_asset, const SceneConstPtr &scene,
void update_acceleration_structures(frame_context_t &frame_context, const SceneConstPtr &scene,
const std::set<std::string> &tags);

void update_trace_descriptors(frame_asset_t &frame_asset, const CameraPtr &cam);
void update_trace_descriptors(frame_context_t &frame_context, const CameraPtr &cam);

void path_trace_pass(frame_asset_t &frame_asset, const vierkant::SceneConstPtr &scene, const CameraPtr &cam);
void path_trace_pass(frame_context_t &frame_context, const vierkant::SceneConstPtr &scene, const CameraPtr &cam);

void denoise_pass(frame_asset_t &frame_asset);
void denoise_pass(frame_context_t &frame_context);

void post_fx_pass(frame_asset_t &frame_asset);
void post_fx_pass(frame_context_t &frame_context);

void resize_storage(frame_asset_t &frame_asset, const glm::uvec2 &resolution);
void resize_storage(frame_context_t &frame_context, const glm::uvec2 &resolution);

//! device
vierkant::DevicePtr m_device;
Expand Down Expand Up @@ -287,7 +287,7 @@ class PBRPathTracer : public vierkant::SceneRenderer
//! information for a raytracing pipeline
raytracing_shader_map_t m_shader_stages = {}, m_shader_stages_env = {};

std::vector<frame_asset_t> m_frame_assets;
std::vector<frame_context_t> m_frame_contexts;

vierkant::DrawContext m_draw_context;

Expand Down
Loading
Loading