Mesa (master): glsl: simplify an assertion in lower_ubo_reference

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


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

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

glsl: simplify an assertion in lower_ubo_reference

Struct types are now equal when they're structurally equal.

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

---

 src/compiler/glsl/lower_ubo_reference.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/lower_ubo_reference.cpp b/src/compiler/glsl/lower_ubo_reference.cpp
index 71188459cd..163c25e706 100644
--- a/src/compiler/glsl/lower_ubo_reference.cpp
+++ b/src/compiler/glsl/lower_ubo_reference.cpp
@@ -893,7 +893,7 @@ lower_ubo_reference_visitor::check_for_buffer_struct_copy(ir_assignment *ir)
    if (!lhs_deref)
       return false;
 
-   assert(lhs_deref->type->record_compare(rhs_deref->type));
+   assert(lhs_deref->type == rhs_deref->type);
    void *mem_ctx = ralloc_parent(shader->ir);
 
    for (unsigned i = 0; i < lhs_deref->type->length; i++) {




More information about the mesa-commit mailing list