X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsvga%2Fsvga_pipe_depthstencil.c;h=fb7b556f6c41c574e04ffdd4d4293da874398e28;hb=ca531aeeb120cdda966120a17cdf50aa14c3129b;hp=83fcdc3d80bba4d4c26c32108d6e484634042765;hpb=e26a978773ba8fbff04cd2ab3342fcb02e90c06e;p=mesa.git diff --git a/src/gallium/drivers/svga/svga_pipe_depthstencil.c b/src/gallium/drivers/svga/svga_pipe_depthstencil.c index 83fcdc3d80b..fb7b556f6c4 100644 --- a/src/gallium/drivers/svga/svga_pipe_depthstencil.c +++ b/src/gallium/drivers/svga/svga_pipe_depthstencil.c @@ -86,9 +86,9 @@ define_depth_stencil_state_object(struct svga_context *svga, ds->id = util_bitmask_add(svga->ds_object_id_bm); /* spot check that these comparision tokens are the same */ - assert(SVGA3D_COMPARISON_NEVER == SVGA3D_CMP_NEVER); - assert(SVGA3D_COMPARISON_LESS == SVGA3D_CMP_LESS); - assert(SVGA3D_COMPARISON_NOT_EQUAL == SVGA3D_CMP_NOTEQUAL); + STATIC_ASSERT(SVGA3D_COMPARISON_NEVER == SVGA3D_CMP_NEVER); + STATIC_ASSERT(SVGA3D_COMPARISON_LESS == SVGA3D_CMP_LESS); + STATIC_ASSERT(SVGA3D_COMPARISON_NOT_EQUAL == SVGA3D_CMP_NOTEQUAL); /* Loop in case command buffer is full and we need to flush and retry */ for (try = 0; try < 2; try++) { @@ -132,7 +132,7 @@ svga_create_depth_stencil_state(struct pipe_context *pipe, const struct pipe_depth_stencil_alpha_state *templ) { struct svga_context *svga = svga_context(pipe); - struct svga_depth_stencil_state *ds = CALLOC_STRUCT( svga_depth_stencil_state ); + struct svga_depth_stencil_state *ds = CALLOC_STRUCT(svga_depth_stencil_state); if (!ds) return NULL; @@ -147,7 +147,7 @@ svga_create_depth_stencil_state(struct pipe_context *pipe, ds->stencil[0].fail = svga_translate_stencil_op(templ->stencil[0].fail_op); ds->stencil[0].zfail = svga_translate_stencil_op(templ->stencil[0].zfail_op); ds->stencil[0].pass = svga_translate_stencil_op(templ->stencil[0].zpass_op); - + /* SVGA3D has one ref/mask/writemask triple shared between front & * back face stencil. We really need two: */ @@ -161,7 +161,6 @@ svga_create_depth_stencil_state(struct pipe_context *pipe, ds->stencil[0].pass = SVGA3D_STENCILOP_KEEP; } - ds->stencil[1].enabled = templ->stencil[1].enabled; if (templ->stencil[1].enabled) { assert(templ->stencil[0].enabled); @@ -205,13 +204,14 @@ svga_create_depth_stencil_state(struct pipe_context *pipe, define_depth_stencil_state_object(svga, ds); } - svga->hud.num_state_objects++; + svga->hud.num_depthstencil_objects++; return ds; } -static void svga_bind_depth_stencil_state(struct pipe_context *pipe, - void *depth_stencil) + +static void +svga_bind_depth_stencil_state(struct pipe_context *pipe, void *depth_stencil) { struct svga_context *svga = svga_context(pipe); @@ -224,8 +224,9 @@ static void svga_bind_depth_stencil_state(struct pipe_context *pipe, svga->dirty |= SVGA_NEW_DEPTH_STENCIL_ALPHA; } -static void svga_delete_depth_stencil_state(struct pipe_context *pipe, - void *depth_stencil) + +static void +svga_delete_depth_stencil_state(struct pipe_context *pipe, void *depth_stencil) { struct svga_context *svga = svga_context(pipe); struct svga_depth_stencil_state *ds = @@ -253,12 +254,13 @@ static void svga_delete_depth_stencil_state(struct pipe_context *pipe, } FREE(depth_stencil); - svga->hud.num_state_objects--; + svga->hud.num_depthstencil_objects--; } -static void svga_set_stencil_ref( struct pipe_context *pipe, - const struct pipe_stencil_ref *stencil_ref ) +static void +svga_set_stencil_ref(struct pipe_context *pipe, + const struct pipe_stencil_ref *stencil_ref) { struct svga_context *svga = svga_context(pipe); @@ -272,6 +274,7 @@ static void svga_set_stencil_ref( struct pipe_context *pipe, svga->dirty |= SVGA_NEW_STENCIL_REF; } + static void svga_set_sample_mask(struct pipe_context *pipe, unsigned sample_mask) @@ -284,7 +287,8 @@ svga_set_sample_mask(struct pipe_context *pipe, } -void svga_init_depth_stencil_functions( struct svga_context *svga ) +void +svga_init_depth_stencil_functions(struct svga_context *svga) { svga->pipe.create_depth_stencil_alpha_state = svga_create_depth_stencil_state; svga->pipe.bind_depth_stencil_alpha_state = svga_bind_depth_stencil_state; @@ -293,7 +297,3 @@ void svga_init_depth_stencil_functions( struct svga_context *svga ) svga->pipe.set_stencil_ref = svga_set_stencil_ref; svga->pipe.set_sample_mask = svga_set_sample_mask; } - - - -