summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv30
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-09-13 19:38:25 +0200
committerMarek Olšák <[email protected]>2012-09-30 18:57:57 +0200
commitde80660c2bd43db112b6c82d970660ed9806cd33 (patch)
tree115c132994d540743e6deed23dec941f8eb619b4 /src/gallium/drivers/nv30
parentd37e6b15ad545106d48af5c8abb75d0e28895d43 (diff)
gallium: remove resource_resolve
The functionality is provided by the new blit function. Tested-by: Michel Dänzer <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nv30')
-rw-r--r--src/gallium/drivers/nv30/nv30_miptree.c2
-rw-r--r--src/gallium/drivers/nv30/nv30_resource.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c
index 79034ac7dae..5a9a63ba0d9 100644
--- a/src/gallium/drivers/nv30/nv30_miptree.c
+++ b/src/gallium/drivers/nv30/nv30_miptree.c
@@ -148,6 +148,7 @@ void
nv30_resource_resolve(struct pipe_context *pipe,
const struct pipe_resolve_info *info)
{
+#if 0
struct nv30_context *nv30 = nv30_context(pipe);
struct nv30_rect src, dst;
@@ -157,6 +158,7 @@ nv30_resource_resolve(struct pipe_context *pipe,
info->dst.x1 - info->dst.x0, info->dst.y1 - info->dst.y0, &dst);
nv30_transfer_rect(nv30, BILINEAR, &src, &dst);
+#endif
}
void
diff --git a/src/gallium/drivers/nv30/nv30_resource.c b/src/gallium/drivers/nv30/nv30_resource.c
index 80dc61efcb0..4d2a2284a75 100644
--- a/src/gallium/drivers/nv30/nv30_resource.c
+++ b/src/gallium/drivers/nv30/nv30_resource.c
@@ -75,6 +75,5 @@ nv30_resource_init(struct pipe_context *pipe)
pipe->create_surface = nv30_miptree_surface_new;
pipe->surface_destroy = nv30_miptree_surface_del;
pipe->resource_copy_region = nv30_resource_copy_region;
- pipe->resource_resolve = nv30_resource_resolve;
pipe->blit = nv30_blit;
}