fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 04:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/gen6/gs: Enable transform feedback support in geometry shaders

Browse source 
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Samuel Iglesias Gonsalvez 2014-07-18 13:04:36 +02:00 • committed by Iago Toral Quiroga
parent c66165ab2b
commit 6947a8a593
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/dri/i965/brw_vec4_gs.c
View file

@ -105,6 +105,12 @@ do_gs_prog(struct brw_context *brw,
} else {
/* There are no control data bits in gen6. */
c.control_data_bits_per_vertex = 0;
/* If it is using transform feedback, enable it */
if (prog->TransformFeedback.NumVarying)
c.prog_data.gen6_xfb_enabled = true;
else
c.prog_data.gen6_xfb_enabled = false;
}
c.control_data_header_size_bits =
gp->program.VerticesOut * c.control_data_bits_per_vertex;

13
src/mesa/drivers/dri/i965/gen6_gs_state.c
View file

@ -154,10 +154,7 @@ upload_gs_state(struct brw_context *brw)
GEN6_GS_SO_STATISTICS_ENABLE |
GEN6_GS_RENDERING_ENABLE);
/* FIXME: Enable SVBI payload only when TF is enable in SNB for
* user-provided GS.
*/
if (0) {
if (brw->gs.prog_data->gen6_xfb_enabled) {
/* GEN6_GS_REORDER is equivalent to GEN7_GS_REORDER_TRAILING
* in gen7. SNB and IVB specs are the same regarding the reordering of
* TRISTRIP/TRISTRIP_REV vertices and triangle orientation, so we do
@ -166,9 +163,6 @@ upload_gs_state(struct brw_context *brw)
*/
OUT_BATCH(GEN6_GS_REORDER |
GEN6_GS_SVBI_PAYLOAD_ENABLE |
GEN6_GS_SVBI_POSTINCREMENT_ENABLE |
/* FIXME: prog_data->svbi_postincrement_value instead of 0 */
(0 << GEN6_GS_SVBI_POSTINCREMENT_VALUE_SHIFT) |
GEN6_GS_ENABLE);
} else {
OUT_BATCH(GEN6_GS_REORDER | GEN6_GS_ENABLE);
@ -202,7 +196,10 @@ upload_gs_state(struct brw_context *brw)
const struct brw_tracked_state gen6_gs_state = {
.dirty = {
.mesa = _NEW_TRANSFORM | _NEW_PROGRAM_CONSTANTS,
.brw = BRW_NEW_CONTEXT | BRW_NEW_PUSH_CONSTANT_ALLOCATION,
.brw = (BRW_NEW_CONTEXT |
BRW_NEW_PUSH_CONSTANT_ALLOCATION |
BRW_NEW_GEOMETRY_PROGRAM |
BRW_NEW_BATCH),
.cache = (CACHE_NEW_GS_PROG | CACHE_NEW_FF_GS_PROG)
},
.emit = upload_gs_state,