Skip to content

Commit 591d6c8

Browse files
TheMostDiligentTheMostDiligent
committed
Hydrogent: renamed HN_RENDER_MODE to HN_GEOMETRY_MODE
1 parent 3b60e5e commit 591d6c8

16 files changed

+71
-71
lines changed

‎Hydrogent/include/HnRenderParam.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class HnRenderParam final : public pxr::HdRenderParam
6464

6565
const Configuration& GetConfig() const { return m_Config; }
6666

67-
HN_RENDER_MODE GetRenderMode() const { return m_RenderMode; }
68-
void SetRenderMode(HN_RENDER_MODE Mode) { m_RenderMode = Mode; }
67+
HN_GEOMETRY_MODE GetGeometryMode() const { return m_GeometryMode; }
68+
void SetGeometryMode(HN_GEOMETRY_MODE Mode) { m_GeometryMode = Mode; }
6969

7070
const pxr::SdfPath& GetSelectedPrimId() const { return m_SelectedPrimId; }
7171
void SetSelectedPrimId(const pxr::SdfPath& PrimId) { m_SelectedPrimId = PrimId; }
@@ -146,7 +146,7 @@ class HnRenderParam final : public pxr::HdRenderParam
146146
private:
147147
const Configuration m_Config;
148148

149-
HN_RENDER_MODE m_RenderMode = HN_RENDER_MODE_SOLID;
149+
HN_GEOMETRY_MODE m_GeometryMode = HN_GEOMETRY_MODE_SOLID;
150150

151151
pxr::SdfPath m_SelectedPrimId;
152152

‎Hydrogent/interface/HnRenderDelegate.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ class HnRenderDelegate final : public pxr::HdRenderDelegate
442442
HnRenderDelegateRenderingStats GetRenderingStats() const;
443443

444444
void SetDebugView(PBR_Renderer::DebugViewType DebugView);
445-
void SetRenderMode(HN_RENDER_MODE RenderMode);
445+
void SetGeometryMode(HN_GEOMETRY_MODE GeometryMode);
446446
void SetSelectedRPrimId(const pxr::SdfPath& RPrimID);
447447
void SetUseShadows(bool UseShadows);
448448

‎Hydrogent/interface/HnRenderPass.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ class HnRenderPass final : public pxr::HdRenderPass
223223
private:
224224
HnRenderPassParams m_Params;
225225

226-
HN_RENDER_MODE m_RenderMode = HN_RENDER_MODE_SOLID;
226+
HN_GEOMETRY_MODE m_GeometryMode = HN_GEOMETRY_MODE_SOLID;
227227
PBR_Renderer::DebugViewType m_DebugView = PBR_Renderer::DebugViewType::None;
228228
bool m_UseShadows = false;
229229
bool m_UseFallbackPSO = false;

