X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsvga%2Fsvga_context.c;h=ec86073ccc9d0fae4012f7e83786c8d39b66d4da;hb=8dee325752daf1850a1f497c82b30d0574a5b612;hp=460804ccd9df553e9fbdeb9e202a9bb412e4d798;hpb=37d0aea772a39f9ae7fe3d791e23c1be03ccf9de;p=mesa.git diff --git a/src/gallium/drivers/svga/svga_context.c b/src/gallium/drivers/svga/svga_context.c index 460804ccd9d..ec86073ccc9 100644 --- a/src/gallium/drivers/svga/svga_context.c +++ b/src/gallium/drivers/svga/svga_context.c @@ -50,34 +50,25 @@ DEBUG_GET_ONCE_BOOL_OPTION(no_swtnl, "SVGA_NO_SWTNL", FALSE) DEBUG_GET_ONCE_BOOL_OPTION(force_swtnl, "SVGA_FORCE_SWTNL", FALSE); DEBUG_GET_ONCE_BOOL_OPTION(use_min_mipmap, "SVGA_USE_MIN_MIPMAP", FALSE); -DEBUG_GET_ONCE_NUM_OPTION(disable_shader, "SVGA_DISABLE_SHADER", ~0); DEBUG_GET_ONCE_BOOL_OPTION(no_line_width, "SVGA_NO_LINE_WIDTH", FALSE); DEBUG_GET_ONCE_BOOL_OPTION(force_hw_line_stipple, "SVGA_FORCE_HW_LINE_STIPPLE", FALSE); -static void svga_destroy( struct pipe_context *pipe ) + +static void +svga_destroy(struct pipe_context *pipe) { - struct svga_context *svga = svga_context( pipe ); + struct svga_context *svga = svga_context(pipe); unsigned shader, i; /* free any alternate rasterizer states used for point sprite */ - for (i = 0; i < Elements(svga->rasterizer_no_cull); i++) { + for (i = 0; i < ARRAY_SIZE(svga->rasterizer_no_cull); i++) { if (svga->rasterizer_no_cull[i]) { pipe->delete_rasterizer_state(pipe, svga->rasterizer_no_cull[i]); } } - /* free polygon stipple state */ - if (svga->polygon_stipple.sampler) { - pipe->delete_sampler_state(pipe, svga->polygon_stipple.sampler); - } - if (svga->polygon_stipple.sampler_view) { - pipe->sampler_view_destroy(pipe, - &svga->polygon_stipple.sampler_view->base); - } - pipe_resource_reference(&svga->polygon_stipple.texture, NULL); - /* free HW constant buffers */ - for (shader = 0; shader < Elements(svga->state.hw_draw.constbuf); shader++) { + for (shader = 0; shader < ARRAY_SIZE(svga->state.hw_draw.constbuf); shader++) { pipe_resource_reference(&svga->state.hw_draw.constbuf[shader], NULL); } @@ -91,13 +82,13 @@ static void svga_destroy( struct pipe_context *pipe ) util_blitter_destroy(svga->blitter); - svga_cleanup_framebuffer( svga ); - svga_cleanup_tss_binding( svga ); - + svga_cleanup_sampler_state(svga); + svga_cleanup_framebuffer(svga); + svga_cleanup_tss_binding(svga); svga_cleanup_vertex_state(svga); - - svga_destroy_swtnl( svga ); - svga_hwtnl_destroy( svga->hwtnl ); + + svga_destroy_swtnl(svga); + svga_hwtnl_destroy(svga->hwtnl); svga->swc->destroy(svga->swc); @@ -112,21 +103,23 @@ static void svga_destroy( struct pipe_context *pipe ) util_bitmask_destroy(svga->stream_output_id_bm); util_bitmask_destroy(svga->query_id_bm); u_upload_destroy(svga->const0_upload); + u_upload_destroy(svga->pipe.stream_uploader); + u_upload_destroy(svga->pipe.const_uploader); + svga_texture_transfer_map_upload_destroy(svga); /* free user's constant buffers */ for (shader = 0; shader < PIPE_SHADER_TYPES; ++shader) { - for (i = 0; i < Elements(svga->curr.constbufs[shader]); ++i) { + for (i = 0; i < ARRAY_SIZE(svga->curr.constbufs[shader]); ++i) { pipe_resource_reference(&svga->curr.constbufs[shader][i].buffer, NULL); } } - FREE( svga ); + FREE(svga); } - -struct pipe_context *svga_context_create(struct pipe_screen *screen, - void *priv, unsigned flags) +struct pipe_context * +svga_context_create(struct pipe_screen *screen, void *priv, unsigned flags) { struct svga_screen *svgascreen = svga_screen(screen); struct svga_context *svga = NULL; @@ -141,7 +134,18 @@ struct pipe_context *svga_context_create(struct pipe_screen *screen, svga->pipe.screen = screen; svga->pipe.priv = priv; svga->pipe.destroy = svga_destroy; - svga->pipe.clear = svga_clear; + svga->pipe.stream_uploader = u_upload_create(&svga->pipe, 1024 * 1024, + PIPE_BIND_VERTEX_BUFFER | + PIPE_BIND_INDEX_BUFFER, + PIPE_USAGE_STREAM); + if (!svga->pipe.stream_uploader) + goto cleanup; + + svga->pipe.const_uploader = u_upload_create(&svga->pipe, 128 * 1024, + PIPE_BIND_CONSTANT_BUFFER, + PIPE_USAGE_STREAM); + if (!svga->pipe.const_uploader) + goto cleanup; svga->swc = svgascreen->sws->context_create(svgascreen->sws); if (!svga->swc) @@ -164,6 +168,7 @@ struct pipe_context *svga_context_create(struct pipe_screen *screen, svga_init_query_functions(svga); svga_init_surface_functions(svga); svga_init_stream_output_functions(svga); + svga_init_clear_functions(svga); /* init misc state */ svga->curr.sample_mask = ~0; @@ -172,7 +177,6 @@ struct pipe_context *svga_context_create(struct pipe_screen *screen, svga->debug.no_swtnl = debug_get_option_no_swtnl(); svga->debug.force_swtnl = debug_get_option_force_swtnl(); svga->debug.use_min_mipmap = debug_get_option_use_min_mipmap(); - svga->debug.disable_shader = debug_get_option_disable_shader(); svga->debug.no_line_width = debug_get_option_no_line_width(); svga->debug.force_hw_line_stipple = debug_get_option_force_hw_line_stipple(); @@ -213,38 +217,56 @@ struct pipe_context *svga_context_create(struct pipe_screen *screen, if (!svga_init_swtnl(svga)) goto cleanup; - ret = svga_emit_initial_state( svga ); + ret = svga_emit_initial_state(svga); if (ret != PIPE_OK) goto cleanup; svga->const0_upload = u_upload_create(&svga->pipe, CONST0_UPLOAD_DEFAULT_SIZE, - PIPE_BIND_CONSTANT_BUFFER); + PIPE_BIND_CONSTANT_BUFFER, + PIPE_USAGE_STREAM); if (!svga->const0_upload) goto cleanup; + if (!svga_texture_transfer_map_upload_create(svga)) + goto cleanup; + /* Avoid shortcircuiting state with initial value of zero. */ memset(&svga->state.hw_clear, 0xcd, sizeof(svga->state.hw_clear)); - memset(&svga->state.hw_clear.framebuffer, 0x0, + memset(&svga->state.hw_clear.framebuffer, 0x0, sizeof(svga->state.hw_clear.framebuffer)); memset(&svga->state.hw_draw, 0xcd, sizeof(svga->state.hw_draw)); memset(&svga->state.hw_draw.views, 0x0, sizeof(svga->state.hw_draw.views)); + memset(&svga->state.hw_draw.num_samplers, 0, + sizeof(svga->state.hw_draw.num_samplers)); memset(&svga->state.hw_draw.num_sampler_views, 0, sizeof(svga->state.hw_draw.num_sampler_views)); + memset(svga->state.hw_draw.sampler_views, 0, + sizeof(svga->state.hw_draw.sampler_views)); svga->state.hw_draw.num_views = 0; + svga->state.hw_draw.num_rendertargets = 0; + svga->state.hw_draw.dsv = NULL; /* Initialize the shader pointers */ svga->state.hw_draw.vs = NULL; svga->state.hw_draw.gs = NULL; svga->state.hw_draw.fs = NULL; + + /* Initialize the currently bound buffer resources */ memset(svga->state.hw_draw.constbuf, 0, sizeof(svga->state.hw_draw.constbuf)); memset(svga->state.hw_draw.default_constbuf_size, 0, sizeof(svga->state.hw_draw.default_constbuf_size)); memset(svga->state.hw_draw.enabled_constbufs, 0, sizeof(svga->state.hw_draw.enabled_constbufs)); + svga->state.hw_draw.ib = NULL; + svga->state.hw_draw.num_vbuffers = 0; + memset(svga->state.hw_draw.vbuffers, 0, + sizeof(svga->state.hw_draw.vbuffers)); + svga->state.hw_draw.const0_buffer = NULL; + svga->state.hw_draw.const0_handle = NULL; /* Create a no-operation blend state which we will bind whenever the * requested blend state is impossible (e.g. due to having an integer @@ -266,6 +288,7 @@ struct pipe_context *svga_context_create(struct pipe_screen *screen, } svga->dirty = ~0; + svga->pred.query_id = SVGA3D_INVALID_ID; return &svga->pipe; @@ -274,6 +297,11 @@ cleanup: if (svga->const0_upload) u_upload_destroy(svga->const0_upload); + if (svga->pipe.const_uploader) + u_upload_destroy(svga->pipe.const_uploader); + if (svga->pipe.stream_uploader) + u_upload_destroy(svga->pipe.stream_uploader); + svga_texture_transfer_map_upload_destroy(svga); if (svga->hwtnl) svga_hwtnl_destroy(svga->hwtnl); if (svga->swc) @@ -293,27 +321,49 @@ cleanup: } -void svga_context_flush( struct svga_context *svga, - struct pipe_fence_handle **pfence ) +void +svga_context_flush(struct svga_context *svga, + struct pipe_fence_handle **pfence) { struct svga_screen *svgascreen = svga_screen(svga->pipe.screen); struct pipe_fence_handle *fence = NULL; + uint64_t t0; + + SVGA_STATS_TIME_PUSH(svga_sws(svga), SVGA_STATS_TIME_CONTEXTFLUSH); svga->curr.nr_fbs = 0; + /* Unmap the 0th/default constant buffer. The u_upload_unmap() function + * will call pipe_context::transfer_flush_region() to indicate the + * region of the buffer which was modified (and needs to be uploaded). + */ + if (svga->state.hw_draw.const0_handle) { + assert(svga->state.hw_draw.const0_buffer); + u_upload_unmap(svga->const0_upload); + pipe_resource_reference(&svga->state.hw_draw.const0_buffer, NULL); + svga->state.hw_draw.const0_handle = NULL; + } + /* Ensure that texture dma uploads are processed * before submitting commands. */ svga_context_flush_buffers(svga); + svga->hud.command_buffer_size += + svga->swc->get_command_buffer_size(svga->swc); + /* Flush pending commands to hardware: */ + t0 = svga_get_time(svga); svga->swc->flush(svga->swc, &fence); + svga->hud.flush_time += (svga_get_time(svga) - t0); svga->hud.num_flushes++; svga_screen_cache_flush(svgascreen, fence); + SVGA3D_ResetLastCommand(svga->swc); + /* To force the re-emission of rendertargets and texture sampler bindings on * the next command buffer. */ @@ -334,7 +384,7 @@ void svga_context_flush( struct svga_context *svga, if (SVGA_DEBUG & DEBUG_SYNC) { if (fence) - svga->pipe.screen->fence_finish( svga->pipe.screen, fence, + svga->pipe.screen->fence_finish(svga->pipe.screen, NULL, fence, PIPE_TIMEOUT_INFINITE); } @@ -342,6 +392,8 @@ void svga_context_flush( struct svga_context *svga, svgascreen->sws->fence_reference(svgascreen->sws, pfence, fence); svgascreen->sws->fence_reference(svgascreen->sws, &fence, NULL); + + SVGA_STATS_TIME_POP(svga_sws(svga)); } @@ -354,9 +406,13 @@ svga_context_finish(struct svga_context *svga) struct pipe_screen *screen = svga->pipe.screen; struct pipe_fence_handle *fence = NULL; + SVGA_STATS_TIME_PUSH(svga_sws(svga), SVGA_STATS_TIME_CONTEXTFINISH); + svga_context_flush(svga, &fence); - svga->pipe.screen->fence_finish(screen, fence, PIPE_TIMEOUT_INFINITE); + screen->fence_finish(screen, NULL, fence, PIPE_TIMEOUT_INFINITE); screen->fence_reference(screen, &fence, NULL); + + SVGA_STATS_TIME_POP(svga_sws(svga)); } @@ -365,14 +421,15 @@ svga_context_finish(struct svga_context *svga) * If the command buffer overflows, we flush it and retry. * \sa svga_hwtnl_flush() */ -void svga_hwtnl_flush_retry( struct svga_context *svga ) +void +svga_hwtnl_flush_retry(struct svga_context *svga) { enum pipe_error ret = PIPE_OK; - ret = svga_hwtnl_flush( svga->hwtnl ); + ret = svga_hwtnl_flush(svga->hwtnl); if (ret == PIPE_ERROR_OUT_OF_MEMORY) { - svga_context_flush( svga, NULL ); - ret = svga_hwtnl_flush( svga->hwtnl ); + svga_context_flush(svga, NULL); + ret = svga_hwtnl_flush(svga->hwtnl); } assert(ret == PIPE_OK); @@ -384,8 +441,9 @@ void svga_hwtnl_flush_retry( struct svga_context *svga ) * * Otherwise DMA commands on the referred buffer will be emitted too late. */ -void svga_hwtnl_flush_buffer( struct svga_context *svga, - struct pipe_resource *buffer ) +void +svga_hwtnl_flush_buffer(struct svga_context *svga, + struct pipe_resource *buffer) { if (svga_hwtnl_is_buffer_referred(svga->hwtnl, buffer)) { svga_hwtnl_flush_retry(svga); @@ -393,32 +451,28 @@ void svga_hwtnl_flush_buffer( struct svga_context *svga, } -/* Emit all operations pending on host surfaces. - */ -void svga_surfaces_flush(struct svga_context *svga) +/** + * Emit all operations pending on host surfaces. + */ +void +svga_surfaces_flush(struct svga_context *svga) { - struct svga_screen *svgascreen = svga_screen(svga->pipe.screen); - unsigned i; + SVGA_STATS_TIME_PUSH(svga_sws(svga), SVGA_STATS_TIME_SURFACEFLUSH); /* Emit buffered drawing commands. */ - svga_hwtnl_flush_retry( svga ); + svga_hwtnl_flush_retry(svga); - /* Emit back-copy from render target view to texture. + /* Emit back-copy from render target views to textures. */ - for (i = 0; i < svgascreen->max_color_buffers; i++) { - if (svga->curr.framebuffer.cbufs[i]) - svga_propagate_surface(svga, svga->curr.framebuffer.cbufs[i]); - } - - if (svga->curr.framebuffer.zsbuf) - svga_propagate_surface(svga, svga->curr.framebuffer.zsbuf); + svga_propagate_rendertargets(svga); + SVGA_STATS_TIME_POP(svga_sws(svga)); } struct svga_winsys_context * -svga_winsys_context( struct pipe_context *pipe ) +svga_winsys_context(struct pipe_context *pipe) { - return svga_context( pipe )->swc; + return svga_context(pipe)->swc; }