diff options
| author | Connor Abbott <cwabbott0@gmail.com> | 2020-12-08 13:38:41 +0100 |
|---|---|---|
| committer | Connor Abbott <cwabbott0@gmail.com> | 2021-01-25 11:21:53 +0100 |
| commit | ff0b7e0da93624f3727804927cdf92c4e3cce74e (patch) | |
| tree | 080728e16b55f7a26c1cfb464718af8da3a7442b | |
| parent | b2da598ff90fdd64ca72bb03bf269e53ee0b1f21 (diff) | |
st/mesa: Use sized types for nir_tex_instr::dest_type
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7989>
| -rw-r--r-- | src/mesa/state_tracker/st_cb_drawpixels.c | 8 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_pbo.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index 0564a694d44..030cddd7e0a 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -167,7 +167,7 @@ make_drawpix_z_stencil_program_nir(struct st_context *st, "gl_FragDepth"); out->data.location = FRAG_RESULT_DEPTH; nir_ssa_def *depth = sample_via_nir(&b, texcoord, "depth", 0, - GLSL_TYPE_FLOAT, nir_type_float); + GLSL_TYPE_FLOAT, nir_type_float32); nir_store_var(&b, out, depth, 0x1); /* Also copy color */ @@ -189,7 +189,7 @@ make_drawpix_z_stencil_program_nir(struct st_context *st, "gl_FragStencilRefARB"); out->data.location = FRAG_RESULT_STENCIL; nir_ssa_def *stencil = sample_via_nir(&b, texcoord, "stencil", 1, - GLSL_TYPE_UINT, nir_type_uint); + GLSL_TYPE_UINT, nir_type_uint32); nir_store_var(&b, out, stencil, 0x1); } @@ -213,9 +213,9 @@ make_drawpix_zs_to_color_program_nir(struct st_context *st, /* Sample depth and stencil */ nir_ssa_def *depth = sample_via_nir(&b, texcoord, "depth", 0, - GLSL_TYPE_FLOAT, nir_type_float); + GLSL_TYPE_FLOAT, nir_type_float32); nir_ssa_def *stencil = sample_via_nir(&b, texcoord, "stencil", 1, - GLSL_TYPE_UINT, nir_type_uint); + GLSL_TYPE_UINT, nir_type_uint32); /* Create the variable to store the output color */ nir_variable *color_out = diff --git a/src/mesa/state_tracker/st_pbo.c b/src/mesa/state_tracker/st_pbo.c index 0b5c90d30c7..29b71b9aa02 100644 --- a/src/mesa/state_tracker/st_pbo.c +++ b/src/mesa/state_tracker/st_pbo.c @@ -507,7 +507,7 @@ create_fs(struct st_context *st, bool download, tex->sampler_dim = glsl_get_sampler_dim(tex_var->type); tex->coord_components = glsl_get_sampler_coordinate_components(tex_var->type); - tex->dest_type = nir_type_float; + tex->dest_type = nir_type_float32; tex->src[0].src_type = nir_tex_src_texture_deref; tex->src[0].src = nir_src_for_ssa(&tex_deref->dest.ssa); tex->src[1].src_type = nir_tex_src_sampler_deref; |