‎Hydrogent/interface/HnTypes.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ namespace Diligent
3636
namespace USD
3737
{
3838

39-
/// Renering mode
40-
enum HN_RENDER_MODE : Uint8
39+
/// Geometry renering mode
40+
enum HN_GEOMETRY_MODE : Uint8
4141
{
4242
/// Render solid geometry
43-
HN_RENDER_MODE_SOLID,
43+
HN_GEOMETRY_MODE_SOLID,
4444

4545
/// Render wireframe
46-
HN_RENDER_MODE_MESH_EDGES,
46+
HN_GEOMETRY_MODE_MESH_EDGES,
4747

4848
/// Render points
49-
HN_RENDER_MODE_POINTS,
49+
HN_GEOMETRY_MODE_POINTS,
5050

51-
HN_RENDER_MODE_COUNT
51+
HN_GEOMETRY_MODE_COUNT
5252
};
5353

5454
/// Material texture binding mode.

‎Hydrogent/interface/Tasks/HnPostProcessTask.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,18 +236,18 @@ class HnPostProcessTask final : public HnTask
236236
bool UseSSAO = false;
237237
bool UseShadows = false;
238238

239-
PBR_Renderer::DebugViewType DebugView = PBR_Renderer::DebugViewType::NumDebugViews;
240-
HN_RENDER_MODE RenderMode = HN_RENDER_MODE_COUNT;
239+
PBR_Renderer::DebugViewType DebugView = PBR_Renderer::DebugViewType::NumDebugViews;
240+
HN_GEOMETRY_MODE GeometryMode = HN_GEOMETRY_MODE_COUNT;
241241

242242
constexpr bool operator==(const SuperSamplingFactors& rhs) const
243243
{
244244
// clang-format off
245-
return (Version == rhs.Version &&
246-
UseSSR == rhs.UseSSR &&
247-
UseSSAO == rhs.UseSSAO &&
248-
UseShadows == rhs.UseShadows &&
249-
DebugView == rhs.DebugView &&
250-
RenderMode == rhs.RenderMode);
245+
return (Version == rhs.Version &&
246+
UseSSR == rhs.UseSSR &&
247+
UseSSAO == rhs.UseSSAO &&
248+
UseShadows == rhs.UseShadows &&
249+
DebugView == rhs.DebugView &&
250+
GeometryMode == rhs.GeometryMode);
251251
// clang-format on
252252
}
253253
constexpr bool operator!=(const SuperSamplingFactors& rhs) const

‎Hydrogent/interface/Tasks/HnRenderRprimsTask.hpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,32 +44,32 @@ class HnRenderPass;
4444

4545
struct HnRenderRprimsTaskParams
4646
{
47-
static_assert(HN_RENDER_MODE_COUNT == 3, "Did you add a new render mode? Please update the flags!");
48-
enum RENDER_MODE_FLAGS : Uint32
47+
static_assert(HN_GEOMETRY_MODE_COUNT == 3, "Did you add a new geometry render mode? Please update the flags!");
48+
enum GEOMETRY_MODE_FLAGS : Uint32
4949
{
50-
RENDER_MODE_FLAG_NONE = 0u,
50+
GEOMETRY_MODE_FLAG_NONE = 0u,
5151

52-
RENDER_MODE_FLAG_SOLID = 1u << HN_RENDER_MODE_SOLID,
52+
GEOMETRY_MODE_FLAG_SOLID = 1u << HN_GEOMETRY_MODE_SOLID,
5353

54-
RENDER_MODE_FLAG_MESH_EDGES = 1u << HN_RENDER_MODE_MESH_EDGES,
54+
GEOMETRY_MODE_FLAG_MESH_EDGES = 1u << HN_GEOMETRY_MODE_MESH_EDGES,
5555

56-
RENDER_MODE_FLAG_POINTS = 1u << HN_RENDER_MODE_POINTS,
56+
GEOMETRY_MODE_FLAG_POINTS = 1u << HN_GEOMETRY_MODE_POINTS,
5757

58-
RENDER_MODE_FLAG_ALL = RENDER_MODE_FLAG_SOLID | RENDER_MODE_FLAG_MESH_EDGES | RENDER_MODE_FLAG_POINTS
58+
GEOMETRY_MODE_FLAG_ALL = GEOMETRY_MODE_FLAG_SOLID | GEOMETRY_MODE_FLAG_MESH_EDGES | GEOMETRY_MODE_FLAG_POINTS
5959
};
60-
RENDER_MODE_FLAGS RenderModes = RENDER_MODE_FLAG_ALL;
60+
GEOMETRY_MODE_FLAGS GeometryModes = GEOMETRY_MODE_FLAG_ALL;
6161

6262
constexpr bool operator==(const HnRenderRprimsTaskParams& rhs) const
6363
{
64-
return RenderModes == rhs.RenderModes;
64+
return GeometryModes == rhs.GeometryModes;
6565
}
6666

6767
constexpr bool operator!=(const HnRenderRprimsTaskParams& rhs) const
6868
{
6969
return !(*this == rhs);
7070
}
7171
};
72-
DEFINE_FLAG_ENUM_OPERATORS(HnRenderRprimsTaskParams::RENDER_MODE_FLAGS);
72+
DEFINE_FLAG_ENUM_OPERATORS(HnRenderRprimsTaskParams::GEOMETRY_MODE_FLAGS);
7373

7474
/// Renders the Rprims by executing the render pass.
7575
/// The task should be executed after the HnBeginMainPassTask that prepares

‎Hydrogent/src/HnRenderDelegate.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,9 +1001,9 @@ void HnRenderDelegate::SetDebugView(PBR_Renderer::DebugViewType DebugView)
10011001
m_RenderParam->SetDebugView(DebugView);
10021002
}
10031003

