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

freedreno/a6xx: samplerBuffer fixes

Browse Source 
Use the 'UNK31' bit (which should probably be called 'BUFFER') for
samplerBuffer case, which increases the size of supported buffer
texture beyond 2^15 elements.

Also need to fix the 2nd coord injected to handle the tex instructions
that take integer coords.

Fixes dEQP-GLES31.functional.texture.texture_buffer.render.as_fragment_texture.buffer_size_131071
and similar

Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark
2019-02-20 17:33:23 -05:00
parent 50dd773a2d
commit 323958908e
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/freedreno/ir3/ir3_compiler_nir.c
+11 -2
View File
@@ -1573,9 +1573,18 @@ emit_tex(struct ir3_context *ctx, nir_tex_instr *tex)
if (coords == 1) {
/* hw doesn't do 1d, so we treat it as 2d with
* height of 1, and patch up the y coord.
* TODO: y coord should be (int)0 in some cases..
*/
src0[nsrc0++] = create_immed(b, fui(0.5));
switch (opc) {
case OPC_ISAM:
case OPC_ISAML:
case OPC_ISAMM:
/* These instructions expect integer coord: */
src0[nsrc0++] = create_immed(b, 0);
break;
default:
src0[nsrc0++] = create_immed(b, fui(0.5));
break;
}
}
if (tex->is_shadow && tex->op != nir_texop_lod)
src/gallium/drivers/freedreno/a6xx/fd6_texture.c
+4 -4
View File
@@ -260,11 +260,11 @@ fd6_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
lvl = 0;
so->texconst1 =
A6XX_TEX_CONST_1_WIDTH(elements) |
A6XX_TEX_CONST_1_HEIGHT(1);
A6XX_TEX_CONST_1_WIDTH(elements & MASK(15)) |
A6XX_TEX_CONST_1_HEIGHT(elements >> 15);
so->texconst2 =
A6XX_TEX_CONST_2_FETCHSIZE(fd6_pipe2fetchsize(format)) |
A6XX_TEX_CONST_2_PITCH(elements * rsc->cpp);
A6XX_TEX_CONST_2_UNK4 |
A6XX_TEX_CONST_2_UNK31;
so->offset = cso->u.buf.offset;
} else {
unsigned miplevels;
src/gallium/drivers/freedreno/freedreno_screen.c
+2 -2
View File
@@ -243,7 +243,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
if (is_a3xx(screen)) return 16;
if (is_a4xx(screen)) return 32;
if (is_a5xx(screen)) return 32;
if (is_a6xx(screen)) return 32;
if (is_a6xx(screen)) return 64;
return 0;
case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
/* We could possibly emulate more by pretending 2d/rect textures and
@@ -252,7 +252,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
if (is_a3xx(screen)) return 8192;
if (is_a4xx(screen)) return 16384;
if (is_a5xx(screen)) return 16384;
if (is_a6xx(screen)) return 16384;
if (is_a6xx(screen)) return 1 << 27;
return 0;
case PIPE_CAP_TEXTURE_FLOAT_LINEAR: