diff options
| author | Rafael Antognolli <[email protected]> | 2017-04-19 16:13:20 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2017-05-03 16:41:07 -0700 |
| commit | 7d5cc5b9549852f2cacf1259905a98bb72a3a017 (patch) | |
| tree | 92d6c91e9789b418809b3c909359cbe10a7d25af /src/intel | |
| parent | b89805a7bcf19239cccae6152adbe3b5023f654e (diff) | |
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 <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/blorp/blorp_genX_exec.h | 4 | ||||
| -rw-r--r-- | src/intel/genxml/gen6.xml | 4 | ||||
| -rw-r--r-- | src/intel/genxml/gen8.xml | 2 | ||||
| -rw-r--r-- | 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 @@ <field name="BLEND_STATE Change" start="32" end="32" type="bool"/> <field name="Pointer to DEPTH_STENCIL_STATE" start="70" end="95" type="offset"/> <field name="DEPTH_STENCIL_STATE Change" start="64" end="64" type="bool"/> - <field name="Pointer to COLOR_CALC_STATE" start="102" end="127" type="offset"/> - <field name="COLOR_CALC_STATE Change" start="96" end="96" type="bool"/> + <field name="Color Calc State Pointer" start="102" end="127" type="offset"/> + <field name="Color Calc State Pointer Valid" start="96" end="96" type="bool"/> </instruction> <instruction name="3DSTATE_CHROMA_KEY" bias="2" length="4"> 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 @@ <struct name="COLOR_CALC_STATE" length="6"> <field name="Stencil Reference Value" start="24" end="31" type="uint"/> - <field name="BackFace Stencil Reference Value" start="16" end="23" type="uint"/> + <field name="Backface Stencil Reference Value" start="16" end="23" type="uint"/> <field name="Round Disable Function Disable" start="15" end="15" type="bool"/> <field name="Alpha Test Format" start="0" end="0" type="uint"> <value name="ALPHATEST_UNORM8" value="0"/> 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); |