From 7d5cc5b9549852f2cacf1259905a98bb72a3a017 Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Wed, 19 Apr 2017 16:13:20 -0700 Subject: [PATCH] genxml: Normalize xml for 3DSTATE_CC_STATE_POINTERS. - "COLOR_CALC_STATE Change" -> "Color Calc State Pointer Valid" - "Pointer to COLOR_CALC_STATE" -> "Color Calc State Pointer" - "BackFace" -> "Backface" Signed-off-by: Rafael Antognolli Reviewed-by: Kenneth Graunke --- src/intel/blorp/blorp_genX_exec.h | 4 ++-- src/intel/genxml/gen6.xml | 4 ++-- src/intel/genxml/gen8.xml | 2 +- src/intel/vulkan/gen8_cmd_buffer.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h index be22be09ab5..9e61f69492e 100644 --- a/src/intel/blorp/blorp_genX_exec.h +++ b/src/intel/blorp/blorp_genX_exec.h @@ -1365,10 +1365,10 @@ blorp_exec(struct blorp_batch *batch, const struct blorp_params *params) */ blorp_emit(batch, GENX(3DSTATE_CC_STATE_POINTERS), cc) { cc.BLEND_STATEChange = true; - cc.COLOR_CALC_STATEChange = true; + cc.ColorCalcStatePointerValid = true; cc.DEPTH_STENCIL_STATEChange = true; cc.PointertoBLEND_STATE = blend_state_offset; - cc.PointertoCOLOR_CALC_STATE = color_calc_state_offset; + cc.ColorCalcStatePointer = color_calc_state_offset; cc.PointertoDEPTH_STENCIL_STATE = depth_stencil_state_offset; } #else diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml index a8ce7e06651..cdcead3498e 100644 --- a/src/intel/genxml/gen6.xml +++ b/src/intel/genxml/gen6.xml @@ -773,8 +773,8 @@ - - + + diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml index 7f60ea426b6..c57ddb41a16 100644 --- a/src/intel/genxml/gen8.xml +++ b/src/intel/genxml/gen8.xml @@ -568,7 +568,7 @@ - + diff --git a/src/intel/vulkan/gen8_cmd_buffer.c b/src/intel/vulkan/gen8_cmd_buffer.c index c891a76723d..0e26ddaeba2 100644 --- a/src/intel/vulkan/gen8_cmd_buffer.c +++ b/src/intel/vulkan/gen8_cmd_buffer.c @@ -467,7 +467,7 @@ genX(cmd_buffer_flush_dynamic_state)(struct anv_cmd_buffer *cmd_buffer) .BlendConstantColorBlue = cmd_buffer->state.dynamic.blend_constants[2], .BlendConstantColorAlpha = cmd_buffer->state.dynamic.blend_constants[3], .StencilReferenceValue = d->stencil_reference.front & 0xff, - .BackFaceStencilReferenceValue = d->stencil_reference.back & 0xff, + .BackfaceStencilReferenceValue = d->stencil_reference.back & 0xff, }; GENX(COLOR_CALC_STATE_pack)(NULL, cc_state.map, &cc);