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

freedreno/a5xx: implement transform feedback resuming

Browse source 
Each transform feedback target should have a separate buffer
for an offset from which to resume, instead of just having
one buffer per binding point. Otherwise, if transform feedback
is paused and other tf object is bound - the offset of the
previous tf object would be lost.

Fixes CTS tests:
 dEQP-GLES3.functional.transform_feedback.*triangles*

Fixes Piglit tests:
 gl-3.1-primitive-restart-xfb flush
 gles-3.0-transform-feedback-uniform-buffer-object
 arb_transform_feedback2-change-objects-while-paused
 arb_transform_feedback2-change-objects-while-paused_gles3
 ext_transform_feedback-intervening-read

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8281>
This commit is contained in:
Danylo Piliaiev 2020-12-31 15:54:10 +02:00 • committed by Marge Bot
parent 49283041e8
commit 94b84f1eed
3 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci/deqp-freedreno-a530-fails.txt
View file

@ -11,29 +11,21 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_dst_y,Fail
dEQP-GLES3.functional.transform_feedback.array.interleaved.lines.lowp_float,Fail
dEQP-GLES3.functional.transform_feedback.array.interleaved.lines.mediump_int,Fail
dEQP-GLES3.functional.transform_feedback.array.interleaved.points.highp_mat3x2,Fail
dEQP-GLES3.functional.transform_feedback.array.interleaved.triangles.highp_mat2x3,Fail
dEQP-GLES3.functional.transform_feedback.array.interleaved.triangles.lowp_uvec3,Fail
dEQP-GLES3.functional.transform_feedback.array.separate.lines.highp_mat3x4,Fail
dEQP-GLES3.functional.transform_feedback.array.separate.points.lowp_mat2,Fail
dEQP-GLES3.functional.transform_feedback.array.separate.points.mediump_uint,Fail
dEQP-GLES3.functional.transform_feedback.array.separate.triangles.lowp_vec3,Fail
dEQP-GLES3.functional.transform_feedback.array.separate.triangles.mediump_ivec3,Fail
dEQP-GLES3.functional.transform_feedback.array_element.interleaved.lines.highp_uvec4,Fail
dEQP-GLES3.functional.transform_feedback.array_element.interleaved.points.highp_vec2,Fail
dEQP-GLES3.functional.transform_feedback.array_element.interleaved.points.lowp_ivec3,Fail
dEQP-GLES3.functional.transform_feedback.array_element.interleaved.triangles.lowp_int,Fail
dEQP-GLES3.functional.transform_feedback.array_element.separate.lines.highp_vec4,Fail
dEQP-GLES3.functional.transform_feedback.array_element.separate.lines.lowp_uint,Fail
dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.lines.lowp_mat2x4,Fail
dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.lines.mediump_uvec3,Fail
dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.points.highp_int,Fail
dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.points.mediump_float,Fail
dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.triangles.highp_mat4x3,Fail
dEQP-GLES3.functional.transform_feedback.basic_types.separate.lines.highp_ivec3,Fail
dEQP-GLES3.functional.transform_feedback.basic_types.separate.lines.mediump_vec3,Fail
dEQP-GLES3.functional.transform_feedback.basic_types.separate.points.lowp_mat4x2,Fail
dEQP-GLES3.functional.transform_feedback.basic_types.separate.triangles.lowp_mat3,Fail
dEQP-GLES3.functional.transform_feedback.interpolation.smooth.highp_vec4_triangles_separate,Fail
dEQP-GLES3.functional.transform_feedback.position.lines_separate,Fail
dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.3,Fail
dEQP-GLES3.functional.transform_feedback.random.separate.points.3,Fail

5
.gitlab-ci/piglit/freedreno-a530-gl.txt
View file