1004-
void HnRenderDelegate::SetRenderMode(HN_RENDER_MODE RenderMode)
1004+
void HnRenderDelegate::SetGeometryMode(HN_GEOMETRY_MODE GeometryMode)
10051005
{
1006-
m_RenderParam->SetRenderMode(RenderMode);
1006+
m_RenderParam->SetGeometryMode(GeometryMode);
10071007
}
10081008

10091009
void HnRenderDelegate::SetSelectedRPrimId(const pxr::SdfPath& RPrimID)

‎Hydrogent/src/HnRenderPass.cpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -268,24 +268,24 @@ GraphicsPipelineDesc HnRenderPass::GetGraphicsDesc(const HnRenderPassState& RPSt
268268
}
269269
}
270270

271-
switch (m_RenderMode)
271+
switch (m_GeometryMode)
272272
{
273-
case HN_RENDER_MODE_SOLID:
273+
case HN_GEOMETRY_MODE_SOLID:
274274
GraphicsDesc.PrimitiveTopology = PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
275275
break;
276276

277-
case HN_RENDER_MODE_MESH_EDGES:
277+
case HN_GEOMETRY_MODE_MESH_EDGES:
278278
GraphicsDesc.PrimitiveTopology = UseStripTopology ? PRIMITIVE_TOPOLOGY_LINE_STRIP : PRIMITIVE_TOPOLOGY_LINE_LIST;
279279
break;
280280

281-
case HN_RENDER_MODE_POINTS:
281+
case HN_GEOMETRY_MODE_POINTS:
282282
GraphicsDesc.PrimitiveTopology = PRIMITIVE_TOPOLOGY_POINT_LIST;
283283
break;
284284

285285
default:
286286
UNEXPECTED("Unexpected render mode");
287287
}
288-
static_assert(HN_RENDER_MODE_COUNT == 3, "Please handle the new render mode in the switch above");
288+
static_assert(HN_GEOMETRY_MODE_COUNT == 3, "Please handle the new geometry render mode in the switch above");
289289

290290
return GraphicsDesc;
291291
}
@@ -420,10 +420,10 @@ HnRenderPass::EXECUTE_RESULT HnRenderPass::Execute(HnRenderPassState& RPState, c
420420
}
421421

