diff options
| -rw-r--r-- | src/gallium/drivers/freedreno/freedreno_blitter.c | 146 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/freedreno_blitter.h | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/freedreno_draw.c | 71 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/freedreno_resource.c | 75 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/freedreno_resource.h | 4 |
5 files changed, 153 insertions, 149 deletions
diff --git a/src/gallium/drivers/freedreno/freedreno_blitter.c b/src/gallium/drivers/freedreno/freedreno_blitter.c index 99edd0186d3..c8f034759a9 100644 --- a/src/gallium/drivers/freedreno/freedreno_blitter.c +++ b/src/gallium/drivers/freedreno/freedreno_blitter.c @@ -30,6 +30,7 @@ #include "freedreno_blitter.h" #include "freedreno_context.h" #include "freedreno_resource.h" +#include "freedreno_fence.h" /* generic blit using u_blitter.. slightly modified version of util_blitter_blit * which also handles PIPE_BUFFER: @@ -82,6 +83,52 @@ default_src_texture(struct pipe_sampler_view *src_templ, src_templ->swizzle_a = PIPE_SWIZZLE_W; } +static void +fd_blitter_pipe_begin(struct fd_context *ctx, bool render_cond, bool discard, + enum fd_render_stage stage) +{ + fd_fence_ref(ctx->base.screen, &ctx->last_fence, NULL); + + util_blitter_save_fragment_constant_buffer_slot(ctx->blitter, + ctx->constbuf[PIPE_SHADER_FRAGMENT].cb); + util_blitter_save_vertex_buffer_slot(ctx->blitter, ctx->vtx.vertexbuf.vb); + util_blitter_save_vertex_elements(ctx->blitter, ctx->vtx.vtx); + util_blitter_save_vertex_shader(ctx->blitter, ctx->prog.vp); + util_blitter_save_so_targets(ctx->blitter, ctx->streamout.num_targets, + ctx->streamout.targets); + util_blitter_save_rasterizer(ctx->blitter, ctx->rasterizer); + util_blitter_save_viewport(ctx->blitter, &ctx->viewport); + util_blitter_save_scissor(ctx->blitter, &ctx->scissor); + util_blitter_save_fragment_shader(ctx->blitter, ctx->prog.fp); + util_blitter_save_blend(ctx->blitter, ctx->blend); + util_blitter_save_depth_stencil_alpha(ctx->blitter, ctx->zsa); + util_blitter_save_stencil_ref(ctx->blitter, &ctx->stencil_ref); + util_blitter_save_sample_mask(ctx->blitter, ctx->sample_mask); + util_blitter_save_framebuffer(ctx->blitter, &ctx->framebuffer); + util_blitter_save_fragment_sampler_states(ctx->blitter, + ctx->tex[PIPE_SHADER_FRAGMENT].num_samplers, + (void **)ctx->tex[PIPE_SHADER_FRAGMENT].samplers); + util_blitter_save_fragment_sampler_views(ctx->blitter, + ctx->tex[PIPE_SHADER_FRAGMENT].num_textures, + ctx->tex[PIPE_SHADER_FRAGMENT].textures); + if (!render_cond) + util_blitter_save_render_condition(ctx->blitter, + ctx->cond_query, ctx->cond_cond, ctx->cond_mode); + + if (ctx->batch) + fd_batch_set_stage(ctx->batch, stage); + + ctx->in_blit = discard; +} + +static void +fd_blitter_pipe_end(struct fd_context *ctx) +{ + if (ctx->batch) + fd_batch_set_stage(ctx->batch, FD_STAGE_NULL); + ctx->in_blit = false; +} + bool fd_blitter_blit(struct fd_context *ctx, const struct pipe_blit_info *info) { @@ -128,6 +175,105 @@ fd_blitter_blit(struct fd_context *ctx, const struct pipe_blit_info *info) return true; } +/* Generic clear implementation (partially) using u_blitter: */ +void +fd_blitter_clear(struct pipe_context *pctx, unsigned buffers, + const union pipe_color_union *color, double depth, unsigned stencil) +{ + struct fd_context *ctx = fd_context(pctx); + struct pipe_framebuffer_state *pfb = &ctx->batch->framebuffer; + struct blitter_context *blitter = ctx->blitter; + + fd_blitter_pipe_begin(ctx, false, true, FD_STAGE_CLEAR); + + util_blitter_common_clear_setup(blitter, pfb->width, pfb->height, + buffers, NULL, NULL); + + struct pipe_stencil_ref sr = { + .ref_value = { stencil & 0xff } + }; + pctx->set_stencil_ref(pctx, &sr); + + struct pipe_constant_buffer cb = { + .buffer_size = 16, + .user_buffer = &color->ui, + }; + pctx->set_constant_buffer(pctx, PIPE_SHADER_FRAGMENT, 0, &cb); + + if (!ctx->clear_rs_state) { + const struct pipe_rasterizer_state tmpl = { + .cull_face = PIPE_FACE_NONE, + .half_pixel_center = 1, + .bottom_edge_rule = 1, + .flatshade = 1, + .depth_clip_near = 1, + .depth_clip_far = 1, + }; + ctx->clear_rs_state = pctx->create_rasterizer_state(pctx, &tmpl); + } + pctx->bind_rasterizer_state(pctx, ctx->clear_rs_state); + + struct pipe_viewport_state vp = { + .scale = { 0.5f * pfb->width, -0.5f * pfb->height, depth }, + .translate = { 0.5f * pfb->width, 0.5f * pfb->height, 0.0f }, + }; + pctx->set_viewport_states(pctx, 0, 1, &vp); + + pctx->bind_vertex_elements_state(pctx, ctx->solid_vbuf_state.vtx); + pctx->set_vertex_buffers(pctx, blitter->vb_slot, 1, + &ctx->solid_vbuf_state.vertexbuf.vb[0]); + pctx->set_stream_output_targets(pctx, 0, NULL, NULL); + pctx->bind_vs_state(pctx, ctx->solid_prog.vp); + pctx->bind_fs_state(pctx, ctx->solid_prog.fp); + + struct pipe_draw_info info = { + .mode = PIPE_PRIM_MAX, /* maps to DI_PT_RECTLIST */ + .count = 2, + .max_index = 1, + .instance_count = 1, + }; + ctx->draw_vbo(ctx, &info, 0); + + util_blitter_restore_constant_buffer_state(blitter); + util_blitter_restore_vertex_states(blitter); + util_blitter_restore_fragment_states(blitter); + util_blitter_restore_textures(blitter); + util_blitter_restore_fb_state(blitter); + util_blitter_restore_render_cond(blitter); + util_blitter_unset_running_flag(blitter); + + fd_blitter_pipe_end(ctx); +} + +/** + * Optimal hardware path for blitting pixels. + * Scaling, format conversion, up- and downsampling (resolve) are allowed. + */ +void +fd_blit(struct pipe_context *pctx, const struct pipe_blit_info *blit_info) +{ + struct fd_context *ctx = fd_context(pctx); + struct pipe_blit_info info = *blit_info; + + if (info.render_condition_enable && !fd_render_condition_check(pctx)) + return; + + if (info.mask & PIPE_MASK_S) { + DBG("cannot blit stencil, skipping"); + info.mask &= ~PIPE_MASK_S; + } + + if (!util_blitter_is_blit_supported(ctx->blitter, &info)) { + DBG("blit unsupported %s -> %s", + util_format_short_name(info.src.resource->format), + util_format_short_name(info.dst.resource->format)); + return; + } + + if (!(ctx->blit && ctx->blit(ctx, &info))) + fd_blitter_blit(ctx, &info); +} + /** * _copy_region using pipe (3d engine) */ diff --git a/src/gallium/drivers/freedreno/freedreno_blitter.h b/src/gallium/drivers/freedreno/freedreno_blitter.h index 70f71fcb667..1a58ad69959 100644 --- a/src/gallium/drivers/freedreno/freedreno_blitter.h +++ b/src/gallium/drivers/freedreno/freedreno_blitter.h @@ -33,6 +33,10 @@ bool fd_blitter_blit(struct fd_context *ctx, const struct pipe_blit_info *info); +void +fd_blitter_clear(struct pipe_context *pctx, unsigned buffers, + const union pipe_color_union *color, double depth, unsigned stencil); + void fd_resource_copy_region(struct pipe_context *pctx, struct pipe_resource *dst, unsigned dst_level, @@ -41,4 +45,6 @@ void fd_resource_copy_region(struct pipe_context *pctx, unsigned src_level, const struct pipe_box *src_box); +void fd_blit(struct pipe_context *pctx, const struct pipe_blit_info *blit_info); + #endif /* FREEDRENO_BLIT_H_ */ diff --git a/src/gallium/drivers/freedreno/freedreno_draw.c b/src/gallium/drivers/freedreno/freedreno_draw.c index 67038868104..ae7be1ab5a1 100644 --- a/src/gallium/drivers/freedreno/freedreno_draw.c +++ b/src/gallium/drivers/freedreno/freedreno_draw.c @@ -32,6 +32,7 @@ #include "util/u_format.h" #include "util/u_helpers.h" +#include "freedreno_blitter.h" #include "freedreno_draw.h" #include "freedreno_context.h" #include "freedreno_fence.h" @@ -303,76 +304,6 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) pipe_resource_reference(&indexbuf, NULL); } -/* Generic clear implementation (partially) using u_blitter: */ -static void -fd_blitter_clear(struct pipe_context *pctx, unsigned buffers, - const union pipe_color_union *color, double depth, unsigned stencil) -{ - struct fd_context *ctx = fd_context(pctx); - struct pipe_framebuffer_state *pfb = &ctx->batch->framebuffer; - struct blitter_context *blitter = ctx->blitter; - - fd_blitter_pipe_begin(ctx, false, true, FD_STAGE_CLEAR); - - util_blitter_common_clear_setup(blitter, pfb->width, pfb->height, - buffers, NULL, NULL); - - struct pipe_stencil_ref sr = { - .ref_value = { stencil & 0xff } - }; - pctx->set_stencil_ref(pctx, &sr); - - struct pipe_constant_buffer cb = { - .buffer_size = 16, - .user_buffer = &color->ui, - }; - pctx->set_constant_buffer(pctx, PIPE_SHADER_FRAGMENT, 0, &cb); - - if (!ctx->clear_rs_state) { - const struct pipe_rasterizer_state tmpl = { - .cull_face = PIPE_FACE_NONE, - .half_pixel_center = 1, - .bottom_edge_rule = 1, - .flatshade = 1, - .depth_clip_near = 1, - .depth_clip_far = 1, - }; - ctx->clear_rs_state = pctx->create_rasterizer_state(pctx, &tmpl); - } - pctx->bind_rasterizer_state(pctx, ctx->clear_rs_state); - - struct pipe_viewport_state vp = { - .scale = { 0.5f * pfb->width, -0.5f * pfb->height, depth }, - .translate = { 0.5f * pfb->width, 0.5f * pfb->height, 0.0f }, - }; - pctx->set_viewport_states(pctx, 0, 1, &vp); - - pctx->bind_vertex_elements_state(pctx, ctx->solid_vbuf_state.vtx); - pctx->set_vertex_buffers(pctx, blitter->vb_slot, 1, - &ctx->solid_vbuf_state.vertexbuf.vb[0]); - pctx->set_stream_output_targets(pctx, 0, NULL, NULL); - pctx->bind_vs_state(pctx, ctx->solid_prog.vp); - pctx->bind_fs_state(pctx, ctx->solid_prog.fp); - - struct pipe_draw_info info = { - .mode = PIPE_PRIM_MAX, /* maps to DI_PT_RECTLIST */ - .count = 2, - .max_index = 1, - .instance_count = 1, - }; - ctx->draw_vbo(ctx, &info, 0); - - util_blitter_restore_constant_buffer_state(blitter); - util_blitter_restore_vertex_states(blitter); - util_blitter_restore_fragment_states(blitter); - util_blitter_restore_textures(blitter); - util_blitter_restore_fb_state(blitter); - util_blitter_restore_render_cond(blitter); - util_blitter_unset_running_flag(blitter); - - fd_blitter_pipe_end(ctx); -} - static void fd_clear(struct pipe_context *pctx, unsigned buffers, const union pipe_color_union *color, double depth, unsigned stencil) diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c index 835de9f93ee..5f99a7ca60c 100644 --- a/src/gallium/drivers/freedreno/freedreno_resource.c +++ b/src/gallium/drivers/freedreno/freedreno_resource.c @@ -1109,81 +1109,6 @@ fd_render_condition_check(struct pipe_context *pctx) return true; } -/** - * Optimal hardware path for blitting pixels. - * Scaling, format conversion, up- and downsampling (resolve) are allowed. - */ -static void -fd_blit(struct pipe_context *pctx, const struct pipe_blit_info *blit_info) -{ - struct fd_context *ctx = fd_context(pctx); - struct pipe_blit_info info = *blit_info; - - if (info.render_condition_enable && !fd_render_condition_check(pctx)) - return; - - if (info.mask & PIPE_MASK_S) { - DBG("cannot blit stencil, skipping"); - info.mask &= ~PIPE_MASK_S; - } - - if (!util_blitter_is_blit_supported(ctx->blitter, &info)) { - DBG("blit unsupported %s -> %s", - util_format_short_name(info.src.resource->format), - util_format_short_name(info.dst.resource->format)); - return; - } - - if (!(ctx->blit && ctx->blit(ctx, &info))) - fd_blitter_blit(ctx, &info); -} - -void -fd_blitter_pipe_begin(struct fd_context *ctx, bool render_cond, bool discard, - enum fd_render_stage stage) -{ - fd_fence_ref(ctx->base.screen, &ctx->last_fence, NULL); - - util_blitter_save_fragment_constant_buffer_slot(ctx->blitter, - ctx->constbuf[PIPE_SHADER_FRAGMENT].cb); - util_blitter_save_vertex_buffer_slot(ctx->blitter, ctx->vtx.vertexbuf.vb); - util_blitter_save_vertex_elements(ctx->blitter, ctx->vtx.vtx); - util_blitter_save_vertex_shader(ctx->blitter, ctx->prog.vp); - util_blitter_save_so_targets(ctx->blitter, ctx->streamout.num_targets, - ctx->streamout.targets); - util_blitter_save_rasterizer(ctx->blitter, ctx->rasterizer); - util_blitter_save_viewport(ctx->blitter, &ctx->viewport); - util_blitter_save_scissor(ctx->blitter, &ctx->scissor); - util_blitter_save_fragment_shader(ctx->blitter, ctx->prog.fp); - util_blitter_save_blend(ctx->blitter, ctx->blend); - util_blitter_save_depth_stencil_alpha(ctx->blitter, ctx->zsa); - util_blitter_save_stencil_ref(ctx->blitter, &ctx->stencil_ref); - util_blitter_save_sample_mask(ctx->blitter, ctx->sample_mask); - util_blitter_save_framebuffer(ctx->blitter, &ctx->framebuffer); - util_blitter_save_fragment_sampler_states(ctx->blitter, - ctx->tex[PIPE_SHADER_FRAGMENT].num_samplers, - (void **)ctx->tex[PIPE_SHADER_FRAGMENT].samplers); - util_blitter_save_fragment_sampler_views(ctx->blitter, - ctx->tex[PIPE_SHADER_FRAGMENT].num_textures, - ctx->tex[PIPE_SHADER_FRAGMENT].textures); - if (!render_cond) - util_blitter_save_render_condition(ctx->blitter, - ctx->cond_query, ctx->cond_cond, ctx->cond_mode); - - if (ctx->batch) - fd_batch_set_stage(ctx->batch, stage); - - ctx->in_blit = discard; -} - -void -fd_blitter_pipe_end(struct fd_context *ctx) -{ - if (ctx->batch) - fd_batch_set_stage(ctx->batch, FD_STAGE_NULL); - ctx->in_blit = false; -} - static void fd_invalidate_resource(struct pipe_context *pctx, struct pipe_resource *prsc) { diff --git a/src/gallium/drivers/freedreno/freedreno_resource.h b/src/gallium/drivers/freedreno/freedreno_resource.h index 2a31d637d73..9cdeea863bc 100644 --- a/src/gallium/drivers/freedreno/freedreno_resource.h +++ b/src/gallium/drivers/freedreno/freedreno_resource.h @@ -187,10 +187,6 @@ fd_resource_nr_samples(struct pipe_resource *prsc) return MAX2(1, prsc->nr_samples); } -void fd_blitter_pipe_begin(struct fd_context *ctx, bool render_cond, bool discard, - enum fd_render_stage stage); -void fd_blitter_pipe_end(struct fd_context *ctx); - void fd_resource_screen_init(struct pipe_screen *pscreen); void fd_resource_context_init(struct pipe_context *pctx); |