i965/blorp: Use nir_alu_type for the texture data type

This lets us remove the brw_reg.h include

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>

diff --git a/src/mesa/drivers/dri/i965/blorp_blit.c b/src/mesa/drivers/dri/i965/blorp_blit.c
index 97cc506dd0f602c60eb6ddb81e4d3d037e035193..edbd726fb6ba1b99b8a62e0253625eceacdb1df0 100644 (file)
--- a/src/mesa/drivers/dri/i965/blorp_blit.c
+++ b/src/mesa/drivers/dri/i965/blorp_blit.c
@@ -25,6 +25,7 @@
 #include "main/teximage.h"
 #include "main/fbobject.h"
 
+#include "program/prog_instruction.h"
 #include "compiler/nir/nir_builder.h"
 
 #include "intel_fbo.h"
@@ -156,26 +157,13 @@ blorp_nir_discard_if_outside_rect(nir_builder *b, nir_ssa_def *pos,
 static nir_tex_instr *
 blorp_create_nir_tex_instr(nir_builder *b, struct brw_blorp_blit_vars *v,
                            nir_texop op, nir_ssa_def *pos, unsigned num_srcs,
-                           enum brw_reg_type dst_type)
+                           nir_alu_type dst_type)
 {
    nir_tex_instr *tex = nir_tex_instr_create(b->shader, num_srcs);
 
    tex->op = op;
 
-   switch (dst_type) {
-   case BRW_REGISTER_TYPE_F:
-      tex->dest_type = nir_type_float;
-      break;
-   case BRW_REGISTER_TYPE_D:
-      tex->dest_type = nir_type_int;
-      break;
-   case BRW_REGISTER_TYPE_UD:
-      tex->dest_type = nir_type_uint;
-      break;
-   default:
-      unreachable("Invalid texture return type");
-   }
-
+   tex->dest_type = dst_type;
    tex->is_array = false;
    tex->is_shadow = false;
 
@@ -204,7 +192,7 @@ blorp_create_nir_tex_instr(nir_builder *b, struct brw_blorp_blit_vars *v,
 
 static nir_ssa_def *
 blorp_nir_tex(nir_builder *b, struct brw_blorp_blit_vars *v,
-              nir_ssa_def *pos, enum brw_reg_type dst_type)
+              nir_ssa_def *pos, nir_alu_type dst_type)
 {
    nir_tex_instr *tex =
       blorp_create_nir_tex_instr(b, v, nir_texop_tex, pos, 2, dst_type);
@@ -221,7 +209,7 @@ blorp_nir_tex(nir_builder *b, struct brw_blorp_blit_vars *v,
 
 static nir_ssa_def *
 blorp_nir_txf(nir_builder *b, struct brw_blorp_blit_vars *v,
-              nir_ssa_def *pos, enum brw_reg_type dst_type)
+              nir_ssa_def *pos, nir_alu_type dst_type)
 {
    nir_tex_instr *tex =
       blorp_create_nir_tex_instr(b, v, nir_texop_txf, pos, 2, dst_type);
@@ -237,7 +225,7 @@ blorp_nir_txf(nir_builder *b, struct brw_blorp_blit_vars *v,
 
 static nir_ssa_def *
 blorp_nir_txf_ms(nir_builder *b, struct brw_blorp_blit_vars *v,
-                 nir_ssa_def *pos, nir_ssa_def *mcs, enum brw_reg_type dst_type)
+                 nir_ssa_def *pos, nir_ssa_def *mcs, nir_alu_type dst_type)
 {
    nir_tex_instr *tex =
       blorp_create_nir_tex_instr(b, v, nir_texop_txf_ms, pos,
@@ -268,7 +256,7 @@ blorp_nir_txf_ms_mcs(nir_builder *b, struct brw_blorp_blit_vars *v, nir_ssa_def
 {
    nir_tex_instr *tex =
       blorp_create_nir_tex_instr(b, v, nir_texop_txf_ms_mcs,
-                                 pos, 1, BRW_REGISTER_TYPE_D);
+                                 pos, 1, nir_type_int);
 
    tex->sampler_dim = GLSL_SAMPLER_DIM_MS;
 
@@ -607,7 +595,7 @@ static nir_ssa_def *
 blorp_nir_manual_blend_average(nir_builder *b, struct brw_blorp_blit_vars *v,
                                nir_ssa_def *pos, unsigned tex_samples,
                                enum isl_aux_usage tex_aux_usage,
-                               enum brw_reg_type dst_type)
+                               nir_alu_type dst_type)
 {
    /* If non-null, this is the outer-most if statement */
    nir_if *outer_if = NULL;
@@ -698,7 +686,7 @@ blorp_nir_manual_blend_average(nir_builder *b, struct brw_blorp_blit_vars *v,
          assert(stack_depth >= 2);
          --stack_depth;
 
-         assert(dst_type == BRW_REGISTER_TYPE_F);
+         assert(dst_type == nir_type_float);
          texture_data[stack_depth - 1] =
             nir_fadd(b, texture_data[stack_depth - 1],
                         texture_data[stack_depth]);
@@ -1425,11 +1413,11 @@ brw_blorp_blit(struct brw_context *brw,
    memset(&wm_prog_key, 0, sizeof(wm_prog_key));
 
    if (isl_format_has_sint_channel(params.src.view.format)) {
-      wm_prog_key.texture_data_type = BRW_REGISTER_TYPE_D;
+      wm_prog_key.texture_data_type = nir_type_int;
    } else if (isl_format_has_uint_channel(params.src.view.format)) {
-      wm_prog_key.texture_data_type = BRW_REGISTER_TYPE_UD;
+      wm_prog_key.texture_data_type = nir_type_uint;
    } else {
-      wm_prog_key.texture_data_type = BRW_REGISTER_TYPE_F;
+      wm_prog_key.texture_data_type = nir_type_float;
    }
 
    /* Scaled blitting or not. */

diff --git a/src/mesa/drivers/dri/i965/blorp_priv.h b/src/mesa/drivers/dri/i965/blorp_priv.h
index 0b3209518e9872f273c543326e4659bce4089db4..5fafe38b02d51ce40f24f3c4cbcd9384b8c4fe07 100644 (file)
--- a/src/mesa/drivers/dri/i965/blorp_priv.h
+++ b/src/mesa/drivers/dri/i965/blorp_priv.h
@@ -25,8 +25,9 @@
 
 #include <stdint.h>
 
+#include "compiler/nir/nir.h"
+
 #include "blorp.h"
-#include "brw_reg.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -233,9 +234,9 @@ struct brw_blorp_blit_prog_key
    enum isl_msaa_layout dst_layout;
 
    /* Type of the data to be read from the texture (one of
-    * BRW_REGISTER_TYPE_{UD,D,F}).
+    * nir_type_(int|uint|float)).
     */
-   enum brw_reg_type texture_data_type;
+   nir_alu_type texture_data_type;
 
    /* True if the source image is W tiled.  If true, the surface state for the
     * source image must be configured as Y tiled, and tex_samples must be 0.