summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorYong He <yonghe@outlook.com>2023-06-29 14:23:35 -0700
committerGitHub <noreply@github.com>2023-06-29 14:23:35 -0700
commit47d0e8abe4f2fe3c2eede35079676210d1db0b1a (patch)
tree32eedef9fa39875c9bd4f5014846d003a9695ff4 /source
parent7f0c27a5ac40c1658daa05affd585c3dd0bbf415 (diff)
Small fixes to GLSL-legalize and func-property prop. (#2950)
Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'source')
-rw-r--r--source/slang/slang-ir-glsl-legalize.cpp2
-rw-r--r--source/slang/slang-ir-propagate-func-properties.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/source/slang/slang-ir-glsl-legalize.cpp b/source/slang/slang-ir-glsl-legalize.cpp
index 216471d65..54eaa67a5 100644
--- a/source/slang/slang-ir-glsl-legalize.cpp
+++ b/source/slang/slang-ir-glsl-legalize.cpp
@@ -2807,7 +2807,7 @@ void legalizeConstantBufferLoadForGLSL(IRModule* module)
builder.setInsertBefore(load);
for (auto field : elementType->getFields())
{
- auto fieldAddr = builder.emitFieldAddress(field->getFieldType(), load->getPtr(), field->getKey());
+ auto fieldAddr = builder.emitFieldAddress(builder.getPtrType(field->getFieldType()), load->getPtr(), field->getKey());
auto fieldValue = builder.emitLoad(field->getFieldType(), fieldAddr);
elements.add(fieldValue);
}
diff --git a/source/slang/slang-ir-propagate-func-properties.cpp b/source/slang/slang-ir-propagate-func-properties.cpp
index f530e263d..df7869205 100644
--- a/source/slang/slang-ir-propagate-func-properties.cpp
+++ b/source/slang/slang-ir-propagate-func-properties.cpp
@@ -298,7 +298,6 @@ public:
hasSideEffectCall = true;
break;
}
- break;
}
}
if (hasSideEffectCall)