@ -519,7 +519,6 @@ spec/!opengl 3.0/clearbuffer-depth: fail
spec/!opengl 3.0/clearbuffer-stencil: fail
spec/!opengl 3.0/viewport-clamp: crash
spec/!opengl 3.1/minmax: fail
spec/!opengl 3.1/primitive-restart-xfb flush: fail
spec/!opengl 3.1/primitive-restart-xfb generated: fail
spec/!opengl 3.1/primitive-restart-xfb written: fail
spec/!opengl 3.1/vao-broken-attrib: crash
@ -595,7 +594,6 @@ spec/!opengl 4.5/compare-framebuffer-parameter-with-get: skip
spec/!opengl 4.5/named-framebuffer-draw-buffers-errors: skip
spec/!opengl 4.5/named-framebuffer-read-buffer-errors: skip
spec/!opengl es 2.0/invalid-es3-queries_gles2: skip
spec/!opengl es 3.0/gles-3.0-transform-feedback-uniform-buffer-object: fail
spec/3dfx_texture_compression_fxt1/compressedteximage gl_compressed_rgb_fxt1_3dfx: skip
spec/3dfx_texture_compression_fxt1/compressedteximage gl_compressed_rgba_fxt1_3dfx: skip
spec/3dfx_texture_compression_fxt1/fbo-generatemipmap-formats: skip
@ -1426,8 +1424,6 @@ spec/arb_texture_view/max-level: skip
spec/arb_texture_view/rendering-layers-image: skip
spec/arb_timer_query/query gl_timestamp: fail
spec/arb_timer_query/timestamp-get: fail
spec/arb_transform_feedback2/change objects while paused: fail
spec/arb_transform_feedback2/change objects while paused (gles3): fail
spec/arb_transform_feedback3/arb_transform_feedback3-begin_end: skip
spec/arb_transform_feedback3/arb_transform_feedback3-bind_buffer_invalid_index: skip
spec/arb_transform_feedback3/arb_transform_feedback3-draw_using_invalid_stream_index: skip
@ -1758,7 +1754,6 @@ spec/ext_transform_feedback/geometry-shaders-basic: skip
spec/ext_transform_feedback/immediate-reuse: fail
spec/ext_transform_feedback/immediate-reuse-index-buffer: fail
spec/ext_transform_feedback/immediate-reuse-uniform-buffer: fail
spec/ext_transform_feedback/intervening-read output: fail
spec/ext_transform_feedback/intervening-read output use_gs: skip
spec/ext_transform_feedback/intervening-read prims_generated use_gs: skip
spec/ext_transform_feedback/intervening-read prims_written: fail

40
src/gallium/drivers/freedreno/a5xx/fd5_emit.c
View file

@ -716,26 +716,40 @@ fd5_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
struct fd_streamout_stateobj *so = &ctx->streamout;
for (unsigned i = 0; i < so->num_targets; i++) {
struct pipe_stream_output_target *target = so->targets[i];
struct fd_stream_output_target *target = fd_stream_output_target(so->targets[i]);
if (!target)
continue;
unsigned offset = (so->offsets[i] * info->stride[i] * 4) +
target->buffer_offset;
OUT_PKT4(ring, REG_A5XX_VPC_SO_BUFFER_BASE_LO(i), 3);
/* VPC_SO[i].BUFFER_BASE_LO: */
OUT_RELOC(ring, fd_resource(target->buffer)->bo, 0, 0, 0);
OUT_RING(ring, target->buffer_size + offset);
OUT_RELOC(ring, fd_resource(target->base.buffer)->bo, 0, 0, 0);
OUT_RING(ring, target->base.buffer_size + target->base.buffer_offset);
OUT_PKT4(ring, REG_A5XX_VPC_SO_BUFFER_OFFSET(i), 3);
OUT_RING(ring, offset);
/* VPC_SO[i].FLUSH_BASE_LO/HI: */
// TODO just give hw a dummy addr for now.. we should
// be using this an then CP_MEM_TO_REG to set the
// VPC_SO[i].BUFFER_OFFSET for the next draw..
OUT_RELOC(ring, fd5_context(ctx)->blit_mem, 0x100, 0, 0);
struct fd_bo *offset_bo = fd_resource(target->offset_buf)->bo;
if (so->reset & (1 << i)) {
assert(so->offsets[i] == 0);
OUT_PKT7(ring, CP_MEM_WRITE, 3);
OUT_RELOC(ring, offset_bo, 0, 0, 0);
OUT_RING(ring, target->base.buffer_offset);
OUT_PKT4(ring, REG_A5XX_VPC_SO_BUFFER_OFFSET(i), 1);
OUT_RING(ring, target->base.buffer_offset);
} else {
OUT_PKT7(ring, CP_MEM_TO_REG, 3);
OUT_RING(ring, CP_MEM_TO_REG_0_REG(REG_A5XX_VPC_SO_BUFFER_OFFSET(i)) |
CP_MEM_TO_REG_0_SHIFT_BY_2 | CP_MEM_TO_REG_0_UNK31 |
CP_MEM_TO_REG_0_CNT(0));
OUT_RELOC(ring, offset_bo, 0, 0, 0);
}
// After a draw HW would write the new offset to offset_bo
OUT_PKT4(ring, REG_A5XX_VPC_SO_FLUSH_BASE_LO(i), 2);
OUT_RELOC(ring, offset_bo, 0, 0, 0);
so->reset &= ~(1 << i);
emit->streamout_mask |= (1 << i);
}