From 696f5c1853df39359b9dbd733f4c2a1177481556 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 12 Oct 2016 23:28:03 +0100 Subject: [PATCH] anv: replace , with ; in anv_batch_emit() Signed-off-by: Lionel Landwerlin Reviewed-by: Kenneth Graunke --- src/intel/vulkan/genX_cmd_buffer.c | 20 ++++++++++---------- src/intel/vulkan/genX_pipeline_util.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 236afa5071b..02f84056654 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -80,8 +80,8 @@ genX(cmd_buffer_emit_state_base_address)(struct anv_cmd_buffer *cmd_buffer) sba.DynamicStateBaseAddress = (struct anv_address) { &device->dynamic_state_block_pool.bo, 0 }; - sba.DynamicStateMemoryObjectControlState = GENX(MOCS), - sba.DynamicStateBaseAddressModifyEnable = true, + sba.DynamicStateMemoryObjectControlState = GENX(MOCS); + sba.DynamicStateBaseAddressModifyEnable = true; sba.IndirectObjectBaseAddress = (struct anv_address) { NULL, 0 }; sba.IndirectObjectMemoryObjectControlState = GENX(MOCS); @@ -1230,7 +1230,7 @@ cmd_buffer_emit_depth_stencil(struct anv_cmd_buffer *cmd_buffer) .bo = image->bo, .offset = image->offset + image->depth_surface.offset, }; - db.DepthBufferObjectControlState = GENX(MOCS), + db.DepthBufferObjectControlState = GENX(MOCS); db.SurfacePitch = image->depth_surface.isl.row_pitch - 1; db.Height = image->extent.height - 1; @@ -1241,7 +1241,7 @@ cmd_buffer_emit_depth_stencil(struct anv_cmd_buffer *cmd_buffer) #if GEN_GEN >= 8 db.SurfaceQPitch = - isl_surf_get_array_pitch_el_rows(&image->depth_surface.isl) >> 2, + isl_surf_get_array_pitch_el_rows(&image->depth_surface.isl) >> 2; #endif db.RenderTargetViewExtent = 1 - 1; } @@ -1304,14 +1304,14 @@ cmd_buffer_emit_depth_stencil(struct anv_cmd_buffer *cmd_buffer) if (has_stencil) { anv_batch_emit(&cmd_buffer->batch, GENX(3DSTATE_STENCIL_BUFFER), sb) { #if GEN_GEN >= 8 || GEN_IS_HASWELL - sb.StencilBufferEnable = true, + sb.StencilBufferEnable = true; #endif - sb.StencilBufferObjectControlState = GENX(MOCS), + sb.StencilBufferObjectControlState = GENX(MOCS); - sb.SurfacePitch = image->stencil_surface.isl.row_pitch - 1, + sb.SurfacePitch = image->stencil_surface.isl.row_pitch - 1; #if GEN_GEN >= 8 - sb.SurfaceQPitch = isl_surf_get_array_pitch_el_rows(&image->stencil_surface.isl) >> 2, + sb.SurfaceQPitch = isl_surf_get_array_pitch_el_rows(&image->stencil_surface.isl) >> 2; #endif sb.SurfaceBaseAddress = (struct anv_address) { .bo = image->bo, @@ -1515,8 +1515,8 @@ void genX(CmdWriteTimestamp)( default: /* Everything else is bottom-of-pipe */ anv_batch_emit(&cmd_buffer->batch, GENX(PIPE_CONTROL), pc) { - pc.DestinationAddressType = DAT_PPGTT, - pc.PostSyncOperation = WriteTimestamp, + pc.DestinationAddressType = DAT_PPGTT; + pc.PostSyncOperation = WriteTimestamp; pc.Address = (struct anv_address) { &pool->bo, offset }; } break; diff --git a/src/intel/vulkan/genX_pipeline_util.h b/src/intel/vulkan/genX_pipeline_util.h index c2de52376c6..129ae94aeba 100644 --- a/src/intel/vulkan/genX_pipeline_util.h +++ b/src/intel/vulkan/genX_pipeline_util.h @@ -126,8 +126,8 @@ emit_vertex_input(struct anv_pipeline *pipeline, * VERTEX_BUFFER_STATE which we emit later. */ anv_batch_emit(&pipeline->batch, GENX(3DSTATE_VF_INSTANCING), vfi) { - vfi.InstancingEnable = pipeline->instancing_enable[desc->binding], - vfi.VertexElementIndex = slot, + vfi.InstancingEnable = pipeline->instancing_enable[desc->binding]; + vfi.VertexElementIndex = slot; /* Vulkan so far doesn't have an instance divisor, so * this is always 1 (ignored if not instancing). */ vfi.InstanceDataStepRate = 1; -- 2.30.2