diff options
| author | Jason Ekstrand <[email protected]> | 2016-08-06 08:24:00 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-08-08 11:13:28 -0700 |
| commit | 6136fb8687d216565ea481875e651ff23b13bfd3 (patch) | |
| tree | 2a7275d40227c89bc796c3a7bd1718388efb4d57 | |
| parent | 2d76dcae718cf8d1478a70f3f23463ba8c534927 (diff) | |
genxml: Make 3DSTATE_SF more consistent between gen7 and gen8+
Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/intel/genxml/gen7.xml | 7 | ||||
| -rw-r--r-- | src/intel/genxml/gen75.xml | 7 | ||||
| -rw-r--r-- | src/intel/vulkan/gen7_pipeline.c | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml index 108409393d9..5e82fab3d61 100644 --- a/src/intel/genxml/gen7.xml +++ b/src/intel/genxml/gen7.xml @@ -1612,7 +1612,7 @@ <value name="WIREFRAME" value="1"/> <value name="POINT" value="2"/> </field> - <field name="View Transform Enable" start="33" end="33" type="bool"/> + <field name="Viewport Transform Enable" start="33" end="33" type="bool"/> <field name="Front Winding" start="32" end="32" type="uint"/> <field name="Anti-Aliasing Enable" start="95" end="95" type="bool"/> <field name="Cull Mode" start="93" end="94" type="uint" prefix="CULLMODE"> @@ -1641,7 +1641,10 @@ <value name="AALINEDISTANCE_TRUE" value="1"/> </field> <field name="Vertex Sub Pixel Precision Select" start="108" end="108" type="uint"/> - <field name="Use Point Width State" start="107" end="107" type="uint"/> + <field name="Point Width Source" start="107" end="107" type="uint"> + <value name="Vertex" value="0"/> + <value name="State" value="1"/> + </field> <field name="Point Width" start="96" end="106" type="u8.3"/> <field name="Global Depth Offset Constant" start="128" end="159" type="float"/> <field name="Global Depth Offset Scale" start="160" end="191" type="float"/> diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml index b7bf13a08d5..f1be2f847e7 100644 --- a/src/intel/genxml/gen75.xml +++ b/src/intel/genxml/gen75.xml @@ -1857,7 +1857,7 @@ <value name="WIREFRAME" value="1"/> <value name="POINT" value="2"/> </field> - <field name="View Transform Enable" start="33" end="33" type="bool"/> + <field name="Viewport Transform Enable" start="33" end="33" type="bool"/> <field name="Front Winding" start="32" end="32" type="uint"/> <field name="Anti-Aliasing Enable" start="95" end="95" type="bool"/> <field name="Cull Mode" start="93" end="94" type="uint" prefix="CULLMODE"> @@ -1888,7 +1888,10 @@ <value name="AALINEDISTANCE_TRUE" value="1"/> </field> <field name="Vertex Sub Pixel Precision Select" start="108" end="108" type="uint"/> - <field name="Use Point Width State" start="107" end="107" type="uint"/> + <field name="Point Width Source" start="107" end="107" type="uint"> + <value name="Vertex" value="0"/> + <value name="State" value="1"/> + </field> <field name="Point Width" start="96" end="106" type="u8.3"/> <field name="Global Depth Offset Constant" start="128" end="159" type="float"/> <field name="Global Depth Offset Scale" start="160" end="191" type="float"/> diff --git a/src/intel/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_pipeline.c index daebc27655e..6b57dd65dc3 100644 --- a/src/intel/vulkan/gen7_pipeline.c +++ b/src/intel/vulkan/gen7_pipeline.c @@ -47,7 +47,7 @@ gen7_emit_rs_state(struct anv_pipeline *pipeline, .StatisticsEnable = true, .FrontFaceFillMode = vk_to_gen_fillmode[info->polygonMode], .BackFaceFillMode = vk_to_gen_fillmode[info->polygonMode], - .ViewTransformEnable = !(extra && extra->use_rectlist), + .ViewportTransformEnable = !(extra && extra->use_rectlist), .FrontWinding = vk_to_gen_front_face[info->frontFace], /* bool AntiAliasingEnable; */ @@ -65,7 +65,7 @@ gen7_emit_rs_state(struct anv_pipeline *pipeline, /* uint32_t AALineDistanceMode; */ /* uint32_t VertexSubPixelPrecisionSelect; */ - .UsePointWidthState = false, + .PointWidthSource = Vertex, .PointWidth = 1.0, .GlobalDepthOffsetEnableSolid = info->depthBiasEnable, .GlobalDepthOffsetEnableWireframe = info->depthBiasEnable, |