i965: Update the code that disables unused shader stages for Broadwell.
v2: Also disable 3DSTATE_WM_CHROMAKEY for safety. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> [v1]
This commit is contained in:
parent
3d3c351cfb
commit
fd91ab662d
|
@ -143,6 +143,7 @@ i965_FILES = \
|
|||
gen7_wm_surface_state.c \
|
||||
gen8_blend_state.c \
|
||||
gen8_disasm.c \
|
||||
gen8_disable.c \
|
||||
gen8_draw_upload.c \
|
||||
gen8_fs_generator.cpp \
|
||||
gen8_generator.cpp \
|
||||
|
|
|
@ -1422,6 +1422,8 @@ enum brw_message_target {
|
|||
|
||||
#define _3DSTATE_VF_TOPOLOGY 0x784b /* GEN8+ */
|
||||
|
||||
#define _3DSTATE_WM_CHROMAKEY 0x784c /* GEN8+ */
|
||||
|
||||
#define _3DSTATE_URB_VS 0x7830 /* GEN7+ */
|
||||
#define _3DSTATE_URB_HS 0x7831 /* GEN7+ */
|
||||
#define _3DSTATE_URB_DS 0x7832 /* GEN7+ */
|
||||
|
|
|
@ -131,6 +131,7 @@ extern const struct brw_tracked_state gen7_urb;
|
|||
extern const struct brw_tracked_state gen7_vs_state;
|
||||
extern const struct brw_tracked_state gen7_wm_state;
|
||||
extern const struct brw_tracked_state haswell_cut_index;
|
||||
extern const struct brw_tracked_state gen8_disable_stages;
|
||||
extern const struct brw_tracked_state gen8_index_buffer;
|
||||
extern const struct brw_tracked_state gen8_ps_blend;
|
||||
extern const struct brw_tracked_state gen8_ps_extra;
|
||||
|
|
|
@ -296,7 +296,7 @@ static const struct brw_tracked_state *gen8_atoms[] =
|
|||
&brw_gs_samplers,
|
||||
&gen6_multisample_state,
|
||||
|
||||
&gen7_disable_stages,
|
||||
&gen8_disable_stages,
|
||||
&gen8_vs_state,
|
||||
&gen7_gs_state,
|
||||
&gen7_sol_state,
|
||||
|
|
|
@ -0,0 +1,117 @@
|
|||
/*
|
||||
* Copyright © 2011 Intel Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "brw_context.h"
|
||||
#include "brw_state.h"
|
||||
#include "brw_defines.h"
|
||||
#include "intel_batchbuffer.h"
|
||||
|
||||
static void
|
||||
disable_stages(struct brw_context *brw)
|
||||
{
|
||||
/* Disable the HS Unit */
|
||||
BEGIN_BATCH(11);
|
||||
OUT_BATCH(_3DSTATE_CONSTANT_HS << 16 | (11 - 2));
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
ADVANCE_BATCH();
|
||||
|
||||
BEGIN_BATCH(9);
|
||||
OUT_BATCH(_3DSTATE_HS << 16 | (9 - 2));
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
ADVANCE_BATCH();
|
||||
|
||||
BEGIN_BATCH(2);
|
||||
OUT_BATCH(_3DSTATE_BINDING_TABLE_POINTERS_HS << 16 | (2 - 2));
|
||||
OUT_BATCH(0);
|
||||
ADVANCE_BATCH();
|
||||
|
||||
/* Disable the TE */
|
||||
BEGIN_BATCH(4);
|
||||
OUT_BATCH(_3DSTATE_TE << 16 | (4 - 2));
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
ADVANCE_BATCH();
|
||||
|
||||
/* Disable the DS Unit */
|
||||
BEGIN_BATCH(11);
|
||||
OUT_BATCH(_3DSTATE_CONSTANT_DS << 16 | (11 - 2));
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
ADVANCE_BATCH();
|
||||
|
||||
BEGIN_BATCH(9);
|
||||
OUT_BATCH(_3DSTATE_DS << 16 | (9 - 2));
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
OUT_BATCH(0);
|
||||
ADVANCE_BATCH();
|
||||
|
||||
BEGIN_BATCH(2);
|
||||
OUT_BATCH(_3DSTATE_BINDING_TABLE_POINTERS_DS << 16 | (2 - 2));
|
||||
OUT_BATCH(0);
|
||||
ADVANCE_BATCH();
|
||||
|
||||
BEGIN_BATCH(2);
|
||||
OUT_BATCH(_3DSTATE_WM_CHROMAKEY << 16 | (2 - 2));
|
||||
OUT_BATCH(0);
|
||||
ADVANCE_BATCH();
|
||||
}
|
||||
|
||||
const struct brw_tracked_state gen8_disable_stages = {
|
||||
.dirty = {
|
||||
.mesa = 0,
|
||||
.brw = BRW_NEW_CONTEXT,
|
||||
.cache = 0,
|
||||
},
|
||||
.emit = disable_stages,
|
||||
};
|
Loading…
Reference in New Issue