Mesa (master): glsl: simplify validate_intrastage_arrays

Nicolai Hähnle nh at kemper.freedesktop.org
Tue Jun 13 07:36:29 UTC 2017


Module: Mesa
Branch: master
Commit: de32c8378cd2ba8d6a16351ccac1ae42fee60b77
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=de32c8378cd2ba8d6a16351ccac1ae42fee60b77

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Mon May 15 08:32:21 2017 +0200

glsl: simplify validate_intrastage_arrays

Struct types are now equal when they are structurally equal.

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/compiler/glsl/linker.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 20465db67f..adfa3b7b1d 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -850,14 +850,6 @@ validate_intrastage_arrays(struct gl_shader_program *prog,
             }
             return true;
          }
-      } else {
-         /* The arrays of structs could have different glsl_type pointers but
-          * they are actually the same type. Use record_compare() to check that.
-          */
-         if (existing->type->fields.array->is_record() &&
-             var->type->fields.array->is_record() &&
-             existing->type->fields.array->record_compare(var->type->fields.array))
-            return true;
       }
    }
    return false;




More information about the mesa-commit mailing list