Skip to content

Unify environment light texture handling in MaterialXRenderMsl #2870

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

Open
warrenm wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −40
Open

Unify environment light texture handling in MaterialXRenderMsl #2870

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
60 changes: 20 additions & 40 deletions source/MaterialXRenderMsl/MslPipelineStateObject.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ int GetStrideOfMetalType(MTLDataType type)
}

void MslProgram::bindTextures(id<MTLRenderCommandEncoder> renderCmdEncoder,
LightHandlerPtr lightHandler,
LightHandlerPtr /*lightHandler*/,
ImageHandlerPtr imageHandler)
{
const VariableBlock& publicUniforms = _shader->getStage(Stage::PIXEL).getUniformBlock(HW::PUBLIC_UNIFORMS);
Expand All @@ -590,32 +590,6 @@ int GetStrideOfMetalType(MTLDataType type)
{
bool found = false;

if (lightHandler)
{
// Bind environment lights.
ImageMap envLights =
{
{ HW::ENV_RADIANCE, lightHandler->getUsePrefilteredMap() ? lightHandler->getEnvPrefilteredMap() : lightHandler->getEnvRadianceMap() },
{ HW::ENV_IRRADIANCE, lightHandler->getEnvIrradianceMap() }
};
for (const auto& env : envLights)
{
std::string str(arg.name.UTF8String);
size_t loc = str.find(env.first);
if (loc != std::string::npos && env.second)
{
ImageSamplingProperties samplingProperties;
samplingProperties.uaddressMode = ImageSamplingProperties::AddressMode::PERIODIC;
samplingProperties.vaddressMode = ImageSamplingProperties::AddressMode::CLAMP;
samplingProperties.filterType = ImageSamplingProperties::FilterType::LINEAR;

static_cast<MaterialX::MetalTextureHandler*>(imageHandler.get())->bindImage(env.second, samplingProperties);
bindTexture(renderCmdEncoder, (unsigned int) arg.index, env.second, imageHandler);
found = true;
}
}
}

if (!found)
{
ImagePtr image = nullptr;
Expand Down Expand Up @@ -705,14 +679,23 @@ int GetStrideOfMetalType(MTLDataType type)
bindUniform(HW::ENV_MATRIX, Value::createValue(envRotation), false);
bindUniform(HW::ENV_RADIANCE_SAMPLES, Value::createValue(lightHandler->getEnvSampleCount()), false);
bindUniform(HW::ENV_LIGHT_INTENSITY, Value::createValue(lightHandler->getEnvLightIntensity()), false);
ImageMap envLights =
ImageMap envLights;
if (lightHandler->getIndirectLighting())
{
{ HW::ENV_RADIANCE, lightHandler->getEnvRadianceMap() },
{ HW::ENV_IRRADIANCE, lightHandler->getEnvIrradianceMap() }
};
for (const auto& env : envLights)
envLights[HW::ENV_RADIANCE] = lightHandler->getUsePrefilteredMap() ?
lightHandler->getEnvPrefilteredMap() :
lightHandler->getEnvRadianceMap();
envLights[HW::ENV_IRRADIANCE] = lightHandler->getEnvIrradianceMap();
}
else
{
auto iblUniform = uniformList.find(TEXTURE_NAME(env.first));
envLights[HW::ENV_RADIANCE] = imageHandler->getZeroImage();
envLights[HW::ENV_IRRADIANCE] = imageHandler->getZeroImage();
}
for (const auto& env : envLights) {
const auto uniformName = TEXTURE_NAME(env.first);

auto iblUniform = uniformList.find(uniformName);
MslProgram::InputPtr inputPtr = iblUniform != uniformList.end() ? iblUniform->second : nullptr;
if (inputPtr)
{
Expand All @@ -736,7 +719,7 @@ int GetStrideOfMetalType(MTLDataType type)
samplingProperties.uaddressMode = ImageSamplingProperties::AddressMode::PERIODIC;
samplingProperties.vaddressMode = ImageSamplingProperties::AddressMode::CLAMP;
samplingProperties.filterType = ImageSamplingProperties::FilterType::LINEAR;
imageHandler->bindImage(image, samplingProperties);
bindTexture(imageHandler, uniformName, image, samplingProperties);
}
}
}
Expand Down Expand Up @@ -976,12 +959,9 @@ int GetStrideOfMetalType(MTLDataType type)

if (arg.type == MTLArgumentTypeTexture)
{
if (HW::ENV_RADIANCE != arg.name.UTF8String && HW::ENV_IRRADIANCE != arg.name.UTF8String)
{
std::string texture_name = arg.name.UTF8String;
InputPtr inputPtr = std::make_shared<Input>(arg.index, MTLDataTypeTexture, -1, EMPTY_STRING);
_uniformList[texture_name] = inputPtr;
}
std::string texture_name = arg.name.UTF8String;
InputPtr inputPtr = std::make_shared<Input>(arg.index, MTLDataTypeTexture, -1, EMPTY_STRING);
_uniformList[texture_name] = inputPtr;
}
}

Expand Down
⚡