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

i965/gs: Reuse gen6 constant push buffers setup code in gen7+.

Browse source 
The code required for gen6 and gen7+ is almost the same, so reuse it.

Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Samuel Iglesias Gonsalvez 2014-07-02 14:52:40 +02:00 • committed by Iago Toral Quiroga
parent 96012dfe80
commit 406e04113f
3 changed files with 7 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_state_upload.c
View file

@ -197,7 +197,7 @@ static const struct brw_tracked_state *gen7_atoms[] =
&gen6_depth_stencil_state, /* must do before cc unit */
&gen6_vs_push_constants, /* Before vs_state */
&gen7_gs_push_constants, /* Before gs_state */
&gen6_gs_push_constants, /* Before gs_state */
&gen6_wm_push_constants, /* Before wm_surfaces and constant_buffer */
/* Surface state setup. Must come before the VS/WM unit. The binding
@ -271,7 +271,7 @@ static const struct brw_tracked_state *gen8_atoms[] =
&gen6_color_calc_state,
&gen6_vs_push_constants, /* Before vs_state */
&gen7_gs_push_constants, /* Before gs_state */
&gen6_gs_push_constants, /* Before gs_state */
&gen6_wm_push_constants, /* Before wm_surfaces and constant_buffer */
/* Surface state setup. Must come before the VS/WM unit. The binding

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

@ -33,18 +33,22 @@
static void
gen6_upload_gs_push_constants(struct brw_context *brw)
{
struct brw_stage_state *stage_state = &brw->gs.base;
/* BRW_NEW_GEOMETRY_PROGRAM */
const struct brw_geometry_program *gp =
(struct brw_geometry_program *) brw->geometry_program;
if (gp) {
/* CACHE_NEW_GS_PROG */
struct brw_stage_state *stage_state = &brw->gs.base;
struct brw_stage_prog_data *prog_data = &brw->gs.prog_data->base.base;
gen6_upload_push_constants(brw, &gp->program.Base, prog_data,
stage_state, AUB_TRACE_VS_CONSTANTS);
}
if (brw->gen >= 7)
gen7_upload_constant_state(brw, stage_state, gp, _3DSTATE_CONSTANT_GS);
}
const struct brw_tracked_state gen6_gs_push_constants = {

33
src/mesa/drivers/dri/i965/gen7_gs_state.c
View file

@ -26,39 +26,6 @@
#include "brw_defines.h"
#include "intel_batchbuffer.h"
static void
gen7_upload_gs_push_constants(struct brw_context *brw)
{
const struct brw_stage_state *stage_state = &brw->gs.base;
/* BRW_NEW_GEOMETRY_PROGRAM */
const struct brw_geometry_program *gp =
(struct brw_geometry_program *) brw->geometry_program;
if (gp) {
/* CACHE_NEW_GS_PROG */
const struct brw_stage_prog_data *prog_data = &brw->gs.prog_data->base.base;
struct brw_stage_state *stage_state = &brw->gs.base;
gen6_upload_push_constants(brw, &gp->program.Base, prog_data,
stage_state, AUB_TRACE_VS_CONSTANTS);
}
gen7_upload_constant_state(brw, stage_state, gp, _3DSTATE_CONSTANT_GS);
}
const struct brw_tracked_state gen7_gs_push_constants = {
.dirty = {
.mesa = _NEW_TRANSFORM | _NEW_PROGRAM_CONSTANTS,
.brw = (BRW_NEW_BATCH |
BRW_NEW_GEOMETRY_PROGRAM |
BRW_NEW_PUSH_CONSTANT_ALLOCATION),
.cache = CACHE_NEW_GS_PROG,
},
.emit = gen7_upload_gs_push_constants,
};
static void
upload_gs_state(struct brw_context *brw)
{