KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nv50,nvc0: never convert in resource copy when format sizes match 

If there are any cases left where the st thinks that RGBA -> BGRA
will swap components, it will get what it deserves.

Now the GPU's 2D engine goes unused. What a shame.
This commit is contained in:
Christoph Bumiller 2011-07-25 18:13:26 +02:00
parent 425b179faf
commit 9e466e87e6
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/drivers/nv50/nv50_surface.c
View File

@ -198,6 +198,7 @@ nv50_resource_copy_region(struct pipe_context *pipe,
{
struct nv50_screen *screen = nv50_context(pipe)->screen;
int ret;
boolean m2mf;
unsigned dst_layer = dstz, src_layer = src_box->z;
/* Fallback for buffers. */
@ -207,9 +208,15 @@ nv50_resource_copy_region(struct pipe_context *pipe,
return;
}
assert(src->nr_samples == dst->nr_samples);
m2mf = (src->format == dst->format) ||
(util_format_get_blocksizebits(src->format) ==
util_format_get_blocksizebits(dst->format));
nv04_resource(dst)->status |= NOUVEAU_BUFFER_STATUS_GPU_WRITING;
if (src->format == dst->format && src->nr_samples == dst->nr_samples) {
if (m2mf) {
struct nv50_m2mf_rect drect, srect;
unsigned i;
unsigned nx = util_format_get_nblocksx(src->format, src_box->width);

9
src/gallium/drivers/nvc0/nvc0_surface.c
View File

@ -205,6 +205,7 @@ nvc0_resource_copy_region(struct pipe_context *pipe,
{
struct nvc0_screen *screen = nvc0_context(pipe)->screen;
int ret;
boolean m2mf;
unsigned dst_layer = dstz, src_layer = src_box->z;
/* Fallback for buffers. */
@ -214,9 +215,15 @@ nvc0_resource_copy_region(struct pipe_context *pipe,
return;
}
assert(src->nr_samples == dst->nr_samples);
m2mf = (src->format == dst->format) ||
(util_format_get_blocksizebits(src->format) ==
util_format_get_blocksizebits(dst->format));
nv04_resource(dst)->status |= NOUVEAU_BUFFER_STATUS_GPU_WRITING;
if (src->format == dst->format && src->nr_samples == dst->nr_samples) {
if (m2mf) {
struct nv50_m2mf_rect drect, srect;
unsigned i;
unsigned nx = util_format_get_nblocksx(src->format, src_box->width);