X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fgalahad%2Fglhd_context.c;h=2e61e5924a67832d9d755d5aa83b228d5c58d51a;hb=1d28650b551bb516fdff99d0a196c1fa133f6d05;hp=fe8fc81f01fc9862c895912f41eb2c1f254152e8;hpb=7bd926af8935f66e3a0e5c7d662c4ea6f30a54c6;p=mesa.git diff --git a/src/gallium/drivers/galahad/glhd_context.c b/src/gallium/drivers/galahad/glhd_context.c index fe8fc81f01f..2e61e5924a6 100644 --- a/src/gallium/drivers/galahad/glhd_context.c +++ b/src/gallium/drivers/galahad/glhd_context.c @@ -74,7 +74,7 @@ galahad_context_create_query(struct pipe_context *_pipe, } if (query_type == PIPE_QUERY_TIME_ELAPSED && - !pipe->screen->get_param(pipe->screen, PIPE_CAP_TIMER_QUERY)) { + !pipe->screen->get_param(pipe->screen, PIPE_CAP_QUERY_TIME_ELAPSED)) { glhd_error("Timer query requested but not supported"); } @@ -182,41 +182,22 @@ galahad_context_create_sampler_state(struct pipe_context *_pipe, } static void -galahad_context_bind_fragment_sampler_states(struct pipe_context *_pipe, - unsigned num_samplers, - void **samplers) -{ - struct galahad_context *glhd_pipe = galahad_context(_pipe); - struct pipe_context *pipe = glhd_pipe->pipe; - - if (num_samplers > PIPE_MAX_SAMPLERS) { - glhd_error("%u fragment samplers requested, " - "but only %u are permitted by API", - num_samplers, PIPE_MAX_SAMPLERS); - } - - pipe->bind_fragment_sampler_states(pipe, - num_samplers, - samplers); -} - -static void -galahad_context_bind_vertex_sampler_states(struct pipe_context *_pipe, +galahad_context_bind_sampler_states(struct pipe_context *_pipe, + unsigned shader, + unsigned start, unsigned num_samplers, void **samplers) { struct galahad_context *glhd_pipe = galahad_context(_pipe); struct pipe_context *pipe = glhd_pipe->pipe; - if (num_samplers > PIPE_MAX_VERTEX_SAMPLERS) { - glhd_error("%u vertex samplers requested, " + if (num_samplers > PIPE_MAX_SAMPLERS) { + glhd_error("%u samplers requested, " "but only %u are permitted by API", - num_samplers, PIPE_MAX_VERTEX_SAMPLERS); + num_samplers, PIPE_MAX_SAMPLERS); } - pipe->bind_vertex_sampler_states(pipe, - num_samplers, - samplers); + pipe->bind_sampler_states(pipe, shader, start, num_samplers, samplers); } static void @@ -306,72 +287,39 @@ galahad_context_delete_depth_stencil_alpha_state(struct pipe_context *_pipe, depth_stencil_alpha); } -static void * -galahad_context_create_fs_state(struct pipe_context *_pipe, - const struct pipe_shader_state *fs) -{ - struct galahad_context *glhd_pipe = galahad_context(_pipe); - struct pipe_context *pipe = glhd_pipe->pipe; - - return pipe->create_fs_state(pipe, - fs); -} - -static void -galahad_context_bind_fs_state(struct pipe_context *_pipe, - void *fs) -{ - struct galahad_context *glhd_pipe = galahad_context(_pipe); - struct pipe_context *pipe = glhd_pipe->pipe; - - pipe->bind_fs_state(pipe, - fs); -} - -static void -galahad_context_delete_fs_state(struct pipe_context *_pipe, - void *fs) -{ - struct galahad_context *glhd_pipe = galahad_context(_pipe); - struct pipe_context *pipe = glhd_pipe->pipe; - - pipe->delete_fs_state(pipe, - fs); -} - -static void * -galahad_context_create_vs_state(struct pipe_context *_pipe, - const struct pipe_shader_state *vs) -{ - struct galahad_context *glhd_pipe = galahad_context(_pipe); - struct pipe_context *pipe = glhd_pipe->pipe; - - return pipe->create_vs_state(pipe, - vs); -} - -static void -galahad_context_bind_vs_state(struct pipe_context *_pipe, - void *vs) -{ - struct galahad_context *glhd_pipe = galahad_context(_pipe); - struct pipe_context *pipe = glhd_pipe->pipe; - - pipe->bind_vs_state(pipe, - vs); -} - -static void -galahad_context_delete_vs_state(struct pipe_context *_pipe, - void *vs) -{ - struct galahad_context *glhd_pipe = galahad_context(_pipe); - struct pipe_context *pipe = glhd_pipe->pipe; +#define GLHD_SHADER_STATE(shader_type) \ + static void * \ + galahad_context_create_##shader_type##_state(struct pipe_context *_pipe, \ + const struct pipe_shader_state *state) \ + { \ + struct galahad_context *glhd_pipe = galahad_context(_pipe); \ + struct pipe_context *pipe = glhd_pipe->pipe; \ + return pipe->create_##shader_type##_state(pipe, state); \ + } \ + \ + static void \ + galahad_context_bind_##shader_type##_state(struct pipe_context *_pipe, \ + void *state) \ + { \ + struct galahad_context *glhd_pipe = galahad_context(_pipe); \ + struct pipe_context *pipe = glhd_pipe->pipe; \ + pipe->bind_##shader_type##_state(pipe, state); \ + } \ + \ + static void \ + galahad_context_delete_##shader_type##_state(struct pipe_context *_pipe, \ + void *state) \ + { \ + struct galahad_context *glhd_pipe = galahad_context(_pipe); \ + struct pipe_context *pipe = glhd_pipe->pipe; \ + pipe->delete_##shader_type##_state(pipe, state); \ + } - pipe->delete_vs_state(pipe, - vs); -} +GLHD_SHADER_STATE(fs) +GLHD_SHADER_STATE(vs) +GLHD_SHADER_STATE(gs) +#undef GLHD_SHADER_STATE static void * galahad_context_create_vertex_elements_state(struct pipe_context *_pipe, @@ -536,76 +484,52 @@ galahad_context_set_polygon_stipple(struct pipe_context *_pipe, } static void -galahad_context_set_scissor_state(struct pipe_context *_pipe, +galahad_context_set_scissor_states(struct pipe_context *_pipe, + unsigned start_slot, + unsigned num_scissors, const struct pipe_scissor_state *scissor) { struct galahad_context *glhd_pipe = galahad_context(_pipe); struct pipe_context *pipe = glhd_pipe->pipe; - pipe->set_scissor_state(pipe, - scissor); + pipe->set_scissor_states(pipe, start_slot, num_scissors, + scissor); } static void -galahad_context_set_viewport_state(struct pipe_context *_pipe, +galahad_context_set_viewport_states(struct pipe_context *_pipe, + unsigned start_slot, + unsigned num_viewports, const struct pipe_viewport_state *viewport) { struct galahad_context *glhd_pipe = galahad_context(_pipe); struct pipe_context *pipe = glhd_pipe->pipe; - pipe->set_viewport_state(pipe, - viewport); + pipe->set_viewport_states(pipe, start_slot, num_viewports, + viewport); } static void -galahad_context_set_fragment_sampler_views(struct pipe_context *_pipe, - unsigned num, - struct pipe_sampler_view **_views) -{ - struct galahad_context *glhd_pipe = galahad_context(_pipe); - struct pipe_context *pipe = glhd_pipe->pipe; - struct pipe_sampler_view *unwrapped_views[PIPE_MAX_SAMPLERS]; - struct pipe_sampler_view **views = NULL; - unsigned i; - - if (_views) { - for (i = 0; i < num; i++) - unwrapped_views[i] = galahad_sampler_view_unwrap(_views[i]); - for (; i < PIPE_MAX_SAMPLERS; i++) - unwrapped_views[i] = NULL; - - views = unwrapped_views; - } - - pipe->set_fragment_sampler_views(pipe, num, views); -} - -static void -galahad_context_set_vertex_sampler_views(struct pipe_context *_pipe, +galahad_context_set_sampler_views(struct pipe_context *_pipe, + unsigned shader, + unsigned start, unsigned num, struct pipe_sampler_view **_views) { struct galahad_context *glhd_pipe = galahad_context(_pipe); struct pipe_context *pipe = glhd_pipe->pipe; - struct pipe_sampler_view *unwrapped_views[PIPE_MAX_VERTEX_SAMPLERS]; - struct pipe_sampler_view **views = NULL; + struct pipe_sampler_view *unwrapped_views[PIPE_MAX_SHADER_SAMPLER_VIEWS]; unsigned i; - if (_views) { - for (i = 0; i < num; i++) - unwrapped_views[i] = galahad_sampler_view_unwrap(_views[i]); - for (; i < PIPE_MAX_VERTEX_SAMPLERS; i++) - unwrapped_views[i] = NULL; - - views = unwrapped_views; - } + for (i = 0; i < num; i++) + unwrapped_views[i] = galahad_sampler_view_unwrap(_views[i]); - pipe->set_vertex_sampler_views(pipe, num, views); + pipe->set_sampler_views(pipe, shader, start, num, unwrapped_views); } static void galahad_context_set_vertex_buffers(struct pipe_context *_pipe, - unsigned num_buffers, + unsigned start_slot, unsigned num_buffers, const struct pipe_vertex_buffer *_buffers) { struct galahad_context *glhd_pipe = galahad_context(_pipe); @@ -614,7 +538,7 @@ galahad_context_set_vertex_buffers(struct pipe_context *_pipe, struct pipe_vertex_buffer *buffers = NULL; unsigned i; - if (num_buffers) { + if (num_buffers && _buffers) { memcpy(unwrapped_buffers, _buffers, num_buffers * sizeof(*_buffers)); for (i = 0; i < num_buffers; i++) unwrapped_buffers[i].buffer = galahad_resource_unwrap(_buffers[i].buffer); @@ -622,7 +546,7 @@ galahad_context_set_vertex_buffers(struct pipe_context *_pipe, } pipe->set_vertex_buffers(pipe, - num_buffers, + start_slot, num_buffers, buffers); } @@ -635,15 +559,14 @@ galahad_context_set_index_buffer(struct pipe_context *_pipe, struct pipe_index_buffer unwrapped_ib, *ib = NULL; if (_ib) { - if (_ib->buffer) { + if (_ib->buffer || _ib->user_buffer) { switch (_ib->index_size) { case 1: case 2: case 4: break; default: - glhd_warn("index buffer %p has unrecognized index size %d", - (void *) _ib->buffer, _ib->index_size); + glhd_warn("unrecognized index size %d", _ib->index_size); break; } } @@ -660,16 +583,54 @@ galahad_context_set_index_buffer(struct pipe_context *_pipe, pipe->set_index_buffer(pipe, ib); } +static INLINE struct pipe_stream_output_target * +galahad_context_create_stream_output_target(struct pipe_context *_pipe, + struct pipe_resource *_res, + unsigned buffer_offset, + unsigned buffer_size) +{ + struct galahad_context *glhd_pipe = galahad_context(_pipe); + struct galahad_resource *glhd_resource_res = galahad_resource(_res); + struct pipe_context *pipe = glhd_pipe->pipe; + struct pipe_resource *res = glhd_resource_res->resource; + + return pipe->create_stream_output_target(pipe, + res, buffer_offset, buffer_size); +} + +static INLINE void +galahad_context_stream_output_target_destroy( + struct pipe_context *_pipe, + struct pipe_stream_output_target *target) +{ + struct galahad_context *glhd_pipe = galahad_context(_pipe); + struct pipe_context *pipe = glhd_pipe->pipe; + + pipe->stream_output_target_destroy(pipe, target); +} + +static INLINE void +galahad_context_set_stream_output_targets(struct pipe_context *_pipe, + unsigned num_targets, + struct pipe_stream_output_target **tgs, + const unsigned *offsets) +{ + struct galahad_context *glhd_pipe = galahad_context(_pipe); + struct pipe_context *pipe = glhd_pipe->pipe; + + pipe->set_stream_output_targets(pipe, num_targets, tgs, offsets); +} + static void galahad_context_resource_copy_region(struct pipe_context *_pipe, - struct pipe_resource *_dst, - unsigned dst_level, - unsigned dstx, - unsigned dsty, - unsigned dstz, - struct pipe_resource *_src, - unsigned src_level, - const struct pipe_box *src_box) + struct pipe_resource *_dst, + unsigned dst_level, + unsigned dstx, + unsigned dsty, + unsigned dstz, + struct pipe_resource *_src, + unsigned src_level, + const struct pipe_box *src_box) { struct galahad_context *glhd_pipe = galahad_context(_pipe); struct galahad_resource *glhd_resource_dst = galahad_resource(_dst); @@ -679,9 +640,14 @@ galahad_context_resource_copy_region(struct pipe_context *_pipe, struct pipe_resource *src = glhd_resource_src->resource; if (_dst->format != _src->format) { - glhd_warn("Format mismatch: Source is %s, destination is %s", - util_format_short_name(_src->format), - util_format_short_name(_dst->format)); + const struct util_format_description *src_desc = + util_format_description(_src->format); + const struct util_format_description *dst_desc = + util_format_description(_dst->format); + if (!util_is_format_compatible(src_desc, dst_desc)) + glhd_warn("Format mismatch: Source is %s, destination is %s", + src_desc->short_name, + dst_desc->short_name); } if ((_src->target == PIPE_BUFFER && _dst->target != PIPE_BUFFER) || @@ -701,6 +667,47 @@ galahad_context_resource_copy_region(struct pipe_context *_pipe, src_box); } +static void +galahad_context_blit(struct pipe_context *_pipe, + const struct pipe_blit_info *_info) +{ + struct galahad_context *glhd_pipe = galahad_context(_pipe); + struct pipe_context *pipe = glhd_pipe->pipe; + struct pipe_blit_info info = *_info; + + info.dst.resource = galahad_resource_unwrap(info.dst.resource); + info.src.resource = galahad_resource_unwrap(info.src.resource); + + if (info.dst.box.width < 0 || + info.dst.box.height < 0) + glhd_error("Destination dimensions are negative"); + + if (info.filter != PIPE_TEX_FILTER_NEAREST && + info.src.resource->target != PIPE_TEXTURE_3D && + info.dst.box.depth != info.src.box.depth) + glhd_error("Filtering in z-direction on non-3D texture"); + + if (util_format_is_depth_or_stencil(info.dst.format) != + util_format_is_depth_or_stencil(info.src.format)) + glhd_error("Invalid format conversion: %s <- %s\n", + util_format_name(info.dst.format), + util_format_name(info.src.format)); + + pipe->blit(pipe, &info); +} + +static void +galahad_context_flush_resource(struct pipe_context *_pipe, + struct pipe_resource *_res) +{ + struct galahad_context *glhd_pipe = galahad_context(_pipe); + struct galahad_resource *glhd_resource_res = galahad_resource(_res); + struct pipe_context *pipe = glhd_pipe->pipe; + struct pipe_resource *res = glhd_resource_res->resource; + + pipe->flush_resource(pipe, res); +} + static void galahad_context_clear(struct pipe_context *_pipe, unsigned buffers, @@ -766,13 +773,13 @@ galahad_context_clear_depth_stencil(struct pipe_context *_pipe, static void galahad_context_flush(struct pipe_context *_pipe, - struct pipe_fence_handle **fence) + struct pipe_fence_handle **fence, + unsigned flags) { struct galahad_context *glhd_pipe = galahad_context(_pipe); struct pipe_context *pipe = glhd_pipe->pipe; - pipe->flush(pipe, - fence); + pipe->flush(pipe, fence, flags); } static struct pipe_sampler_view * @@ -832,58 +839,35 @@ galahad_context_surface_destroy(struct pipe_context *_pipe, } - -static struct pipe_transfer * -galahad_context_get_transfer(struct pipe_context *_context, - struct pipe_resource *_resource, - unsigned level, - unsigned usage, - const struct pipe_box *box) +static void * +galahad_context_transfer_map(struct pipe_context *_context, + struct pipe_resource *_resource, + unsigned level, + unsigned usage, + const struct pipe_box *box, + struct pipe_transfer **transfer) { struct galahad_context *glhd_context = galahad_context(_context); struct galahad_resource *glhd_resource = galahad_resource(_resource); struct pipe_context *context = glhd_context->pipe; struct pipe_resource *resource = glhd_resource->resource; struct pipe_transfer *result; - - result = context->get_transfer(context, - resource, - level, - usage, - box); - - if (result) - return galahad_transfer_create(glhd_context, glhd_resource, result); - return NULL; -} - -static void -galahad_context_transfer_destroy(struct pipe_context *_pipe, - struct pipe_transfer *_transfer) -{ - galahad_transfer_destroy(galahad_context(_pipe), - galahad_transfer(_transfer)); -} - -static void * -galahad_context_transfer_map(struct pipe_context *_context, - struct pipe_transfer *_transfer) -{ - struct galahad_context *glhd_context = galahad_context(_context); - struct galahad_transfer *glhd_transfer = galahad_transfer(_transfer); - struct pipe_context *context = glhd_context->pipe; - struct pipe_transfer *transfer = glhd_transfer->transfer; - - struct galahad_resource *glhd_resource = galahad_resource(_transfer->resource); + void *map; + + map = context->transfer_map(context, + resource, + level, + usage, + box, &result); + if (!map) + return NULL; glhd_resource->map_count++; - return context->transfer_map(context, - transfer); + *transfer = galahad_transfer_create(glhd_context, glhd_resource, result); + return *transfer ? map : NULL; } - - static void galahad_context_transfer_flush_region(struct pipe_context *_context, struct pipe_transfer *_transfer, @@ -899,7 +883,6 @@ galahad_context_transfer_flush_region(struct pipe_context *_context, box); } - static void galahad_context_transfer_unmap(struct pipe_context *_context, struct pipe_transfer *_transfer) @@ -919,6 +902,9 @@ galahad_context_transfer_unmap(struct pipe_context *_context, context->transfer_unmap(context, transfer); + + galahad_transfer_destroy(galahad_context(_context), + galahad_transfer(_transfer)); } @@ -951,12 +937,13 @@ galahad_context_transfer_inline_write(struct pipe_context *_context, static void galahad_context_render_condition(struct pipe_context *_context, struct pipe_query *query, + boolean condition, uint mode) { struct galahad_context *glhd_context = galahad_context(_context); struct pipe_context *context = glhd_context->pipe; - context->render_condition(context, query, mode); + context->render_condition(context, query, condition, mode); } @@ -991,10 +978,7 @@ galahad_context_create(struct pipe_screen *_screen, struct pipe_context *pipe) GLHD_PIPE_INIT(bind_blend_state); GLHD_PIPE_INIT(delete_blend_state); GLHD_PIPE_INIT(create_sampler_state); - GLHD_PIPE_INIT(bind_fragment_sampler_states); - GLHD_PIPE_INIT(bind_vertex_sampler_states); - //GLHD_PIPE_INIT(bind_geometry_sampler_states); - //GLHD_PIPE_INIT(bind_compute_sampler_states); + GLHD_PIPE_INIT(bind_sampler_states); GLHD_PIPE_INIT(delete_sampler_state); GLHD_PIPE_INIT(create_rasterizer_state); GLHD_PIPE_INIT(bind_rasterizer_state); @@ -1008,9 +992,9 @@ galahad_context_create(struct pipe_screen *_screen, struct pipe_context *pipe) GLHD_PIPE_INIT(create_vs_state); GLHD_PIPE_INIT(bind_vs_state); GLHD_PIPE_INIT(delete_vs_state); - //GLHD_PIPE_INIT(create_gs_state); - //GLHD_PIPE_INIT(bind_gs_state); - //GLHD_PIPE_INIT(delete_gs_state); + GLHD_PIPE_INIT(create_gs_state); + GLHD_PIPE_INIT(bind_gs_state); + GLHD_PIPE_INIT(delete_gs_state); GLHD_PIPE_INIT(create_vertex_elements_state); GLHD_PIPE_INIT(bind_vertex_elements_state); GLHD_PIPE_INIT(delete_vertex_elements_state); @@ -1021,20 +1005,18 @@ galahad_context_create(struct pipe_screen *_screen, struct pipe_context *pipe) GLHD_PIPE_INIT(set_constant_buffer); GLHD_PIPE_INIT(set_framebuffer_state); GLHD_PIPE_INIT(set_polygon_stipple); - GLHD_PIPE_INIT(set_scissor_state); - GLHD_PIPE_INIT(set_viewport_state); - GLHD_PIPE_INIT(set_fragment_sampler_views); - GLHD_PIPE_INIT(set_vertex_sampler_views); - //GLHD_PIPE_INIT(set_geometry_sampler_views); - //GLHD_PIPE_INIT(set_compute_sampler_views); + GLHD_PIPE_INIT(set_scissor_states); + GLHD_PIPE_INIT(set_viewport_states); + GLHD_PIPE_INIT(set_sampler_views); //GLHD_PIPE_INIT(set_shader_resources); GLHD_PIPE_INIT(set_vertex_buffers); GLHD_PIPE_INIT(set_index_buffer); - //GLHD_PIPE_INIT(create_stream_output_target); - //GLHD_PIPE_INIT(stream_output_target_destroy); - //GLHD_PIPE_INIT(set_stream_output_targets); + GLHD_PIPE_INIT(create_stream_output_target); + GLHD_PIPE_INIT(stream_output_target_destroy); + GLHD_PIPE_INIT(set_stream_output_targets); GLHD_PIPE_INIT(resource_copy_region); - //GLHD_PIPE_INIT(resource_resolve); + GLHD_PIPE_INIT(blit); + GLHD_PIPE_INIT(flush_resource); GLHD_PIPE_INIT(clear); GLHD_PIPE_INIT(clear_render_target); GLHD_PIPE_INIT(clear_depth_stencil); @@ -1043,8 +1025,6 @@ galahad_context_create(struct pipe_screen *_screen, struct pipe_context *pipe) GLHD_PIPE_INIT(sampler_view_destroy); GLHD_PIPE_INIT(create_surface); GLHD_PIPE_INIT(surface_destroy); - GLHD_PIPE_INIT(get_transfer); - GLHD_PIPE_INIT(transfer_destroy); GLHD_PIPE_INIT(transfer_map); GLHD_PIPE_INIT(transfer_flush_region); GLHD_PIPE_INIT(transfer_unmap);