X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fnoop%2Fnoop_state.c;h=7ae89c8e7114318b310825dbd01212f03bf2d739;hb=6b73aafceb1eb8e81754e2f349826994de678466;hp=f56ff597c6c242949b23e1eb42028dc29895763f;hpb=25409c6da8163d9acb386511aef0c11577c7aadb;p=mesa.git

diff --git a/src/gallium/drivers/noop/noop_state.c b/src/gallium/drivers/noop/noop_state.c
index f56ff597c6c..7ae89c8e711 100644
--- a/src/gallium/drivers/noop/noop_state.c
+++ b/src/gallium/drivers/noop/noop_state.c
@@ -34,117 +34,98 @@ static void noop_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
 {
 }
 
+static void noop_launch_grid(struct pipe_context *ctx,
+                             const struct pipe_grid_info *info)
+{
+}
+
 static void noop_set_blend_color(struct pipe_context *ctx,
-					const struct pipe_blend_color *state)
+                                 const struct pipe_blend_color *state)
 {
 }
 
 static void *noop_create_blend_state(struct pipe_context *ctx,
-					const struct pipe_blend_state *state)
+                                     const struct pipe_blend_state *state)
 {
-	struct pipe_blend_state *nstate = CALLOC_STRUCT(pipe_blend_state);
-
-	if (nstate == NULL) {
-		return NULL;
-	}
-	*nstate = *state;
-	return nstate;
+   return MALLOC(1);
 }
 
 static void *noop_create_dsa_state(struct pipe_context *ctx,
-				   const struct pipe_depth_stencil_alpha_state *state)
+                                   const struct pipe_depth_stencil_alpha_state *state)
 {
-	struct pipe_depth_stencil_alpha_state *nstate = CALLOC_STRUCT(pipe_depth_stencil_alpha_state);
-
-	if (nstate == NULL) {
-		return NULL;
-	}
-	*nstate = *state;
-	return nstate;
+   return MALLOC(1);
 }
 
 static void *noop_create_rs_state(struct pipe_context *ctx,
-					const struct pipe_rasterizer_state *state)
+                                  const struct pipe_rasterizer_state *state)
 {
-	struct pipe_rasterizer_state *nstate = CALLOC_STRUCT(pipe_rasterizer_state);
-
-	if (nstate == NULL) {
-		return NULL;
-	}
-	*nstate = *state;
-	return nstate;
+   return MALLOC(1);
 }
 
 static void *noop_create_sampler_state(struct pipe_context *ctx,
-					const struct pipe_sampler_state *state)
+                                       const struct pipe_sampler_state *state)
 {
-	struct pipe_sampler_state *nstate = CALLOC_STRUCT(pipe_sampler_state);
-
-	if (nstate == NULL) {
-		return NULL;
-	}
-	*nstate = *state;
-	return nstate;
+   return MALLOC(1);
 }
 
 static struct pipe_sampler_view *noop_create_sampler_view(struct pipe_context *ctx,
-							struct pipe_resource *texture,
-							const struct pipe_sampler_view *state)
+                                                          struct pipe_resource *texture,
+                                                          const struct pipe_sampler_view *state)
 {
-	struct pipe_sampler_view *sampler_view = CALLOC_STRUCT(pipe_sampler_view);
+   struct pipe_sampler_view *sampler_view = CALLOC_STRUCT(pipe_sampler_view);
 
-	if (sampler_view == NULL)
-		return NULL;
-	/* initialize base object */
-	pipe_resource_reference(&sampler_view->texture, texture);
-	pipe_reference_init(&sampler_view->reference, 1);
-	sampler_view->context = ctx;
-	return sampler_view;
+   if (!sampler_view)
+      return NULL;
+   /* initialize base object */
+   pipe_resource_reference(&sampler_view->texture, texture);
+   pipe_reference_init(&sampler_view->reference, 1);
+   sampler_view->context = ctx;
+   return sampler_view;
 }
 
 static struct pipe_surface *noop_create_surface(struct pipe_context *ctx,
-						struct pipe_resource *texture,
-						const struct pipe_surface *surf_tmpl)
+                                                struct pipe_resource *texture,
+                                                const struct pipe_surface *surf_tmpl)
 {
-	struct pipe_surface *surface = CALLOC_STRUCT(pipe_surface);
+   struct pipe_surface *surface = CALLOC_STRUCT(pipe_surface);
 
-	if (surface == NULL)
-		return NULL;
-	pipe_reference_init(&surface->reference, 1);
-	pipe_resource_reference(&surface->texture, texture);
-	surface->context = ctx;
-	surface->format = surf_tmpl->format;
-	surface->width = texture->width0;
-	surface->height = texture->height0;
-	surface->texture = texture;
-	surface->u.tex.first_layer = surf_tmpl->u.tex.first_layer;
-	surface->u.tex.last_layer = surf_tmpl->u.tex.last_layer;
-	surface->u.tex.level = surf_tmpl->u.tex.level;
-
-	return surface;
-}
+   if (!surface)
+      return NULL;
+   pipe_reference_init(&surface->reference, 1);
+   pipe_resource_reference(&surface->texture, texture);
+   surface->context = ctx;
+   surface->format = surf_tmpl->format;
+   surface->width = texture->width0;
+   surface->height = texture->height0;
+   surface->texture = texture;
+   surface->u.tex.first_layer = surf_tmpl->u.tex.first_layer;
+   surface->u.tex.last_layer = surf_tmpl->u.tex.last_layer;
+   surface->u.tex.level = surf_tmpl->u.tex.level;
 
-static void noop_set_vs_sampler_view(struct pipe_context *ctx, unsigned count,
-					struct pipe_sampler_view **views)
-{
+   return surface;
 }
 
-static void noop_set_ps_sampler_view(struct pipe_context *ctx, unsigned count,
-					struct pipe_sampler_view **views)
+static void noop_set_sampler_views(struct pipe_context *ctx,
+                                   enum pipe_shader_type shader,
+                                   unsigned start, unsigned count,
+                                   struct pipe_sampler_view **views)
 {
 }
 
-static void noop_bind_sampler(struct pipe_context *ctx, unsigned count, void **states)
+static void noop_bind_sampler_states(struct pipe_context *ctx,
+                                     enum pipe_shader_type shader,
+                                     unsigned start, unsigned count,
+                                     void **states)
 {
 }
 
 static void noop_set_clip_state(struct pipe_context *ctx,
-				const struct pipe_clip_state *state)
+                                const struct pipe_clip_state *state)
 {
 }
 
 static void noop_set_polygon_stipple(struct pipe_context *ctx,
-					 const struct pipe_poly_stipple *state)
+                                     const struct pipe_poly_stipple *state)
 {
 }
 
@@ -152,46 +133,50 @@ static void noop_set_sample_mask(struct pipe_context *pipe, unsigned sample_mask
 {
 }
 
-static void noop_set_scissor_state(struct pipe_context *ctx,
-					const struct pipe_scissor_state *state)
+static void noop_set_scissor_states(struct pipe_context *ctx,
+                                    unsigned start_slot,
+                                    unsigned num_scissors,
+                                    const struct pipe_scissor_state *state)
 {
 }
 
 static void noop_set_stencil_ref(struct pipe_context *ctx,
-				const struct pipe_stencil_ref *state)
+                                 const struct pipe_stencil_ref *state)
 {
 }
 
-static void noop_set_viewport_state(struct pipe_context *ctx,
-					const struct pipe_viewport_state *state)
+static void noop_set_viewport_states(struct pipe_context *ctx,
+                                     unsigned start_slot,
+                                     unsigned num_viewports,
+                                     const struct pipe_viewport_state *state)
 {
 }
 
 static void noop_set_framebuffer_state(struct pipe_context *ctx,
-					const struct pipe_framebuffer_state *state)
+                                       const struct pipe_framebuffer_state *state)
 {
 }
 
 static void noop_set_constant_buffer(struct pipe_context *ctx,
-					uint shader, uint index,
-					struct pipe_constant_buffer *cb)
+                                     uint shader, uint index,
+                                     const struct pipe_constant_buffer *cb)
 {
 }
 
 
 static void noop_sampler_view_destroy(struct pipe_context *ctx,
-				struct pipe_sampler_view *state)
+                                      struct pipe_sampler_view *state)
 {
-	pipe_resource_reference(&state->texture, NULL);
-	FREE(state);
+   pipe_resource_reference(&state->texture, NULL);
+   FREE(state);
 }
 
 
 static void noop_surface_destroy(struct pipe_context *ctx,
-				 struct pipe_surface *surface)
+                                 struct pipe_surface *surface)
 {
-	pipe_resource_reference(&surface->texture, NULL);
-	FREE(surface);
+   pipe_resource_reference(&surface->texture, NULL);
+   FREE(surface);
 }
 
 static void noop_bind_state(struct pipe_context *ctx, void *state)
@@ -200,49 +185,37 @@ static void noop_bind_state(struct pipe_context *ctx, void *state)
 
 static void noop_delete_state(struct pipe_context *ctx, void *state)
 {
-	FREE(state);
-}
-
-static void noop_delete_vertex_element(struct pipe_context *ctx, void *state)
-{
-	FREE(state);
+   FREE(state);
 }
 
-
 static void noop_set_index_buffer(struct pipe_context *ctx,
-					const struct pipe_index_buffer *ib)
+                                  const struct pipe_index_buffer *ib)
 {
 }
 
 static void noop_set_vertex_buffers(struct pipe_context *ctx,
-				    unsigned start_slot, unsigned count,
-				    const struct pipe_vertex_buffer *buffers)
+                                    unsigned start_slot, unsigned count,
+                                    const struct pipe_vertex_buffer *buffers)
 {
 }
 
 static void *noop_create_vertex_elements(struct pipe_context *ctx,
-					unsigned count,
-					const struct pipe_vertex_element *state)
+                                         unsigned count,
+                                         const struct pipe_vertex_element *state)
 {
-	struct pipe_vertex_element *nstate = CALLOC_STRUCT(pipe_vertex_element);
-
-	if (nstate == NULL) {
-		return NULL;
-	}
-	*nstate = *state;
-	return nstate;
+   return MALLOC(1);
 }
 
 static void *noop_create_shader_state(struct pipe_context *ctx,
-					const struct pipe_shader_state *state)
+                                      const struct pipe_shader_state *state)
 {
-	struct pipe_shader_state *nstate = CALLOC_STRUCT(pipe_shader_state);
+   return MALLOC(1);
+}
 
-	if (nstate == NULL) {
-		return NULL;
-	}
-	*nstate = *state;
-	return nstate;
+static void *noop_create_compute_state(struct pipe_context *ctx,
+                                       const struct pipe_compute_state *state)
+{
+   return MALLOC(1);
 }
 
 static struct pipe_stream_output_target *noop_create_stream_output_target(
@@ -263,16 +236,16 @@ static struct pipe_stream_output_target *noop_create_stream_output_target(
 }
 
 static void noop_stream_output_target_destroy(struct pipe_context *ctx,
-                                      struct pipe_stream_output_target *t)
+                                              struct pipe_stream_output_target *t)
 {
    pipe_resource_reference(&t->buffer, NULL);
    FREE(t);
 }
 
 static void noop_set_stream_output_targets(struct pipe_context *ctx,
-                           unsigned num_targets,
-                           struct pipe_stream_output_target **targets,
-                           unsigned append_bitmask)
+                                           unsigned num_targets,
+                                           struct pipe_stream_output_target **targets,
+                                           const unsigned *offsets)
 {
 }
 
@@ -280,47 +253,58 @@ void noop_init_state_functions(struct pipe_context *ctx);
 
 void noop_init_state_functions(struct pipe_context *ctx)
 {
-	ctx->create_blend_state = noop_create_blend_state;
-	ctx->create_depth_stencil_alpha_state = noop_create_dsa_state;
-	ctx->create_fs_state = noop_create_shader_state;
-	ctx->create_rasterizer_state = noop_create_rs_state;
-	ctx->create_sampler_state = noop_create_sampler_state;
-	ctx->create_sampler_view = noop_create_sampler_view;
-	ctx->create_surface = noop_create_surface;
-	ctx->create_vertex_elements_state = noop_create_vertex_elements;
-	ctx->create_vs_state = noop_create_shader_state;
-	ctx->bind_blend_state = noop_bind_state;
-	ctx->bind_depth_stencil_alpha_state = noop_bind_state;
-	ctx->bind_fragment_sampler_states = noop_bind_sampler;
-	ctx->bind_fs_state = noop_bind_state;
-	ctx->bind_rasterizer_state = noop_bind_state;
-	ctx->bind_vertex_elements_state = noop_bind_state;
-	ctx->bind_vertex_sampler_states = noop_bind_sampler;
-	ctx->bind_vs_state = noop_bind_state;
-	ctx->delete_blend_state = noop_delete_state;
-	ctx->delete_depth_stencil_alpha_state = noop_delete_state;
-	ctx->delete_fs_state = noop_delete_state;
-	ctx->delete_rasterizer_state = noop_delete_state;
-	ctx->delete_sampler_state = noop_delete_state;
-	ctx->delete_vertex_elements_state = noop_delete_vertex_element;
-	ctx->delete_vs_state = noop_delete_state;
-	ctx->set_blend_color = noop_set_blend_color;
-	ctx->set_clip_state = noop_set_clip_state;
-	ctx->set_constant_buffer = noop_set_constant_buffer;
-	ctx->set_fragment_sampler_views = noop_set_ps_sampler_view;
-	ctx->set_framebuffer_state = noop_set_framebuffer_state;
-	ctx->set_polygon_stipple = noop_set_polygon_stipple;
-	ctx->set_sample_mask = noop_set_sample_mask;
-	ctx->set_scissor_state = noop_set_scissor_state;
-	ctx->set_stencil_ref = noop_set_stencil_ref;
-	ctx->set_vertex_buffers = noop_set_vertex_buffers;
-	ctx->set_index_buffer = noop_set_index_buffer;
-	ctx->set_vertex_sampler_views = noop_set_vs_sampler_view;
-	ctx->set_viewport_state = noop_set_viewport_state;
-	ctx->sampler_view_destroy = noop_sampler_view_destroy;
-	ctx->surface_destroy = noop_surface_destroy;
-	ctx->draw_vbo = noop_draw_vbo;
-	ctx->create_stream_output_target = noop_create_stream_output_target;
-	ctx->stream_output_target_destroy = noop_stream_output_target_destroy;
-	ctx->set_stream_output_targets = noop_set_stream_output_targets;
+   ctx->create_blend_state = noop_create_blend_state;
+   ctx->create_depth_stencil_alpha_state = noop_create_dsa_state;
+   ctx->create_fs_state = noop_create_shader_state;
+   ctx->create_rasterizer_state = noop_create_rs_state;
+   ctx->create_sampler_state = noop_create_sampler_state;
+   ctx->create_sampler_view = noop_create_sampler_view;
+   ctx->create_surface = noop_create_surface;
+   ctx->create_vertex_elements_state = noop_create_vertex_elements;
+   ctx->create_compute_state = noop_create_compute_state;
+   ctx->create_tcs_state = noop_create_shader_state;
+   ctx->create_tes_state = noop_create_shader_state;
+   ctx->create_gs_state = noop_create_shader_state;
+   ctx->create_vs_state = noop_create_shader_state;
+   ctx->bind_blend_state = noop_bind_state;
+   ctx->bind_depth_stencil_alpha_state = noop_bind_state;
+   ctx->bind_sampler_states = noop_bind_sampler_states;
+   ctx->bind_fs_state = noop_bind_state;
+   ctx->bind_rasterizer_state = noop_bind_state;
+   ctx->bind_vertex_elements_state = noop_bind_state;
+   ctx->bind_compute_state = noop_bind_state;
+   ctx->bind_tcs_state = noop_bind_state;
+   ctx->bind_tes_state = noop_bind_state;
+   ctx->bind_gs_state = noop_bind_state;
+   ctx->bind_vs_state = noop_bind_state;
+   ctx->delete_blend_state = noop_delete_state;
+   ctx->delete_depth_stencil_alpha_state = noop_delete_state;
+   ctx->delete_fs_state = noop_delete_state;
+   ctx->delete_rasterizer_state = noop_delete_state;
+   ctx->delete_sampler_state = noop_delete_state;
+   ctx->delete_vertex_elements_state = noop_delete_state;
+   ctx->delete_compute_state = noop_delete_state;
+   ctx->delete_tcs_state = noop_delete_state;
+   ctx->delete_tes_state = noop_delete_state;
+   ctx->delete_gs_state = noop_delete_state;
+   ctx->delete_vs_state = noop_delete_state;
+   ctx->set_blend_color = noop_set_blend_color;
+   ctx->set_clip_state = noop_set_clip_state;
+   ctx->set_constant_buffer = noop_set_constant_buffer;
+   ctx->set_sampler_views = noop_set_sampler_views;
+   ctx->set_framebuffer_state = noop_set_framebuffer_state;
+   ctx->set_polygon_stipple = noop_set_polygon_stipple;
+   ctx->set_sample_mask = noop_set_sample_mask;
+   ctx->set_scissor_states = noop_set_scissor_states;
+   ctx->set_stencil_ref = noop_set_stencil_ref;
+   ctx->set_vertex_buffers = noop_set_vertex_buffers;
+   ctx->set_index_buffer = noop_set_index_buffer;
+   ctx->set_viewport_states = noop_set_viewport_states;
+   ctx->sampler_view_destroy = noop_sampler_view_destroy;
+   ctx->surface_destroy = noop_surface_destroy;
+   ctx->draw_vbo = noop_draw_vbo;
+   ctx->launch_grid = noop_launch_grid;
+   ctx->create_stream_output_target = noop_create_stream_output_target;
+   ctx->stream_output_target_destroy = noop_stream_output_target_destroy;
+   ctx->set_stream_output_targets = noop_set_stream_output_targets;
 }