#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)
{
HSW_GS_MAX_THREADS_SHIFT : GEN6_GS_MAX_THREADS_SHIFT;
/* BRW_NEW_GEOMETRY_PROGRAM */
bool active = brw->geometry_program;
- /* CACHE_NEW_GS_PROG */
- const struct brw_vec4_prog_data *prog_data = &brw->gs.prog_data->base;
+ /* BRW_NEW_GS_PROG_DATA */
+ const struct brw_vue_prog_data *prog_data = &brw->gs.prog_data->base;
/**
* From Graphics BSpec: 3D-Media-GPGPU Engine > 3D Pipeline Stages >
if (brw->gs.prog_data->base.base.total_scratch) {
OUT_RELOC(stage_state->scratch_bo,
I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER,
- ffs(brw->gs.prog_data->base.base.total_scratch) - 11);
+ ffs(stage_state->per_thread_scratch) - 11);
} else {
OUT_BATCH(0);
}
GEN7_GS_CONTROL_DATA_HEADER_SIZE_SHIFT) |
((brw->gs.prog_data->invocations - 1) <<
GEN7_GS_INSTANCE_CONTROL_SHIFT) |
- brw->gs.prog_data->dispatch_mode |
+ SET_FIELD(prog_data->dispatch_mode, GEN7_GS_DISPATCH_MODE) |
GEN6_GS_STATISTICS_ENABLE |
(brw->gs.prog_data->include_primitive_id ?
GEN7_GS_INCLUDE_PRIMITIVE_ID : 0) |
const struct brw_tracked_state gen7_gs_state = {
.dirty = {
.mesa = _NEW_TRANSFORM,
- .brw = (BRW_NEW_CONTEXT |
- BRW_NEW_GEOMETRY_PROGRAM |
- BRW_NEW_BATCH),
- .cache = CACHE_NEW_GS_PROG
+ .brw = BRW_NEW_BATCH |
+ BRW_NEW_BLORP |
+ BRW_NEW_CONTEXT |
+ BRW_NEW_GEOMETRY_PROGRAM |
+ BRW_NEW_GS_PROG_DATA,
},
.emit = upload_gs_state,
};