diff options
| author | Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com> | 2016-03-05 14:33:50 -0800 |
|---|---|---|
| committer | Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com> | 2016-03-05 14:33:50 -0800 |
| commit | 7b348ab8a0d38b504f659a0b4b6c8aca1a52ea6b (patch) | |
| tree | abb687c7f13436f4f09cdc328d75e35d4e3b8ed2 /src/intel/vulkan/gen8_pipeline.c | |
| parent | 34326f46dfe1511529363b4ab46477f04d3e1574 (diff) | |
| download | external_mesa3d-7b348ab8a0d38b504f659a0b4b6c8aca1a52ea6b.zip external_mesa3d-7b348ab8a0d38b504f659a0b4b6c8aca1a52ea6b.tar.gz external_mesa3d-7b348ab8a0d38b504f659a0b4b6c8aca1a52ea6b.tar.bz2 | |
anv: Fix rebase error
Diffstat (limited to 'src/intel/vulkan/gen8_pipeline.c')
| -rw-r--r-- | src/intel/vulkan/gen8_pipeline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intel/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c index 8edc157..8471fc7 100644 --- a/src/intel/vulkan/gen8_pipeline.c +++ b/src/intel/vulkan/gen8_pipeline.c @@ -333,6 +333,7 @@ genX(graphics_pipeline_create)( emit_urb_setup(pipeline); + const struct brw_wm_prog_data *wm_prog_data = get_wm_prog_data(pipeline); anv_batch_emit(&pipeline->batch, GENX(3DSTATE_CLIP), .ClipEnable = true, .EarlyCullEnable = true, @@ -344,7 +345,7 @@ genX(graphics_pipeline_create)( REJECT_ALL : NORMAL, .NonPerspectiveBarycentricEnable = - (pipeline->wm_prog_data.barycentric_interp_modes & 0x38) != 0, + (wm_prog_data->barycentric_interp_modes & 0x38) != 0, .TriangleStripListProvokingVertexSelect = 0, .LineStripListProvokingVertexSelect = 0, @@ -354,7 +355,6 @@ genX(graphics_pipeline_create)( .MaximumPointWidth = 255.875, .MaximumVPIndex = pCreateInfo->pViewportState->viewportCount - 1); - const struct brw_wm_prog_data *wm_prog_data = get_wm_prog_data(pipeline); anv_batch_emit(&pipeline->batch, GENX(3DSTATE_WM), .StatisticsEnable = true, .LineEndCapAntialiasingRegionWidth = _05pixels, |