AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/nir: Take a nir_tex_instr and src index in brw_texture_offset

Browse Source 
This makes things a bit simpler and it's also more robust because it no
longer has a hard dependency on the offset being a 32-bit value.
This commit is contained in:
Jason Ekstrand
2019-03-27 17:34:10 -05:00
committed by Karol Herbst
parent 2a36699ed3
commit 6b1c398bcb
4 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/compiler/brw_shader.cpp
+16 -8
View File
@@ -129,14 +129,13 @@ brw_math_function(enum opcode op)
}
bool
brw_texture_offset(int *offsets, unsigned num_components, uint32_t *offset_bits)
brw_texture_offset(const nir_tex_instr *tex, unsigned src,
uint32_t *offset_bits_out)
{
if (!offsets) return false; /* nonconstant offset; caller will handle it. */
if (!nir_src_is_const(tex->src[src].src))
return false;
/* offset out of bounds; caller will handle it. */
for (unsigned i = 0; i < num_components; i++)
if (offsets[i] > 7 || offsets[i] < -8)
return false;
const unsigned num_components = nir_tex_instr_src_size(tex, src);
/* Combine all three offsets into a single unsigned dword:
*
@@ -144,11 +143,20 @@ brw_texture_offset(int *offsets, unsigned num_components, uint32_t *offset_bits)
* bits 7:4 - V Offset (Y component)
* bits 3:0 - R Offset (Z component)
*/
*offset_bits = 0;
uint32_t offset_bits = 0;
for (unsigned i = 0; i < num_components; i++) {
int offset = nir_src_comp_as_int(tex->src[src].src, i);
/* offset out of bounds; caller will handle it. */
if (offset > 7 || offset < -8)
return false;
const unsigned shift = 4 * (2 - i);
*offset_bits |= (offsets[i] << shift) & (0xF << shift);
offset_bits |= (offset << shift) & (0xF << shift);
}
*offset_bits_out = offset_bits;
return true;
}