#include "svga_cmd.h"
#include "svga_surface.h"
+#include "util/u_format.h"
+#include "util/u_surface.h"
+
#define FILE_DEBUG_FLAG DEBUG_BLIT
+/* XXX still have doubts about this... */
static void svga_surface_copy(struct pipe_context *pipe,
- struct pipe_surface *dest,
- unsigned destx, unsigned desty,
- struct pipe_surface *src,
- unsigned srcx, unsigned srcy,
- unsigned width, unsigned height)
-{
+ struct pipe_resource* dst_tex,
+ unsigned dst_level,
+ unsigned dstx, unsigned dsty, unsigned dstz,
+ struct pipe_resource* src_tex,
+ unsigned src_level,
+ const struct pipe_box *src_box)
+ {
struct svga_context *svga = svga_context(pipe);
+ struct svga_texture *stex, *dtex;
+/* struct pipe_screen *screen = pipe->screen;
SVGA3dCopyBox *box;
enum pipe_error ret;
+ struct pipe_surface *srcsurf, *dstsurf;*/
+ unsigned dst_face, dst_z, src_face, src_z;
+
+ /* Emit buffered drawing commands, and any back copies.
+ */
+ svga_surfaces_flush( svga );
+
+ /* Fallback for buffers. */
+ if (dst_tex->target == PIPE_BUFFER && src_tex->target == PIPE_BUFFER) {
+ util_resource_copy_region(pipe, dst_tex, dst_level, dstx, dsty, dstz,
+ src_tex, src_level, src_box);
+ return;
+ }
- svga_hwtnl_flush_retry( svga );
+ stex = svga_texture(src_tex);
+ dtex = svga_texture(dst_tex);
+
+#if 0
+ srcsurf = screen->get_tex_surface(screen, src_tex,
+ src_level, src_box->z, src_box->z,
+ PIPE_BIND_SAMPLER_VIEW);
+
+ dstsurf = screen->get_tex_surface(screen, dst_tex,
+ dst_level, dst_box->z, dst_box->z,
+ PIPE_BIND_RENDER_TARGET);
SVGA_DBG(DEBUG_DMA, "blit to sid %p (%d,%d), from sid %p (%d,%d) sz %dx%d\n",
- svga_surface(dest)->handle,
- destx, desty,
- svga_surface(src)->handle,
- srcx, srcy,
+ svga_surface(dstsurf)->handle,
+ dstx, dsty,
+ svga_surface(srcsurf)->handle,
+ src_box->x, src_box->y,
width, height);
ret = SVGA3D_BeginSurfaceCopy(svga->swc,
- src,
- dest,
+ srcsurf,
+ dstsurf,
&box,
1);
if(ret != PIPE_OK) {
svga_context_flush(svga, NULL);
ret = SVGA3D_BeginSurfaceCopy(svga->swc,
- src,
- dest,
+ srcsurf,
+ dstsurf,
&box,
1);
assert(ret == PIPE_OK);
}
- box->x = destx;
- box->y = desty;
+ box->x = dstx;
+ box->y = dsty;
box->z = 0;
box->w = width;
box->h = height;
box->d = 1;
- box->srcx = srcx;
- box->srcy = srcy;
+ box->srcx = src_box->x;
+ box->srcy = src_box->y;
box->srcz = 0;
SVGA_FIFOCommitAll(svga->swc);
- svga_surface(dest)->dirty = TRUE;
- svga_propagate_surface(pipe, dest);
+ svga_surface(dstsurf)->dirty = TRUE;
+ svga_propagate_surface(pipe, dstsurf);
+
+ pipe_surface_reference(&srcsurf, NULL);
+ pipe_surface_reference(&dstsurf, NULL);
+
+#else
+ if (src_tex->target == PIPE_TEXTURE_CUBE) {
+ src_face = src_box->z;
+ src_z = 0;
+ assert(src_box->depth == 1);
+ }
+ else {
+ src_face = 0;
+ src_z = src_box->z;
+ }
+ /* different src/dst type???*/
+ if (dst_tex->target == PIPE_TEXTURE_CUBE) {
+ dst_face = dstz;
+ dst_z = 0;
+ assert(src_box->depth == 1);
+ }
+ else {
+ dst_face = 0;
+ dst_z = dstz;
+ }
+ svga_texture_copy_handle(svga,
+ stex->handle,
+ src_box->x, src_box->y, src_z,
+ src_level, src_face,
+ dtex->handle,
+ dstx, dsty, dst_z,
+ dst_level, dst_face,
+ src_box->width, src_box->height, src_box->depth);
+
+#endif
+
+ /* Mark the destination image as being defined */
+ svga_define_texture_level(dtex, dst_face, dst_level);
+}
+
+
+static void svga_blit(struct pipe_context *pipe,
+ const struct pipe_blit_info *blit_info)
+{
+ struct svga_context *svga = svga_context(pipe);
+ struct pipe_blit_info info = *blit_info;
+
+ if (info.src.resource->nr_samples > 1 &&
+ info.dst.resource->nr_samples <= 1 &&
+ !util_format_is_depth_or_stencil(info.src.resource->format) &&
+ !util_format_is_pure_integer(info.src.resource->format)) {
+ debug_printf("svga: color resolve unimplemented\n");
+ return;
+ }
+
+ if (util_try_blit_via_copy_region(pipe, &info)) {
+ return; /* done */
+ }
+
+ if (info.mask & PIPE_MASK_S) {
+ debug_printf("svga: cannot blit stencil, skipping\n");
+ info.mask &= ~PIPE_MASK_S;
+ }
+
+ if (!util_blitter_is_blit_supported(svga->blitter, &info)) {
+ debug_printf("svga: blit unsupported %s -> %s\n",
+ util_format_short_name(info.src.resource->format),
+ util_format_short_name(info.dst.resource->format));
+ return;
+ }
+
+ /* XXX turn off occlusion and streamout queries */
+
+ util_blitter_save_vertex_buffer_slot(svga->blitter, svga->curr.vb);
+ util_blitter_save_vertex_elements(svga->blitter, (void*)svga->curr.velems);
+ util_blitter_save_vertex_shader(svga->blitter, svga->curr.vs);
+ /*util_blitter_save_geometry_shader(svga->blitter, svga->curr.gs);*/
+ /*util_blitter_save_so_targets(svga->blitter, svga->num_so_targets,
+ (struct pipe_stream_output_target**)svga->so_targets);*/
+ util_blitter_save_rasterizer(svga->blitter, (void*)svga->curr.rast);
+ util_blitter_save_viewport(svga->blitter, &svga->curr.viewport);
+ util_blitter_save_scissor(svga->blitter, &svga->curr.scissor);
+ util_blitter_save_fragment_shader(svga->blitter, svga->curr.fs);
+ util_blitter_save_blend(svga->blitter, (void*)svga->curr.blend);
+ util_blitter_save_depth_stencil_alpha(svga->blitter,
+ (void*)svga->curr.depth);
+ util_blitter_save_stencil_ref(svga->blitter, &svga->curr.stencil_ref);
+ /*util_blitter_save_sample_mask(svga->blitter, svga->sample_mask);*/
+ util_blitter_save_framebuffer(svga->blitter, &svga->curr.framebuffer);
+ util_blitter_save_fragment_sampler_states(svga->blitter,
+ svga->curr.num_samplers,
+ (void**)svga->curr.sampler);
+ util_blitter_save_fragment_sampler_views(svga->blitter,
+ svga->curr.num_sampler_views,
+ svga->curr.sampler_views);
+ /*util_blitter_save_render_condition(svga->blitter, svga->render_cond_query,
+ svga->render_cond_cond, svga->render_cond_mode);*/
+ util_blitter_blit(svga->blitter, &info);
+}
+
+
+static void
+svga_flush_resource(struct pipe_context *pipe,
+ struct pipe_resource *resource)
+{
}
void
svga_init_blit_functions(struct svga_context *svga)
{
- svga->pipe.surface_copy = svga_surface_copy;
+ svga->pipe.resource_copy_region = svga_surface_copy;
+ svga->pipe.blit = svga_blit;
+ svga->pipe.flush_resource = svga_flush_resource;
}
projects / mesa.git / blobdiff