fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 06:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/builder: Return an integer from nir_get_texture_size

Browse source 
It's convenient in a bunch of cases for nir_get_texture_size to return a
float but it's very unexpected.  This fixes a bug in the R600 NIR code.

Fixes: f718ac6268 "r600/sfn: Add a basic nir shader backend"
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3897>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3897>
This commit is contained in:
Jason Ekstrand 2020-02-20 17:19:50 -06:00 • committed by Marge Bot
parent 265e234e23
commit 1598370aca
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/nir/nir_builtin_builder.c
View file

@ -375,7 +375,7 @@ nir_get_texture_size(nir_builder *b, nir_tex_instr *tex)
nir_tex_instr_dest_size(txs), 32, NULL);
nir_builder_instr_insert(b, &txs->instr);
return nir_i2f32(b, &txs->dest.ssa);
return &txs->dest.ssa;
}
nir_ssa_def *

11
src/compiler/nir/nir_lower_tex.c
View file

@ -126,7 +126,7 @@ lower_offset(nir_builder *b, nir_tex_instr *tex)
if (tex->sampler_dim == GLSL_SAMPLER_DIM_RECT) {
offset_coord = nir_fadd(b, coord, nir_i2f32(b, offset));
} else {
nir_ssa_def *txs = nir_get_texture_size(b, tex);
nir_ssa_def *txs = nir_i2f32(b, nir_get_texture_size(b, tex));
nir_ssa_def *scale = nir_frcp(b, txs);
offset_coord = nir_fadd(b, coord,
@ -168,7 +168,7 @@ lower_rect(nir_builder *b, nir_tex_instr *tex)
*/
tex->sampler_dim = GLSL_SAMPLER_DIM_2D;
nir_ssa_def *txs = nir_get_texture_size(b, tex);
nir_ssa_def *txs = nir_i2f32(b, nir_get_texture_size(b, tex));
nir_ssa_def *scale = nir_frcp(b, txs);
/* Walk through the sources normalizing the requested arguments. */
@ -405,7 +405,7 @@ lower_gradient_cube_map(nir_builder *b, nir_tex_instr *tex)
assert(tex->dest.is_ssa);
/* Use textureSize() to get the width and height of LOD 0 */
nir_ssa_def *size = nir_get_texture_size(b, tex);
nir_ssa_def *size = nir_i2f32(b, nir_get_texture_size(b, tex));
/* Cubemap texture lookups first generate a texture coordinate normalized
* to [-1, 1] on the appropiate face. The appropiate face is determined
@ -572,7 +572,8 @@ lower_gradient(nir_builder *b, nir_tex_instr *tex)
}
nir_ssa_def *size =
nir_channels(b, nir_get_texture_size(b, tex), component_mask);
nir_channels(b, nir_i2f32(b, nir_get_texture_size(b, tex)),
component_mask);
/* Scale the gradients by width and height. Effectively, the incoming
* gradients are s'(x,y), t'(x,y), and r'(x,y) from equation 3.19 in the
@ -634,7 +635,7 @@ saturate_src(nir_builder *b, nir_tex_instr *tex, unsigned sat_mask)
/* non-normalized texture coords, so clamp to texture
* size rather than [0.0, 1.0]
*/
nir_ssa_def *txs = nir_get_texture_size(b, tex);
nir_ssa_def *txs = nir_i2f32(b, nir_get_texture_size(b, tex));
comp[j] = nir_fmax(b, comp[j], nir_imm_float(b, 0.0));
comp[j] = nir_fmin(b, comp[j], nir_channel(b, txs, j));
} else {

2
src/gallium/drivers/r600/sfn/sfn_instruction_tex.cpp
View file

@ -246,7 +246,7 @@ bool lower_txl_txf_array_or_cube(nir_builder *b, nir_tex_instr *tex)
int min_lod_idx = nir_tex_instr_src_index(tex, nir_tex_src_min_lod);
assert (lod_idx >= 0 || bias_idx >= 0);
nir_ssa_def *size = nir_get_texture_size(b, tex);
nir_ssa_def *size = nir_i2f32(b, nir_get_texture_size(b, tex));
nir_ssa_def *lod = (lod_idx >= 0) ?
nir_ssa_for_src(b, tex->src[lod_idx].src, 1) :
nir_get_texture_lod(b, tex);