xrRender: fixed load LOD textures

OpenXRay · Nov 8, 2018 · e55e462 · e55e462
1 parent 24fdd22
commit e55e462
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/Layers/xrRender/Shader.cpp b/src/Layers/xrRender/Shader.cpp
@@ -117,12 +117,12 @@ BOOL Shader::equal(Shader* S, int index)
     if(nullptr == E[index] || nullptr == S->E[index])
         return FALSE;
 
-    return (E[index] == S->E[index]);
+    return E[index]->equal(*S->E[index]);
 }
 
 BOOL Shader::equal(Shader* S)
 {
-    for (int i = 0; i < 4; i++)
+    for (int i = 0; i < 5; i++)
     {
         if (!equal(S, i))
             return FALSE;

diff --git a/src/Layers/xrRender/Shader.h b/src/Layers/xrRender/Shader.h
@@ -137,7 +137,6 @@ struct ECORE_API ShaderElement : public xr_resource_flagged
     ShaderElement();
     ~ShaderElement();
     BOOL equal(ShaderElement& S);
-    BOOL equal(ShaderElement* S);
 };
 using ref_selement = resptr_core<ShaderElement, resptr_base<ShaderElement>>;
 
@@ -147,7 +146,6 @@ struct ECORE_API Shader : public xr_resource_flagged
     ref_selement E[6]; // R1 - 0=norm_lod0(det), 1=norm_lod1(normal), 2=L_point, 3=L_spot, 4=L_for_models,
     // R2 - 0=deffer, 1=norm_lod1(normal), 2=psm, 3=ssm, 4=dsm
     ~Shader();
-    BOOL equal(Shader& S);
     BOOL equal(Shader* S);
     BOOL equal(Shader* S, int index);
 };