Skip to content
Snippets Groups Projects
Commit 11303714 authored by Emma Anholt's avatar Emma Anholt
Browse files

i965: Merge gen8_upload_constant_state into gen7_upload_constant_state.


The two paths are really similar, and the extra conditionals will be
dwarfed by the cost of the actual upload.

Reviewed-by: Kenneth Graunke's avatarKenneth Graunke <kenneth@whitecape.org>
parent 51b79a65
No related branches found
No related tags found
No related merge requests found
......@@ -269,11 +269,6 @@ gen7_upload_constant_state(struct brw_context *brw,
const struct brw_stage_state *stage_state,
bool active, unsigned opcode);
/* gen8_vs_state.c */
void
gen8_upload_constant_state(struct brw_context *brw,
const struct brw_stage_state *stage_state,
bool active, unsigned opcode);
#ifdef __cplusplus
}
#endif
......
......@@ -35,20 +35,30 @@ gen7_upload_constant_state(struct brw_context *brw,
const struct brw_stage_state *stage_state,
bool active, unsigned opcode)
{
uint32_t mocs = brw->gen < 8 ? GEN7_MOCS_L3 : 0;
/* Disable if the shader stage is inactive or there are no push constants. */
active = active && stage_state->push_const_size != 0;
BEGIN_BATCH(7);
OUT_BATCH(opcode << 16 | (7 - 2));
int dwords = brw->gen >= 8 ? 11 : 7;
BEGIN_BATCH(dwords);
OUT_BATCH(opcode << 16 | (dwords - 2));
OUT_BATCH(active ? stage_state->push_const_size : 0);
OUT_BATCH(0);
/* Pointer to the constant buffer. Covered by the set of state flags
* from gen6_prepare_wm_contants
*/
OUT_BATCH(active ? (stage_state->push_const_offset | GEN7_MOCS_L3) : 0);
OUT_BATCH(active ? (stage_state->push_const_offset | mocs) : 0);
OUT_BATCH(0);
OUT_BATCH(0);
OUT_BATCH(0);
if (brw->gen >= 8) {
OUT_BATCH(0);
OUT_BATCH(0);
OUT_BATCH(0);
OUT_BATCH(0);
}
ADVANCE_BATCH();
}
......
......@@ -36,7 +36,7 @@ gen8_upload_gs_state(struct brw_context *brw)
/* CACHE_NEW_GS_PROG */
const struct brw_vec4_prog_data *prog_data = &brw->gs.prog_data->base;
gen8_upload_constant_state(brw, stage_state, active, _3DSTATE_CONSTANT_GS);
gen7_upload_constant_state(brw, stage_state, active, _3DSTATE_CONSTANT_GS);
if (active) {
int urb_entry_write_offset = 1;
......
......@@ -137,7 +137,7 @@ upload_ps_state(struct brw_context *brw)
uint32_t dw3 = 0, dw6 = 0, dw7 = 0;
/* CACHE_NEW_WM_PROG */
gen8_upload_constant_state(brw, &brw->wm.base, true, _3DSTATE_CONSTANT_PS);
gen7_upload_constant_state(brw, &brw->wm.base, true, _3DSTATE_CONSTANT_PS);
/* Initialize the execution mask with VMask. Otherwise, derivatives are
* incorrect for subspans where some of the pixels are unlit. We believe
......
......@@ -29,29 +29,6 @@
#include "program/prog_statevars.h"
#include "intel_batchbuffer.h"
void
gen8_upload_constant_state(struct brw_context *brw,
const struct brw_stage_state *stage_state,
bool active, unsigned opcode)
{
/* Disable if the shader stage is inactive or there are no push constants. */
active = active && stage_state->push_const_size != 0;
BEGIN_BATCH(11);
OUT_BATCH(opcode << 16 | (11 - 2));
OUT_BATCH(active ? stage_state->push_const_size : 0);
OUT_BATCH(0);
OUT_BATCH(active ? stage_state->push_const_offset : 0);
OUT_BATCH(0);
OUT_BATCH(0);
OUT_BATCH(0);
OUT_BATCH(0);
OUT_BATCH(0);
OUT_BATCH(0);
OUT_BATCH(0);
ADVANCE_BATCH();
}
static void
upload_vs_state(struct brw_context *brw)
{
......@@ -62,7 +39,7 @@ upload_vs_state(struct brw_context *brw)
/* CACHE_NEW_VS_PROG */
const struct brw_vec4_prog_data *prog_data = &brw->vs.prog_data->base;
gen8_upload_constant_state(brw, stage_state, true /* active */,
gen7_upload_constant_state(brw, stage_state, true /* active */,
_3DSTATE_CONSTANT_VS);
/* Use ALT floating point mode for ARB vertex programs, because they
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment