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

ilo: do not need last shader stage for 3DSTATE_SBE

Browse source 
We have set up 3DSTATE_SBE (or 3DSTATE_SF on GEN6) in
ilo_shader_select_kernel_routing().  There is no need to pass the last shader
stage to the GPE function.
This commit is contained in:
Chia-I Wu 2013-08-22 14:59:03 +08:00
parent 627d7ca763
commit b6037e734e
4 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c
View file

@ -626,10 +626,8 @@ gen6_pipeline_sf(struct ilo_3d_pipeline *p,
struct gen6_pipeline_session *session)
{
/* 3DSTATE_SF */
if (DIRTY(RASTERIZER) || DIRTY(VS) || DIRTY(GS) || DIRTY(FS)) {
gen6_emit_3DSTATE_SF(p->dev, ilo->rasterizer, ilo->fs,
(ilo->gs) ? ilo->gs : ilo->vs, p->cp);
}
if (DIRTY(RASTERIZER) || DIRTY(FS))
gen6_emit_3DSTATE_SF(p->dev, ilo->rasterizer, ilo->fs, p->cp);
}
void

6
src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c
View file

@ -451,10 +451,8 @@ gen7_pipeline_sf(struct ilo_3d_pipeline *p,
struct gen6_pipeline_session *session)
{
/* 3DSTATE_SBE */
if (DIRTY(RASTERIZER) || DIRTY(VS) || DIRTY(GS) || DIRTY(FS)) {
gen7_emit_3DSTATE_SBE(p->dev, ilo->rasterizer, ilo->fs,
(ilo->gs) ? ilo->gs : ilo->vs, ilo->cp);
}
if (DIRTY(RASTERIZER) || DIRTY(FS))
gen7_emit_3DSTATE_SBE(p->dev, ilo->rasterizer, ilo->fs, ilo->cp);
/* 3DSTATE_SF */
if (DIRTY(RASTERIZER) || DIRTY(FB)) {

4
src/gallium/drivers/ilo/ilo_gpe_gen6.h
View file

@ -261,7 +261,6 @@ static inline void
ilo_gpe_gen6_fill_3dstate_sf_sbe(const struct ilo_dev_info *dev,
const struct ilo_rasterizer_state *rasterizer,
const struct ilo_shader_state *fs,
const struct ilo_shader_state *last_sh,
uint32_t *dw, int num_dwords)
{
int output_count, vue_offset, vue_len;
@ -1187,7 +1186,6 @@ static inline void
gen6_emit_3DSTATE_SF(const struct ilo_dev_info *dev,
const struct ilo_rasterizer_state *rasterizer,
const struct ilo_shader_state *fs,
const struct ilo_shader_state *last_sh,
struct ilo_cp *cp)
{
const uint32_t cmd = ILO_GPE_CMD(0x3, 0x0, 0x13);
@ -1199,7 +1197,7 @@ gen6_emit_3DSTATE_SF(const struct ilo_dev_info *dev,
ilo_gpe_gen6_fill_3dstate_sf_raster(dev, rasterizer,
1, PIPE_FORMAT_NONE, payload_raster, Elements(payload_raster));
ilo_gpe_gen6_fill_3dstate_sf_sbe(dev, rasterizer,
fs, last_sh, payload_sbe, Elements(payload_sbe));
fs, payload_sbe, Elements(payload_sbe));
ilo_cp_begin(cp, cmd_len);
ilo_cp_write(cp, cmd | (cmd_len - 2));

4
src/gallium/drivers/ilo/ilo_gpe_gen7.h
View file

@ -580,7 +580,6 @@ static inline void
gen7_emit_3DSTATE_SBE(const struct ilo_dev_info *dev,
const struct ilo_rasterizer_state *rasterizer,
const struct ilo_shader_state *fs,
const struct ilo_shader_state *last_sh,
struct ilo_cp *cp)
{
const uint32_t cmd = ILO_GPE_CMD(0x3, 0x0, 0x1f);
@ -589,8 +588,7 @@ gen7_emit_3DSTATE_SBE(const struct ilo_dev_info *dev,
ILO_GPE_VALID_GEN(dev, 7, 7);
ilo_gpe_gen6_fill_3dstate_sf_sbe(dev, rasterizer,
fs, last_sh, dw, Elements(dw));
ilo_gpe_gen6_fill_3dstate_sf_sbe(dev, rasterizer, fs, dw, Elements(dw));
ilo_cp_begin(cp, cmd_len);
ilo_cp_write(cp, cmd | (cmd_len - 2));