Skip to content

Commit d6a78e7

Browse files
committed
Add USE_VULKAN macro for Mac OSX
Signed-off-by: Dan Bailey <danbailey@ilm.com>
1 parent 94fafd5 commit d6a78e7

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

openvdb_houdini/openvdb_houdini/GR_PrimVDBPoints.cc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <UT/UT_UniquePtr.h>
3131
#include <UT/UT_Version.h>
3232

33-
#if UT_VERSION_INT >= 0x15000000 // 21.0 or later - Vulkan support
33+
#if UT_VERSION_INT >= 0x15000000 && defined(USE_VULKAN) // 21.0 or later - Vulkan support
3434
#include <GR/GR_Uniforms.h>
3535
#include <RV/RV_Geometry.h>
3636
#include <RV/RV_Render.h>
@@ -57,7 +57,7 @@ static RE_ShaderHandle theVelocityDecorShader("decor/GL32/user_point_vector3.pro
5757
static RE_ShaderHandle thePixelShader("particle/GL32/pixel.prog");
5858
static RE_ShaderHandle thePointShader("particle/GL32/point.prog");
5959

60-
#if UT_VERSION_INT >= 0x15000000 // 21.0 or later - Vulkan support
60+
#if UT_VERSION_INT >= 0x15000000 && defined(USE_VULKAN) // 21.0 or later - Vulkan support
6161
static RV_ShaderProgram* theVkPointShader = nullptr;
6262
static RV_ShaderProgram* theVkVelocityShader = nullptr;
6363
#endif
@@ -165,7 +165,7 @@ class GR_PrimVDBPoints : public GR_Primitive
165165

166166
void removeBuffer(const std::string& name);
167167

168-
#if UT_VERSION_INT >= 0x15000000 // 21.0 or later - Vulkan support
168+
#if UT_VERSION_INT >= 0x15000000 && defined(USE_VULKAN) // 21.0 or later - Vulkan support
169169
void updatePosBufferVk(RV_Render* r,
170170
const openvdb::points::PointDataGrid& grid,
171171
const RE_CacheVersion& version);
@@ -182,7 +182,7 @@ class GR_PrimVDBPoints : public GR_Primitive
182182
bool mDefaultPointColor = true;
183183
openvdb::Vec3f mCentroid{0, 0, 0};
184184
openvdb::BBoxd mBbox;
185-
#if UT_VERSION_INT >= 0x15000000 // 21.0 or later - Vulkan support
185+
#if UT_VERSION_INT >= 0x15000000 && defined(USE_VULKAN) // 21.0 or later - Vulkan support
186186
UT_UniquePtr<RV_Geometry> myGeoVk;
187187
UT_UniquePtr<RV_ShaderVariableSet> myVkObjectSet;
188188
UT_UniquePtr<RV_ShaderBlock> myVkObjectBlock;
@@ -623,7 +623,7 @@ GR_PrimVDBPoints::update(RE_RenderContext r,
623623
const GT_PrimitiveHandle &primh,
624624
const GR_UpdateParms &p)
625625
{
626-
#if UT_VERSION_INT >= 0x15000000 // 21.0 or later - Vulkan support
626+
#if UT_VERSION_INT >= 0x15000000 && defined(USE_VULKAN) // 21.0 or later - Vulkan support
627627
if (r.isVulkan())
628628
{
629629
if (p.reason & (GR_GEO_CHANGED | GR_GEO_TOPOLOGY_CHANGED))
@@ -790,7 +790,7 @@ GR_PrimVDBPoints::removeBuffer(const std::string& name)
790790
}
791791

792792

793-
#if UT_VERSION_INT >= 0x15000000 // 21.0 or later - Vulkan support
793+
#if UT_VERSION_INT >= 0x15000000 && defined(USE_VULKAN) // 21.0 or later - Vulkan support
794794

795795
void
796796
GR_PrimVDBPoints::updatePosBufferVk(RV_Render* r,
@@ -962,13 +962,13 @@ GR_PrimVDBPoints::updateVec3BufferVk(RV_Render* r,
962962
return true;
963963
}
964964

965-
#endif // UT_VERSION_INT >= 0x15000000
965+
#endif // UT_VERSION_INT >= 0x15000000 && defined(USE_VULKAN)
966966

967967

968968
void
969969
GR_PrimVDBPoints::render(RE_RenderContext r, GR_RenderMode, GR_RenderFlags, GR_DrawParms dp)
970970
{
971-
#if UT_VERSION_INT >= 0x15000000 // 21.0 or later - Vulkan support
971+
#if UT_VERSION_INT >= 0x15000000 && defined(USE_VULKAN) // 21.0 or later - Vulkan support
972972
if (r.isVulkan())
973973
{
974974
if (!myGeoVk) return;
@@ -1122,7 +1122,7 @@ GR_PrimVDBPoints::render(RE_RenderContext r, GR_RenderMode, GR_RenderFlags, GR_D
11221122
void
11231123
GR_PrimVDBPoints::renderDecoration(RE_RenderContext r, GR_Decoration decor, const GR_DecorationParms& p)
11241124
{
1125-
#if UT_VERSION_INT >= 0x15000000 // 21.0 or later - Vulkan support
1125+
#if UT_VERSION_INT >= 0x15000000 && defined(USE_VULKAN) // 21.0 or later - Vulkan support
11261126
if (r.isVulkan())
11271127
{
11281128
if (!myGeoVk) return;

0 commit comments

Comments
 (0)