File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed
include/irr/ext/RadeonRays Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -52,10 +52,10 @@ class Manager final : public core::IReferenceCounted
52
52
53
53
54
54
auto posAttrID = mb->getPositionAttributeIx ();
55
- auto format = mb->getMeshDataAndFormat ()-> getAttribFormat (posAttrID);
55
+ auto format = mb->getAttribFormat (posAttrID);
56
56
assert (format==asset::EF_R32G32B32A32_SFLOAT||format==asset::EF_R32G32B32_SFLOAT);
57
57
58
- auto pType = mb->getPrimitiveType () ;
58
+ auto pType = mb->getPipeline ()-> getPrimitiveAssemblyParams (). primitiveType ;
59
59
switch (pType)
60
60
{
61
61
case asset::EPT_TRIANGLE_STRIP:
@@ -64,7 +64,7 @@ class Manager final : public core::IReferenceCounted
64
64
case asset::EPT_TRIANGLE_FAN:
65
65
maxIndexCount = core::max (((mb->getIndexCount ()-1u )/2u )*3u , maxIndexCount);
66
66
break ;
67
- case asset::EPT_TRIANGLES :
67
+ case asset::EPT_TRIANGLE_LIST :
68
68
maxIndexCount = core::max (mb->getIndexCount (), maxIndexCount);
69
69
break ;
70
70
default :
Original file line number Diff line number Diff line change @@ -101,6 +101,8 @@ set(irr_resources_to_embed
101
101
"irr/builtin/glsl/utils/indirect_commands.glsl"
102
102
"irr/builtin/glsl/utils/common.glsl"
103
103
"irr/builtin/glsl/utils/culling.glsl"
104
+ "irr/builtin/glsl/utils/normal_decode.glsl"
105
+ "irr/builtin/glsl/utils/normal_encode.glsl"
104
106
"irr/builtin/glsl/utils/transform.glsl"
105
107
# virtual texturing
106
108
"irr/builtin/glsl/virtual_texturing/descriptors.glsl"
You can’t perform that action at this time.
0 commit comments