From 5be86f2f25639b1e01b617a01da16bd58222bf45 Mon Sep 17 00:00:00 2001 From: Lukasz Kalamarz Date: Tue, 12 Jun 2018 14:10:02 +0200 Subject: lib/gen8_render: Cleanup of libs This patch implements some changes in gen8_render header and all files that include it. Renamed all definition that were introduced in that file with prefix GEN8_* instead of previous GEN's one if they were not implemented there, otherwise dropped duplicates. Modified include to use gen7_render header instead of gen6. v2: Fixed commit message v3: fixed typo in commit msg Signed-off-by: Lukasz Kalamarz Cc: Katarzyna Dec Cc: Antonio Argenziano Cc: Daniele Ceraolo Spurio Cc: Ewelina Musial Reviewed-by: Katarzyna Dec --- tools/null_state_gen/intel_renderstate_gen8.c | 26 +++++++++++++------------- tools/null_state_gen/intel_renderstate_gen9.c | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'tools') diff --git a/tools/null_state_gen/intel_renderstate_gen8.c b/tools/null_state_gen/intel_renderstate_gen8.c index 08def120..c6973e0e 100644 --- a/tools/null_state_gen/intel_renderstate_gen8.c +++ b/tools/null_state_gen/intel_renderstate_gen8.c @@ -33,7 +33,7 @@ static void gen8_emit_wm(struct intel_batchbuffer *batch) { OUT_BATCH(GEN6_3DSTATE_WM | (2 - 2)); - OUT_BATCH(GEN7_WM_LEGACY_DIAMOND_LINE_RASTERIZATION); + OUT_BATCH(GEN8_WM_LEGACY_DIAMOND_LINE_RASTERIZATION); } static void gen8_emit_ps(struct intel_batchbuffer *batch) @@ -59,7 +59,7 @@ static void gen8_emit_sf(struct intel_batchbuffer *batch) OUT_BATCH(0); OUT_BATCH(1 << GEN6_3DSTATE_SF_TRIFAN_PROVOKE_SHIFT | 1 << GEN6_3DSTATE_SF_VERTEX_SUB_PIXEL_PRECISION_SHIFT | - GEN7_SF_POINT_WIDTH_FROM_SOURCE | + GEN8_SF_POINT_WIDTH_FROM_SOURCE | 8); } @@ -68,7 +68,7 @@ static void gen8_emit_vs(struct intel_batchbuffer *batch) OUT_BATCH(GEN6_3DSTATE_VS | (9 - 2)); OUT_BATCH(0); OUT_BATCH(0); - OUT_BATCH(GEN7_VS_FLOATING_POINT_MODE_ALTERNATE); + OUT_BATCH(GEN8_VS_FLOATING_POINT_MODE_ALTERNATE); OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0); @@ -204,7 +204,7 @@ static void gen8_emit_vertex_buffers(struct intel_batchbuffer *batch) for (i = 0; i < buffers; i++) { OUT_BATCH(i << VB0_BUFFER_INDEX_SHIFT | - GEN7_VB0_BUFFER_ADDR_MOD_EN); + GEN8_VB0_BUFFER_ADDR_MOD_EN); OUT_BATCH(0); /* Addr */ OUT_BATCH(0); OUT_BATCH(0); @@ -308,7 +308,7 @@ static void gen8_emit_viewport_state_pointers_sf_clip(struct intel_batchbuffer * for (i = 0; i < 16; i++) OUT_STATE(0); - OUT_BATCH(GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP | (2 - 2)); + OUT_BATCH(GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP | (2 - 2)); OUT_BATCH_STATE_OFFSET(offset); } @@ -361,9 +361,9 @@ void gen8_setup_null_render_state(struct intel_batchbuffer *batch) OUT_CMD(GEN8_3DSTATE_GATHER_POOL_ALLOC, 4); OUT_CMD(GEN8_3DSTATE_DX9_CONSTANT_BUFFER_POOL_ALLOC, 4); OUT_CMD(GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_VS, 2); - OUT_CMD(GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS, 2); - OUT_CMD(GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS, 2); - OUT_CMD(GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS, 2); + OUT_CMD(GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS, 2); + OUT_CMD(GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS, 2); + OUT_CMD(GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS, 2); OUT_CMD(GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS, 2); OUT_CMD(GEN6_3DSTATE_CONSTANT_VS, 11); OUT_CMD(GEN7_3DSTATE_CONSTANT_HS, 11); @@ -394,8 +394,8 @@ void gen8_setup_null_render_state(struct intel_batchbuffer *batch) OUT_CMD(GEN6_3DSTATE_LINE_STIPPLE, 3); OUT_CMD(GEN6_3DSTATE_AA_LINE_PARAMS, 3); - OUT_CMD(GEN7_3DSTATE_STENCIL_BUFFER, 5); - OUT_CMD(GEN7_3DSTATE_HIER_DEPTH_BUFFER, 5); + OUT_CMD(GEN8_3DSTATE_STENCIL_BUFFER, 5); + OUT_CMD(GEN8_3DSTATE_HIER_DEPTH_BUFFER, 5); OUT_CMD(GEN7_3DSTATE_CLEAR_PARAMS, 3); OUT_CMD(GEN6_3DSTATE_MONOFILTER_SIZE, 2); OUT_CMD(GEN8_3DSTATE_MULTISAMPLE, 2); @@ -423,12 +423,12 @@ void gen8_setup_null_render_state(struct intel_batchbuffer *batch) gen8_emit_ps_blend(batch); OUT_CMD(GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS, 2); - OUT_CMD(GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS, 2); - OUT_CMD(GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS, 2); + OUT_CMD(GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS, 2); + OUT_CMD(GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS, 2); OUT_CMD(GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS, 2); OUT_CMD(GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS, 2); - OUT_CMD(GEN6_3DSTATE_SCISSOR_STATE_POINTERS, 2); + OUT_CMD(GEN8_3DSTATE_SCISSOR_STATE_POINTERS, 2); gen8_emit_viewport_state_pointers_cc(batch); gen8_emit_viewport_state_pointers_sf_clip(batch); diff --git a/tools/null_state_gen/intel_renderstate_gen9.c b/tools/null_state_gen/intel_renderstate_gen9.c index 1b77e552..9f338bbf 100644 --- a/tools/null_state_gen/intel_renderstate_gen9.c +++ b/tools/null_state_gen/intel_renderstate_gen9.c @@ -32,7 +32,7 @@ static void gen8_emit_wm(struct intel_batchbuffer *batch) { OUT_BATCH(GEN6_3DSTATE_WM | (2 - 2)); - OUT_BATCH(GEN7_WM_LEGACY_DIAMOND_LINE_RASTERIZATION); + OUT_BATCH(GEN8_WM_LEGACY_DIAMOND_LINE_RASTERIZATION); } static void gen8_emit_ps(struct intel_batchbuffer *batch) @@ -58,7 +58,7 @@ static void gen8_emit_sf(struct intel_batchbuffer *batch) OUT_BATCH(0); OUT_BATCH(1 << GEN6_3DSTATE_SF_TRIFAN_PROVOKE_SHIFT | 1 << GEN6_3DSTATE_SF_VERTEX_SUB_PIXEL_PRECISION_SHIFT | - GEN7_SF_POINT_WIDTH_FROM_SOURCE | + GEN8_SF_POINT_WIDTH_FROM_SOURCE | 8); } @@ -67,7 +67,7 @@ static void gen8_emit_vs(struct intel_batchbuffer *batch) OUT_BATCH(GEN6_3DSTATE_VS | (9 - 2)); OUT_BATCH(0); OUT_BATCH(0); - OUT_BATCH(GEN7_VS_FLOATING_POINT_MODE_ALTERNATE); + OUT_BATCH(GEN8_VS_FLOATING_POINT_MODE_ALTERNATE); OUT_BATCH(0); OUT_BATCH(0); OUT_BATCH(0); @@ -168,7 +168,7 @@ static void gen8_emit_vertex_buffers(struct intel_batchbuffer *batch) for (i = 0; i < buffers; i++) { OUT_BATCH(i << VB0_BUFFER_INDEX_SHIFT | - GEN7_VB0_BUFFER_ADDR_MOD_EN); + GEN8_VB0_BUFFER_ADDR_MOD_EN); OUT_BATCH(0); /* Address */ OUT_BATCH(0); OUT_BATCH(0); @@ -271,7 +271,7 @@ static void gen8_emit_viewport_state_pointers_sf_clip(struct intel_batchbuffer * for (i = 0; i < 16; i++) OUT_STATE(0); - OUT_BATCH(GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP | (2 - 2)); + OUT_BATCH(GEN8_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP | (2 - 2)); OUT_BATCH_STATE_OFFSET(offset); } @@ -387,9 +387,9 @@ void gen9_setup_null_render_state(struct intel_batchbuffer *batch) /* Push Constants */ OUT_CMD(GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_VS, 2); - OUT_CMD(GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_HS, 2); - OUT_CMD(GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_DS, 2); - OUT_CMD(GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_GS, 2); + OUT_CMD(GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_HS, 2); + OUT_CMD(GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_DS, 2); + OUT_CMD(GEN8_3DSTATE_PUSH_CONSTANT_ALLOC_GS, 2); OUT_CMD(GEN7_3DSTATE_PUSH_CONSTANT_ALLOC_PS, 2); /* Constants */ @@ -425,8 +425,8 @@ void gen9_setup_null_render_state(struct intel_batchbuffer *batch) OUT_CMD(GEN6_3DSTATE_LINE_STIPPLE, 3); OUT_CMD(GEN6_3DSTATE_AA_LINE_PARAMS, 3); - OUT_CMD(GEN7_3DSTATE_STENCIL_BUFFER, 5); - OUT_CMD(GEN7_3DSTATE_HIER_DEPTH_BUFFER, 5); + OUT_CMD(GEN8_3DSTATE_STENCIL_BUFFER, 5); + OUT_CMD(GEN8_3DSTATE_HIER_DEPTH_BUFFER, 5); OUT_CMD(GEN7_3DSTATE_CLEAR_PARAMS, 3); OUT_CMD(GEN6_3DSTATE_MONOFILTER_SIZE, 2); OUT_CMD(GEN8_3DSTATE_MULTISAMPLE, 2); @@ -455,12 +455,12 @@ void gen9_setup_null_render_state(struct intel_batchbuffer *batch) /* 3D state sampler state pointers */ OUT_CMD(GEN7_3DSTATE_SAMPLER_STATE_POINTERS_VS, 2); - OUT_CMD(GEN7_3DSTATE_SAMPLER_STATE_POINTERS_HS, 2); - OUT_CMD(GEN7_3DSTATE_SAMPLER_STATE_POINTERS_DS, 2); + OUT_CMD(GEN8_3DSTATE_SAMPLER_STATE_POINTERS_HS, 2); + OUT_CMD(GEN8_3DSTATE_SAMPLER_STATE_POINTERS_DS, 2); OUT_CMD(GEN7_3DSTATE_SAMPLER_STATE_POINTERS_GS, 2); OUT_CMD(GEN7_3DSTATE_SAMPLER_STATE_POINTERS_PS, 2); - OUT_CMD(GEN6_3DSTATE_SCISSOR_STATE_POINTERS, 2); + OUT_CMD(GEN8_3DSTATE_SCISSOR_STATE_POINTERS, 2); gen8_emit_viewport_state_pointers_cc(batch); gen8_emit_viewport_state_pointers_sf_clip(batch); -- cgit v1.2.3