gallium: add fallback for copying buffers to all drivers
Just to keep drivers working. Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
This commit is contained in:
parent
64f55216e4
commit
883d8a0b44
|
@ -37,6 +37,7 @@
|
||||||
#include "util/u_format.h"
|
#include "util/u_format.h"
|
||||||
#include "util/u_memory.h"
|
#include "util/u_memory.h"
|
||||||
#include "util/u_pack_color.h"
|
#include "util/u_pack_color.h"
|
||||||
|
#include "util/u_surface.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* surface functions using the render engine
|
* surface functions using the render engine
|
||||||
|
@ -51,6 +52,13 @@ i915_surface_copy_render(struct pipe_context *pipe,
|
||||||
{
|
{
|
||||||
struct i915_context *i915 = i915_context(pipe);
|
struct i915_context *i915 = i915_context(pipe);
|
||||||
|
|
||||||
|
/* Fallback for buffers. */
|
||||||
|
if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
|
||||||
|
util_resource_copy_region(pipe, dst, dst_level, dstx, dsty, dstz,
|
||||||
|
src, src_level, src_box);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
util_blitter_save_blend(i915->blitter, (void *)i915->blend);
|
util_blitter_save_blend(i915->blitter, (void *)i915->blend);
|
||||||
util_blitter_save_depth_stencil_alpha(i915->blitter, (void *)i915->depth_stencil);
|
util_blitter_save_depth_stencil_alpha(i915->blitter, (void *)i915->depth_stencil);
|
||||||
util_blitter_save_stencil_ref(i915->blitter, &i915->stencil_ref);
|
util_blitter_save_stencil_ref(i915->blitter, &i915->stencil_ref);
|
||||||
|
@ -158,6 +166,13 @@ i915_surface_copy_blitter(struct pipe_context *pipe,
|
||||||
struct pipe_resource *spt = &src_tex->b.b;
|
struct pipe_resource *spt = &src_tex->b.b;
|
||||||
unsigned dst_offset, src_offset; /* in bytes */
|
unsigned dst_offset, src_offset; /* in bytes */
|
||||||
|
|
||||||
|
/* Fallback for buffers. */
|
||||||
|
if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
|
||||||
|
util_resource_copy_region(pipe, dst, dst_level, dstx, dsty, dstz,
|
||||||
|
src, src_level, src_box);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* XXX cannot copy 3d regions at this time */
|
/* XXX cannot copy 3d regions at this time */
|
||||||
assert(src_box->depth == 1);
|
assert(src_box->depth == 1);
|
||||||
if (dst->target != PIPE_TEXTURE_CUBE &&
|
if (dst->target != PIPE_TEXTURE_CUBE &&
|
||||||
|
|
|
@ -67,6 +67,13 @@ lp_resource_copy(struct pipe_context *pipe,
|
||||||
unsigned height = src_box->height;
|
unsigned height = src_box->height;
|
||||||
assert(src_box->depth == 1);
|
assert(src_box->depth == 1);
|
||||||
|
|
||||||
|
/* Fallback for buffers. */
|
||||||
|
if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
|
||||||
|
util_resource_copy_region(pipe, dst, dst_level, dstx, dsty, dstz,
|
||||||
|
src, src_level, src_box);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
llvmpipe_flush_resource(pipe,
|
llvmpipe_flush_resource(pipe,
|
||||||
dst, dst_level, dstz,
|
dst, dst_level, dstz,
|
||||||
FALSE, /* read_only */
|
FALSE, /* read_only */
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#include "util/u_inlines.h"
|
#include "util/u_inlines.h"
|
||||||
#include "util/u_pack_color.h"
|
#include "util/u_pack_color.h"
|
||||||
#include "util/u_format.h"
|
#include "util/u_format.h"
|
||||||
|
#include "util/u_surface.h"
|
||||||
|
|
||||||
#include "nv50_context.h"
|
#include "nv50_context.h"
|
||||||
#include "nv50_resource.h"
|
#include "nv50_resource.h"
|
||||||
|
@ -198,6 +199,13 @@ nv50_resource_copy_region(struct pipe_context *pipe,
|
||||||
int ret;
|
int ret;
|
||||||
unsigned dst_layer = dstz, src_layer = src_box->z;
|
unsigned dst_layer = dstz, src_layer = src_box->z;
|
||||||
|
|
||||||
|
/* Fallback for buffers. */
|
||||||
|
if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
|
||||||
|
util_resource_copy_region(pipe, dst, dst_level, dstx, dsty, dstz,
|
||||||
|
src, src_level, src_box);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
assert((src->format == dst->format) ||
|
assert((src->format == dst->format) ||
|
||||||
(nv50_2d_format_faithful(src->format) &&
|
(nv50_2d_format_faithful(src->format) &&
|
||||||
nv50_2d_format_faithful(dst->format)));
|
nv50_2d_format_faithful(dst->format)));
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#include "util/u_inlines.h"
|
#include "util/u_inlines.h"
|
||||||
#include "util/u_pack_color.h"
|
#include "util/u_pack_color.h"
|
||||||
#include "util/u_format.h"
|
#include "util/u_format.h"
|
||||||
|
#include "util/u_surface.h"
|
||||||
|
|
||||||
#include "nvc0_context.h"
|
#include "nvc0_context.h"
|
||||||
#include "nvc0_resource.h"
|
#include "nvc0_resource.h"
|
||||||
|
@ -234,6 +235,13 @@ nvc0_resource_copy_region(struct pipe_context *pipe,
|
||||||
int ret;
|
int ret;
|
||||||
unsigned dst_layer = dstz, src_layer = src_box->z;
|
unsigned dst_layer = dstz, src_layer = src_box->z;
|
||||||
|
|
||||||
|
/* Fallback for buffers. */
|
||||||
|
if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
|
||||||
|
util_resource_copy_region(pipe, dst, dst_level, dstx, dsty, dstz,
|
||||||
|
src, src_level, src_box);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
nv04_resource(dst)->status |= NOUVEAU_BUFFER_STATUS_GPU_WRITING;
|
nv04_resource(dst)->status |= NOUVEAU_BUFFER_STATUS_GPU_WRITING;
|
||||||
|
|
||||||
if (src->format == dst->format) {
|
if (src->format == dst->format) {
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#include "util/u_memory.h"
|
#include "util/u_memory.h"
|
||||||
#include "util/u_pack_color.h"
|
#include "util/u_pack_color.h"
|
||||||
#include "util/u_blitter.h"
|
#include "util/u_blitter.h"
|
||||||
|
#include "util/u_surface.h"
|
||||||
|
|
||||||
#include "nouveau/nouveau_winsys.h"
|
#include "nouveau/nouveau_winsys.h"
|
||||||
#include "nouveau/nouveau_screen.h"
|
#include "nouveau/nouveau_screen.h"
|
||||||
|
@ -252,6 +253,13 @@ nvfx_resource_copy_region(struct pipe_context *pipe,
|
||||||
if(!w || !h)
|
if(!w || !h)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
/* Fallback for buffers. */
|
||||||
|
if (dstr->target == PIPE_BUFFER && srcr->target == PIPE_BUFFER) {
|
||||||
|
util_resource_copy_region(pipe, dstr, dst_level, dstx, dsty, dstz,
|
||||||
|
srcr, src_level, src_box);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(copy_threshold < 0)
|
if(copy_threshold < 0)
|
||||||
copy_threshold = debug_get_num_option("NOUVEAU_COPY_THRESHOLD", 4);
|
copy_threshold = debug_get_num_option("NOUVEAU_COPY_THRESHOLD", 4);
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
|
|
||||||
#include "util/u_format.h"
|
#include "util/u_format.h"
|
||||||
#include "util/u_pack_color.h"
|
#include "util/u_pack_color.h"
|
||||||
|
#include "util/u_surface.h"
|
||||||
|
|
||||||
enum r300_blitter_op /* bitmask */
|
enum r300_blitter_op /* bitmask */
|
||||||
{
|
{
|
||||||
|
@ -415,6 +416,13 @@ static void r300_resource_copy_region(struct pipe_context *pipe,
|
||||||
util_format_description(dst->format);
|
util_format_description(dst->format);
|
||||||
struct pipe_box box;
|
struct pipe_box box;
|
||||||
|
|
||||||
|
/* Fallback for buffers. */
|
||||||
|
if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
|
||||||
|
util_resource_copy_region(pipe, dst, dst_level, dstx, dsty, dstz,
|
||||||
|
src, src_level, src_box);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (r300->zmask_in_use && !r300->hyperz_locked) {
|
if (r300->zmask_in_use && !r300->hyperz_locked) {
|
||||||
if (fb->zsbuf->texture == src ||
|
if (fb->zsbuf->texture == src ||
|
||||||
fb->zsbuf->texture == dst) {
|
fb->zsbuf->texture == dst) {
|
||||||
|
|
|
@ -277,6 +277,13 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
|
||||||
struct texture_orig_info orig_info[2];
|
struct texture_orig_info orig_info[2];
|
||||||
boolean restore_orig[2];
|
boolean restore_orig[2];
|
||||||
|
|
||||||
|
/* Fallback for buffers. */
|
||||||
|
if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
|
||||||
|
util_resource_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
|
||||||
|
src, src_level, src_box);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (rsrc->depth && !rsrc->is_flushing_texture)
|
if (rsrc->depth && !rsrc->is_flushing_texture)
|
||||||
r600_texture_depth_flush(ctx, src, FALSE);
|
r600_texture_depth_flush(ctx, src, FALSE);
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,8 @@
|
||||||
#include "svga_cmd.h"
|
#include "svga_cmd.h"
|
||||||
#include "svga_surface.h"
|
#include "svga_surface.h"
|
||||||
|
|
||||||
|
#include "util/u_surface.h"
|
||||||
|
|
||||||
#define FILE_DEBUG_FLAG DEBUG_BLIT
|
#define FILE_DEBUG_FLAG DEBUG_BLIT
|
||||||
|
|
||||||
|
|
||||||
|
@ -54,6 +56,13 @@ static void svga_surface_copy(struct pipe_context *pipe,
|
||||||
*/
|
*/
|
||||||
svga_surfaces_flush( svga );
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
srcsurf = screen->get_tex_surface(screen, src_tex,
|
srcsurf = screen->get_tex_surface(screen, src_tex,
|
||||||
src_level, src_box->z, src_box->z,
|
src_level, src_box->z, src_box->z,
|
||||||
|
|
Loading…
Reference in New Issue