Skip to content

OpenGL Shader expression types traverser #1544

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

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

OpenGL Shader expression types traverser #1544

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7e285d9
OpenGL Shader expression types
CedricGuillemet Jul 23, 2025
43a61f9
code format
CedricGuillemet Jul 23, 2025
81c330a
more format
CedricGuillemet Jul 23, 2025
46ce7d1
keep type for type to vec4
CedricGuillemet Jul 23, 2025
b43ab76
ivec4
CedricGuillemet Jul 23, 2025
3470266
casting insert
CedricGuillemet Jul 24, 2025
dcc8820
traverser test
CedricGuillemet Jul 29, 2025
001c5e8
Better conversion but still not OK
CedricGuillemet Jul 31, 2025
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
52 changes: 47 additions & 5 deletions Plugins/NativeEngine/Source/ShaderCompilerTraversers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ namespace Babylon::ShaderCompilerTraversers
publicType.qualifier = type.getQualifier();

publicType.basicType = EbtFloat;

publicType.setVector(4);

if (type.getArraySizes())
Expand Down Expand Up @@ -356,6 +357,40 @@ namespace Babylon::ShaderCompilerTraversers
}
else
{
if (binary->getLeft()->getBasicType() == EbtInt &&
binary->getRight()->getBasicType() == EbtFloat)
{
TConstUnion indexValue;
indexValue.setIConst(0);

TConstUnionArray indexArray(1);
indexArray[0] = indexValue;

TType indexType(EbtInt, EvqConst); // scalar int
TIntermConstantUnion* indexNode = new TIntermConstantUnion(indexArray, indexType);

TIntermBinary* accessX = new TIntermBinary(EOpIndexDirect);
accessX->setLeft(node);
accessX->setRight(indexNode);
accessX->setType(TType(EbtFloat, EvqTemporary, 1));

TPublicType publicTypeCast{};
publicTypeCast.basicType = EbtInt;
publicTypeCast.vectorSize = 1;
publicTypeCast.qualifier = node->getQualifier();

TType castType(publicTypeCast);
TIntermAggregate* castNode = new TIntermAggregate(EOpConvFloatToInt);
castNode->setType(castType);
castNode->getSequence().push_back(accessX);

if (node->getLoc().line != 0) {
castNode->setLoc(node->getLoc());
}

shapeConversion = castNode;
}

binary->setRight(shapeConversion);
}
}
Expand Down Expand Up @@ -395,6 +430,7 @@ namespace Babylon::ShaderCompilerTraversers
// create a shape conversion operation -- unless the uniform is an array, in which case
// it's slightly more complicated.
auto* parent = this->getParentNode();

if (symbol->isArray())
{
// Converting the shape of an element retrieved from an array is similar to converting
Expand All @@ -416,11 +452,14 @@ namespace Babylon::ShaderCompilerTraversers
auto* binType = newType.clone();
binType->clearArraySizes();
binary->setType(*binType);
auto shapeConversion = m_intermediate->addShapeConversion(*oldType, binary);

TIntermTyped* target = binary;

auto shapeConversion = m_intermediate->addShapeConversion(*oldType, target);

assert(this->path.size() > 1);
auto* grandparent = this->path[this->path.size() - 2];
injectShapeConversion(binary, grandparent, shapeConversion);
injectShapeConversion(target, grandparent, shapeConversion);
}
else
{
Expand All @@ -429,8 +468,10 @@ namespace Babylon::ShaderCompilerTraversers
}
else
{
auto shapeConversion = m_intermediate->addShapeConversion(*oldType, symbol);
injectShapeConversion(symbol, parent, shapeConversion);
TIntermTyped* target = symbol;

auto shapeConversion = m_intermediate->addShapeConversion(*oldType, target);
injectShapeConversion(target, parent, shapeConversion);
}
}

Expand All @@ -446,6 +487,7 @@ namespace Babylon::ShaderCompilerTraversers

TIntermediate* m_intermediate{};
AllocationsScope& m_scope;
std::vector<std::unique_ptr<TIntermAggregate>> casts{};
};

/// This traverser modifies all vertex attributes (position, UV, etc.) to conform to
Expand Down Expand Up @@ -937,4 +979,4 @@ namespace Babylon::ShaderCompilerTraversers
{
InvertYDerivativeOperandsTraverser::Traverse(program);
}
}
}
Loading