Mesa (master): aco: improve GFX9 1D ddx/ddy assertion

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Feb 20 15:58:18 UTC 2020


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

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Thu Feb 20 10:41:55 2020 +0000

aco: improve GFX9 1D ddx/ddy assertion

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2547
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3890>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3890>

---

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

diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index 24be495dbb5..414fd811a30 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -7218,7 +7218,7 @@ void visit_tex(isel_context *ctx, nir_tex_instr *instr)
    /* pack derivatives */
    if (has_ddx || has_ddy) {
       if (instr->sampler_dim == GLSL_SAMPLER_DIM_1D && ctx->options->chip_class == GFX9) {
-         assert(has_ddx && has_ddy && ddy.size() == 1 && ddy.size() == 1);
+         assert(has_ddx && has_ddy && ddx.size() == 1 && ddy.size() == 1);
          Temp zero = bld.copy(bld.def(v1), Operand(0u));
          derivs = {ddy, zero, ddy, zero};
       } else {



More information about the mesa-commit mailing list