From 608a65ebca27668ad060c0735e9209c3fef12d31 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sun, 7 May 2017 22:59:38 -0700 Subject: [PATCH] i965: Drop BRW_NEW_PUSH_CONSTANT_ALLOCATION from Gen6 code. Gen6 doesn't have a configurable push constant region. This is only used on Gen7+. Reviewed-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/genX_state_upload.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c index f3a7e72a373..6619d4d7ab1 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c @@ -1685,9 +1685,7 @@ static const struct brw_tracked_state genX(wm_state) = { (GEN_GEN < 7 ? _NEW_PROGRAM_CONSTANTS : 0), .brw = BRW_NEW_BLORP | BRW_NEW_FS_PROG_DATA | - (GEN_GEN < 7 ? BRW_NEW_PUSH_CONSTANT_ALLOCATION | - BRW_NEW_BATCH - : BRW_NEW_CONTEXT), + (GEN_GEN < 7 ? BRW_NEW_BATCH : BRW_NEW_CONTEXT), }, .emit = genX(upload_wm), }; @@ -1804,9 +1802,7 @@ static const struct brw_tracked_state genX(vs_state) = { BRW_NEW_BLORP | BRW_NEW_CONTEXT | BRW_NEW_VS_PROG_DATA | - (GEN_GEN < 7 ? BRW_NEW_PUSH_CONSTANT_ALLOCATION | - BRW_NEW_VERTEX_PROGRAM - : 0), + (GEN_GEN < 7 ? BRW_NEW_VERTEX_PROGRAM : 0), }, .emit = genX(upload_vs_state), }; @@ -2183,9 +2179,7 @@ static const struct brw_tracked_state genX(gs_state) = { BRW_NEW_CONTEXT | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_GS_PROG_DATA | - (GEN_GEN < 7 ? BRW_NEW_FF_GS_PROG_DATA | - BRW_NEW_PUSH_CONSTANT_ALLOCATION - : 0), + (GEN_GEN < 7 ? BRW_NEW_FF_GS_PROG_DATA : 0), }, .emit = genX(upload_gs_state), }; -- 2.30.2