Mesa (master): nir/tex: Use the correct return size for query_levels and lod

Jason Ekstrand jekstrand at kemper.freedesktop.org
Thu Apr 23 01:11:07 UTC 2015


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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Apr  9 21:04:21 2015 -0700

nir/tex: Use the correct return size for query_levels and lod

Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>

---

 src/glsl/nir/nir.h |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h
index c07a955..41e2120 100644
--- a/src/glsl/nir/nir.h
+++ b/src/glsl/nir/nir.h
@@ -986,9 +986,12 @@ nir_tex_instr_dest_size(nir_tex_instr *instr)
       return ret;
    }
 
-   case nir_texop_query_levels:
+   case nir_texop_lod:
       return 2;
 
+   case nir_texop_query_levels:
+      return 1;
+
    default:
       if (instr->is_shadow && instr->is_new_style_shadow)
          return 1;




More information about the mesa-commit mailing list