Skip to content

Commit fb58dce

Browse files
committed
Houdini 20 requires RenderContext rather than Render *.
Signed-off-by: Jeff Lait <jlait@andorra.sidefx.com>
1 parent 97b94f1 commit fb58dce

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

openvdb_houdini/openvdb_houdini/GR_PrimVDBPoints.cc

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
#include <utility>
4040
#include <vector>
4141

42+
#if UT_VERSION_INT < 0x14000000 // Below 20.0, there is no RE_RenderContext
43+
#define RE_RenderContext RE_Render *
44+
#endif
45+
4246
////////////////////////////////////////
4347

4448
static RE_ShaderHandle theMarkerDecorShader("decor/GL32/point_marker.prog");
@@ -112,7 +116,7 @@ class GR_PrimVDBPoints : public GR_Primitive
112116
/// Called whenever the parent detail is changed, draw modes are changed,
113117
/// selection is changed, or certain volatile display options are changed
114118
/// (such as level of detail).
115-
void update(RE_Render*, const GT_PrimitiveHandle&, const GR_UpdateParms&) override;
119+
void update(RE_RenderContext, const GT_PrimitiveHandle&, const GR_UpdateParms&) override;
116120

117121
/// return true if the primitive is in or overlaps the view frustum.
118122
/// always returning true will effectively disable frustum culling.
@@ -126,12 +130,12 @@ class GR_PrimVDBPoints : public GR_Primitive
126130
/// than one time per viewport redraw (beauty, shadow passes, wireframe-over)
127131
/// It also may be called outside of a viewport redraw to do picking of the
128132
/// geometry.
129-
void render(RE_Render*, GR_RenderMode, GR_RenderFlags, GR_DrawParms) override;
133+
void render(RE_RenderContext, GR_RenderMode, GR_RenderFlags, GR_DrawParms) override;
130134

131-
int renderPick(RE_Render*, const GR_DisplayOption*, unsigned int,
135+
int renderPick(RE_RenderContext, const GR_DisplayOption*, unsigned int,
132136
GR_PickStyle, bool) override { return 0; }
133137

134-
void renderDecoration(RE_Render*, GR_Decoration, const GR_DecorationParms&) override;
138+
void renderDecoration(RE_RenderContext, GR_Decoration, const GR_DecorationParms&) override;
135139

136140
protected:
137141
void computeCentroid(const openvdb::points::PointDataGrid& grid);
@@ -711,7 +715,7 @@ GR_PrimVDBPoints::updateWireBuffer(RE_Render *r,
711715
}
712716

713717
void
714-
GR_PrimVDBPoints::update(RE_Render *r,
718+
GR_PrimVDBPoints::update(RE_RenderContext r,
715719
const GT_PrimitiveHandle &primh,
716720
const GR_UpdateParms &p)
717721
{
@@ -861,7 +865,7 @@ GR_PrimVDBPoints::removeBuffer(const std::string& name)
861865
}
862866

863867
void
864-
GR_PrimVDBPoints::render(RE_Render *r, GR_RenderMode, GR_RenderFlags, GR_DrawParms dp)
868+
GR_PrimVDBPoints::render(RE_RenderContext r, GR_RenderMode, GR_RenderFlags, GR_DrawParms dp)
865869
{
866870
if (!myGeo && !myWire) return;
867871

@@ -934,7 +938,7 @@ GR_PrimVDBPoints::render(RE_Render *r, GR_RenderMode, GR_RenderFlags, GR_DrawPar
934938

935939

936940
void
937-
GR_PrimVDBPoints::renderDecoration(RE_Render* r, GR_Decoration decor, const GR_DecorationParms& p)
941+
GR_PrimVDBPoints::renderDecoration(RE_RenderContext r, GR_Decoration decor, const GR_DecorationParms& p)
938942
{
939943
// just render native GR_Primitive decorations if position not available
940944

0 commit comments

Comments
 (0)