Lazy-init convolution on OpenGL, and don't rebuild the map afterwards

AcademySoftwareFoundation · Sep 18, 2023 · 14ab9e9 · 14ab9e9
1 parent 5439181
commit 14ab9e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/source/MaterialXRender/LightHandler.h b/source/MaterialXRender/LightHandler.h
@@ -38,7 +38,8 @@ class MX_RENDER_API LightHandler
  _directLighting(true),
  _indirectLighting(true),
  _envSampleCount(DEFAULT_ENV_SAMPLE_COUNT),
- _refractionTwoSided(false)
+ _refractionTwoSided(false),
+ _envRadianceMapPreConvolved(nullptr)
  {
  }
  virtual ~LightHandler() { }

diff --git a/source/MaterialXView/RenderPipelineGL.cpp b/source/MaterialXView/RenderPipelineGL.cpp
@@ -115,7 +115,11 @@ void GLRenderPipeline::convolveEnvironment()
  auto& genContext = _viewer->_genContext;
  auto& lightHandler = _viewer->_lightHandler;
  auto& imageHandler = _viewer->_imageHandler;
- mx::GLTextureHandlerPtr glImageHandler = std::dynamic_pointer_cast<mx::GLTextureHandler>(imageHandler);
+
+ if (lightHandler->getEnvRadianceMapPreConvolved())
+ {
+ return;
+ }
 
  // Create the convolution shader.
  mx::GlslMaterialPtr material = nullptr;
@@ -137,6 +141,7 @@ void GLRenderPipeline::convolveEnvironment()
  int numMips = srcTex->getMaxMipCount();
 
  // Create texture to hold the convolved environment.
+ mx::GLTextureHandlerPtr glImageHandler = std::dynamic_pointer_cast<mx::GLTextureHandler>(imageHandler);
  mx::ImagePtr outTex = mx::Image::create(w, h, 3, mx::Image::BaseType::HALF);
  glImageHandler->createRenderResources(outTex, true);
 

diff --git a/source/MaterialXView/RenderPipelineMetal.mm b/source/MaterialXView/RenderPipelineMetal.mm
@@ -160,7 +160,6 @@
  auto& genContext = _viewer->_genContext;
  auto& lightHandler = _viewer->_lightHandler;
  auto& imageHandler = _viewer->_imageHandler;
- mx::MetalTextureHandlerPtr mtlImageHandler = std::dynamic_pointer_cast<mx::MetalTextureHandler>(imageHandler);
 
  if (lightHandler->getEnvRadianceMapPreConvolved())
  {
@@ -171,6 +170,7 @@
  int w = srcTex->getWidth();
  int h = srcTex->getHeight();
 
+ mx::MetalTextureHandlerPtr mtlImageHandler = std::dynamic_pointer_cast<mx::MetalTextureHandler>(imageHandler);
  mx::ImagePtr outTex = mx::Image::create(w, h, 3, mx::Image::BaseType::HALF);
  mtlImageHandler->createRenderResources(outTex, true);
  id<MTLTexture> metalTex = mtlImageHandler->getAssociatedMetalTexture(outTex);