422422
{
423-
HN_RENDER_MODE RenderMode = State.RenderParam.GetRenderMode();
424-
if (m_RenderMode != RenderMode)
423+
HN_GEOMETRY_MODE GeometryMode = State.RenderParam.GetGeometryMode();
424+
if (m_GeometryMode != GeometryMode)
425425
{
426-
m_RenderMode = RenderMode;
426+
m_GeometryMode = GeometryMode;
427427
m_DrawListItemsDirtyFlags |= DRAW_LIST_ITEM_DIRTY_FLAG_PSO | DRAW_LIST_ITEM_DIRTY_FLAG_MESH_DATA;
428428
// Reset fallback PSO so that it is updated in UpdateDrawListGPUResources
429429
m_FallbackPSO = nullptr;
@@ -1033,7 +1033,7 @@ void HnRenderPass::UpdateDrawListJoints(HnRenderDelegate& RenderDelegate)
10331033

10341034
PBR_Renderer::PSO_FLAGS HnRenderPass::GetFallbackPSOFlags() const
10351035
{
1036-
return (m_RenderMode == HN_RENDER_MODE_SOLID ?
1036+
return (m_GeometryMode == HN_GEOMETRY_MODE_SOLID ?
10371037
PBR_Renderer::PSO_FLAG_COMPUTE_MOTION_VECTORS :
10381038
PBR_Renderer::PSO_FLAG_UNSHADED) |
10391039
static_cast<PBR_Renderer::PSO_FLAGS>(m_Params.UsdPsoFlags);
@@ -1049,7 +1049,7 @@ void HnRenderPass::UpdateDrawListGPUResources(RenderState& State)
10491049
if (m_FallbackPSO == nullptr &&
10501050
m_Params.Type == PBR_Renderer::RenderPassType::Main &&
10511051
(m_Params.UsdPsoFlags & USD_Renderer::USD_PSO_FLAG_ENABLE_COLOR_OUTPUT) != 0 &&
1052-
m_RenderMode == HN_RENDER_MODE_SOLID)
1052+
m_GeometryMode == HN_GEOMETRY_MODE_SOLID)
10531053
{
10541054
const PBR_Renderer::PSOKey FallbackPSOKey{
10551055
PBR_Renderer::RenderPassType::Main,
@@ -1323,7 +1323,7 @@ void HnRenderPass::UpdateDrawListItemGPUResources(DrawListItem& ListItem, Render
13231323
if (Geo.Joints != nullptr)
13241324
PSOFlags |= PBR_Renderer::PSO_FLAG_USE_JOINTS;
13251325

1326-
if (m_RenderMode == HN_RENDER_MODE_SOLID)
1326+
if (m_GeometryMode == HN_GEOMETRY_MODE_SOLID)
13271327
{
13281328
if ((m_Params.UsdPsoFlags & USD_Renderer::USD_PSO_FLAG_ENABLE_COLOR_OUTPUT) != 0)
13291329
{
@@ -1386,8 +1386,8 @@ void HnRenderPass::UpdateDrawListItemGPUResources(DrawListItem& ListItem, Render
13861386
// PSOKey may have cleared some flags - get updated flags
13871387
PSOFlags = PSOKey.GetFlags();
13881388
}
1389-
else if (m_RenderMode == HN_RENDER_MODE_MESH_EDGES ||
1390-
m_RenderMode == HN_RENDER_MODE_POINTS)
1389+
else if (m_GeometryMode == HN_GEOMETRY_MODE_MESH_EDGES ||
1390+
m_GeometryMode == HN_GEOMETRY_MODE_POINTS)
13911391
{
13921392
VERIFY_EXPR(m_Params.Type == PBR_Renderer::RenderPassType::Main);
13931393
PSOFlags |= PBR_Renderer::PSO_FLAG_UNSHADED;
@@ -1425,12 +1425,12 @@ void HnRenderPass::UpdateDrawListItemGPUResources(DrawListItem& ListItem, Render
14251425
{
14261426
const HnDrawItem::GeometryData& Geo = DrawItem.GetGeometryData();
14271427

1428-
static_assert(HN_RENDER_MODE_COUNT == 3, "Please handle the new render mode here");
1428+
static_assert(HN_GEOMETRY_MODE_COUNT == 3, "Please handle the new geometry render mode here");
14291429

14301430
// Input layout is defined by HnRenderDelegate when creating USD renderer.
14311431
ListItem.VertexBuffers[VERTEX_BUFFER_SLOT_POSITIONS] = Geo.Positions;
14321432
ListItem.VertexBuffers[VERTEX_BUFFER_SLOT_VERTEX_JOINTS] = Geo.Joints;
1433-
if (m_RenderMode == HN_RENDER_MODE_SOLID)
1433+
if (m_GeometryMode == HN_GEOMETRY_MODE_SOLID)
14341434
{
14351435
ListItem.VertexBuffers[VERTEX_BUFFER_SLOT_NORMALS] = Geo.Normals;
14361436
ListItem.VertexBuffers[VERTEX_BUFFER_SLOT_TEX_COORDS0] = Geo.TexCoords[0];
@@ -1440,8 +1440,8 @@ void HnRenderPass::UpdateDrawListItemGPUResources(DrawListItem& ListItem, Render
14401440
// It is OK if some buffers are null
14411441
ListItem.NumVertexBuffers = VERTEX_BUFFER_SLOT_COUNT;
14421442
}
1443-
else if (m_RenderMode == HN_RENDER_MODE_MESH_EDGES ||
1444-
m_RenderMode == HN_RENDER_MODE_POINTS)
1443+
else if (m_GeometryMode == HN_GEOMETRY_MODE_MESH_EDGES ||
1444+
m_GeometryMode == HN_GEOMETRY_MODE_POINTS)
14451445
{
14461446
// Only positions and joints are used
14471447
ListItem.VertexBuffers[VERTEX_BUFFER_SLOT_NORMALS] = nullptr;
@@ -1457,17 +1457,17 @@ void HnRenderPass::UpdateDrawListItemGPUResources(DrawListItem& ListItem, Render
14571457
}
14581458

14591459
const HnDrawItem::TopologyData* Topology = nullptr;
1460-
switch (m_RenderMode)
1460+
switch (m_GeometryMode)
14611461
{
1462-
case HN_RENDER_MODE_SOLID:
1462+
case HN_GEOMETRY_MODE_SOLID:
14631463
Topology = &DrawItem.GetFaces();
14641464
break;
14651465

1466-
case HN_RENDER_MODE_MESH_EDGES:
1466+
case HN_GEOMETRY_MODE_MESH_EDGES:
14671467
Topology = &DrawItem.GetEdges();
14681468
break;
14691469

1470-
case HN_RENDER_MODE_POINTS:
1470+
case HN_GEOMETRY_MODE_POINTS:
14711471
Topology = &DrawItem.GetPoints();
14721472
break;
14731473

‎Hydrogent/src/Tasks/HnBeginOITPassTask.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ bool HnBeginOITPassTask::IsActive(pxr::HdRenderIndex& RenderIndex) const
5959
{
6060
pxr::HdRenderDelegate* RenderDelegate = RenderIndex.GetRenderDelegate();
6161
const HnRenderParam* RenderParam = static_cast<const HnRenderParam*>(RenderDelegate->GetRenderParam());
62-
const HN_RENDER_MODE RenderMode = RenderParam->GetRenderMode();
62+
const HN_GEOMETRY_MODE GeometryMode = RenderParam->GetGeometryMode();
6363
const PBR_Renderer::DebugViewType DebugView = RenderParam->GetDebugView();
6464

6565
// Scene depth debug view for transparent objects is rendered in opaque mode and does not need OIT layers.
66-
return RenderMode == HN_RENDER_MODE_SOLID && DebugView != PBR_Renderer::DebugViewType::SceneDepth;
66+
return GeometryMode == HN_GEOMETRY_MODE_SOLID && DebugView != PBR_Renderer::DebugViewType::SceneDepth;
6767
}
6868

6969
void HnBeginOITPassTask::Prepare(pxr::HdTaskContext* TaskCtx,
@@ -205,7 +205,7 @@ void HnBeginOITPassTask::Execute(pxr::HdTaskContext* TaskCtx)
205205
IDeviceContext* pCtx = RenderDelegate->GetDeviceContext();
206206

207207
const HnRenderParam* RenderParam = static_cast<HnRenderParam*>(RenderDelegate->GetRenderParam());
208-
VERIFY_EXPR(RenderParam->GetRenderMode() == HN_RENDER_MODE_SOLID);
208+
VERIFY_EXPR(RenderParam->GetGeometryMode() == HN_GEOMETRY_MODE_SOLID);
209209
const Uint32 OITResourcesVersion = RenderParam->GetAttribVersion(HnRenderParam::GlobalAttrib::OITResources);
210210
if (m_BoundOITResourcesVersion != OITResourcesVersion)
211211
{

‎Hydrogent/src/Tasks/HnComputeDepthBoundsTask.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ bool HnComputeDepthBoundsTask::IsActive(pxr::HdRenderIndex& RenderIndex) const
6464
{
6565
pxr::HdRenderDelegate* RenderDelegate = RenderIndex.GetRenderDelegate();
6666
const HnRenderParam* RenderParam = static_cast<const HnRenderParam*>(RenderDelegate->GetRenderParam());
67-
const HN_RENDER_MODE RenderMode = RenderParam->GetRenderMode();
67+
const HN_GEOMETRY_MODE GeometryMode = RenderParam->GetGeometryMode();
6868
const PBR_Renderer::DebugViewType DebugView = RenderParam->GetDebugView();
6969

7070
// Only run this task when scene depth debug view is enabled
71-
return RenderMode == HN_RENDER_MODE_SOLID && DebugView == PBR_Renderer::DebugViewType::SceneDepth;
71+
return GeometryMode == HN_GEOMETRY_MODE_SOLID && DebugView == PBR_Renderer::DebugViewType::SceneDepth;
7272
}
7373

7474
void HnComputeDepthBoundsTask::Prepare(pxr::HdTaskContext* TaskCtx,

0 commit comments

Comments
 (0)