Skip to content

Revert TextureBakerPtr changes from #2301 #2485

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

Merged
jstone-lucasfilm merged 1 commit into from
Jul 10, 2025
Merged

Revert TextureBakerPtr changes from #2301 #2485

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions source/MaterialXRenderGlsl/TextureBaker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
MATERIALX_NAMESPACE_BEGIN

/// A shared pointer to a TextureBaker
using TextureBakerGlslPtr = shared_ptr<class TextureBakerGlsl>;
using TextureBakerPtr = shared_ptr<class TextureBakerGlsl>;

/// A vector of baked documents with their associated names.
using BakedDocumentVec = std::vector<std::pair<std::string, DocumentPtr>>;
Expand All @@ -29,9 +29,9 @@ using BakedDocumentVec = std::vector<std::pair<std::string, DocumentPtr>>;
class MX_RENDERGLSL_API TextureBakerGlsl : public TextureBaker<GlslRenderer, GlslShaderGenerator>
{
public:
static TextureBakerGlslPtr create(unsigned int width = 1024, unsigned int height = 1024, Image::BaseType baseType = Image::BaseType::UINT8)
static TextureBakerPtr create(unsigned int width = 1024, unsigned int height = 1024, Image::BaseType baseType = Image::BaseType::UINT8)
{
return TextureBakerGlslPtr(new TextureBakerGlsl(width, height, baseType));
return TextureBakerPtr(new TextureBakerGlsl(width, height, baseType));
}

TextureBakerGlsl(unsigned int width, unsigned int height, Image::BaseType baseType);
Expand Down
6 changes: 3 additions & 3 deletions source/MaterialXRenderMsl/TextureBaker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
MATERIALX_NAMESPACE_BEGIN

/// A shared pointer to a TextureBakerMsl
using TextureBakerMslPtr = shared_ptr<class TextureBakerMsl>;
using TextureBakerPtr = shared_ptr<class TextureBakerMsl>;

/// A vector of baked documents with their associated names.
using BakedDocumentVec = std::vector<std::pair<std::string, DocumentPtr>>;
Expand All @@ -31,9 +31,9 @@ using BakedDocumentVec = std::vector<std::pair<std::string, DocumentPtr>>;
class MX_RENDERMSL_API TextureBakerMsl : public TextureBaker<MslRenderer, MslShaderGenerator>
{
public:
static TextureBakerMslPtr create(unsigned int width = 1024, unsigned int height = 1024, Image::BaseType baseType = Image::BaseType::UINT8)
static TextureBakerPtr create(unsigned int width = 1024, unsigned int height = 1024, Image::BaseType baseType = Image::BaseType::UINT8)
{
return TextureBakerMslPtr(new TextureBakerMsl(width, height, baseType));
return TextureBakerPtr(new TextureBakerMsl(width, height, baseType));
}

protected:
Expand Down
8 changes: 8 additions & 0 deletions source/MaterialXView/RenderPipeline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@
#include <MaterialXCore/Value.h>
#include <MaterialXCore/Unit.h>

MATERIALX_NAMESPACE_BEGIN
#ifdef MATERIALXVIEW_METAL_BACKEND
using TextureBakerPtr = shared_ptr<class TextureBakerMsl>;
#else
using TextureBakerPtr = shared_ptr<class TextureBakerGlsl>;
#endif
MATERIALX_NAMESPACE_END

#include <memory>

namespace mx = MaterialX;
Expand Down
2 changes: 1 addition & 1 deletion source/MaterialXView/RenderPipelineGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ void GLRenderPipeline::bakeTextures()
// Construct a texture baker.
mx::Image::BaseType baseType = _viewer->_bakeHdr ? mx::Image::BaseType::FLOAT : mx::Image::BaseType::UINT8;
mx::UnsignedIntPair bakingRes = _viewer->computeBakingResolution(doc);
mx::TextureBakerGlslPtr baker = std::static_pointer_cast<mx::TextureBakerGlsl>(createTextureBaker(bakingRes.first, bakingRes.second, baseType));
mx::TextureBakerPtr baker = std::static_pointer_cast<mx::TextureBakerPtr::element_type>(createTextureBaker(bakingRes.first, bakingRes.second, baseType));
baker->setupUnitSystem(_viewer->_stdLib);
baker->setDistanceUnit(_viewer->_genContext.getOptions().targetDistanceUnit);
baker->setAverageImages(_viewer->_bakeAverage);
Expand Down
2 changes: 1 addition & 1 deletion source/MaterialXView/RenderPipelineMetal.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@
// Construct a texture baker.
mx::Image::BaseType baseType = _viewer->_bakeHdr ? mx::Image::BaseType::FLOAT : mx::Image::BaseType::UINT8;
mx::UnsignedIntPair bakingRes = _viewer->computeBakingResolution(doc);
mx::TextureBakerMslPtr baker = std::static_pointer_cast<mx::TextureBakerMsl>(createTextureBaker(bakingRes.first, bakingRes.second, baseType));
mx::TextureBakerPtr baker = std::static_pointer_cast<mx::TextureBakerPtr::element_type>(createTextureBaker(bakingRes.first, bakingRes.second, baseType));
baker->setupUnitSystem(_viewer->_stdLib);
baker->setDistanceUnit(_viewer->_genContext.getOptions().targetDistanceUnit);
baker->setAverageImages(_viewer->_bakeAverage);
Expand Down
2 changes: 1 addition & 1 deletion source/PyMaterialX/PyMaterialXRenderGlsl/PyTextureBaker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace mx = MaterialX;

void bindPyTextureBaker(py::module& mod)
{
py::class_<mx::TextureBakerGlsl, mx::GlslRenderer, mx::TextureBakerGlslPtr>(mod, "TextureBaker")
py::class_<mx::TextureBakerGlsl, mx::GlslRenderer, mx::TextureBakerPtr>(mod, "TextureBaker")
.def_static("create", &mx::TextureBakerGlsl::create)
.def("setExtension", &mx::TextureBakerGlsl::setExtension)
.def("getExtension", &mx::TextureBakerGlsl::getExtension)
Expand Down
2 changes: 1 addition & 1 deletion source/PyMaterialX/PyMaterialXRenderMsl/PyTextureBaker.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

void bindPyTextureBaker(py::module& mod)
{
py::class_<mx::TextureBakerMsl, mx::MslRenderer, mx::TextureBakerMslPtr>(mod, "TextureBaker")
py::class_<mx::TextureBakerMsl, mx::MslRenderer, mx::TextureBakerPtr>(mod, "TextureBaker")
.def_static("create", &mx::TextureBakerMsl::create)
.def("setExtension", &mx::TextureBakerMsl::setExtension)
.def("getExtension", &mx::TextureBakerMsl::getExtension)
Expand Down
⚡