Skip to content

Commit e55e462

Browse files
committed
xrRender: fixed load LOD textures
1 parent 24fdd22 commit e55e462

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/Layers/xrRender/Shader.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@ BOOL Shader::equal(Shader* S, int index)
117117
if(nullptr == E[index] || nullptr == S->E[index])
118118
return FALSE;
119119

120-
return (E[index] == S->E[index]);
120+
return E[index]->equal(*S->E[index]);
121121
}
122122

123123
BOOL Shader::equal(Shader* S)
124124
{
125-
for (int i = 0; i < 4; i++)
125+
for (int i = 0; i < 5; i++)
126126
{
127127
if (!equal(S, i))
128128
return FALSE;

src/Layers/xrRender/Shader.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ struct ECORE_API ShaderElement : public xr_resource_flagged
137137
ShaderElement();
138138
~ShaderElement();
139139
BOOL equal(ShaderElement& S);
140-
BOOL equal(ShaderElement* S);
141140
};
142141
using ref_selement = resptr_core<ShaderElement, resptr_base<ShaderElement>>;
143142

@@ -147,7 +146,6 @@ struct ECORE_API Shader : public xr_resource_flagged
147146
ref_selement E[6]; // R1 - 0=norm_lod0(det), 1=norm_lod1(normal), 2=L_point, 3=L_spot, 4=L_for_models,
148147
// R2 - 0=deffer, 1=norm_lod1(normal), 2=psm, 3=ssm, 4=dsm
149148
~Shader();
150-
BOOL equal(Shader& S);
151149
BOOL equal(Shader* S);
152150
BOOL equal(Shader* S, int index);
153151
};

0 commit comments

Comments
 (0)