Skip to content

Commit d415c9c

Browse files
fix compile issues
1 parent 4f86042 commit d415c9c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

include/irr/ext/RadeonRays/RadeonRays.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ class Manager final : public core::IReferenceCounted
5252

5353

5454
auto posAttrID = mb->getPositionAttributeIx();
55-
auto format = mb->getMeshDataAndFormat()->getAttribFormat(posAttrID);
55+
auto format = mb->getAttribFormat(posAttrID);
5656
assert(format==asset::EF_R32G32B32A32_SFLOAT||format==asset::EF_R32G32B32_SFLOAT);
5757

58-
auto pType = mb->getPrimitiveType();
58+
auto pType = mb->getPipeline()->getPrimitiveAssemblyParams().primitiveType;
5959
switch (pType)
6060
{
6161
case asset::EPT_TRIANGLE_STRIP:
@@ -64,7 +64,7 @@ class Manager final : public core::IReferenceCounted
6464
case asset::EPT_TRIANGLE_FAN:
6565
maxIndexCount = core::max(((mb->getIndexCount()-1u)/2u)*3u, maxIndexCount);
6666
break;
67-
case asset::EPT_TRIANGLES:
67+
case asset::EPT_TRIANGLE_LIST:
6868
maxIndexCount = core::max(mb->getIndexCount(), maxIndexCount);
6969
break;
7070
default:

src/irr/builtin/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ set(irr_resources_to_embed
101101
"irr/builtin/glsl/utils/indirect_commands.glsl"
102102
"irr/builtin/glsl/utils/common.glsl"
103103
"irr/builtin/glsl/utils/culling.glsl"
104+
"irr/builtin/glsl/utils/normal_decode.glsl"
105+
"irr/builtin/glsl/utils/normal_encode.glsl"
104106
"irr/builtin/glsl/utils/transform.glsl"
105107
# virtual texturing
106108
"irr/builtin/glsl/virtual_texturing/descriptors.glsl"

0 commit comments

Comments
 (0)