nv50: replace most of it with nvc0 driver ported to nv50

We'll have to do some unification now to reduce code duplication.

1 files changed, 40 insertions, 39 deletions

diff --git a/src/gallium/drivers/nv50/nv50_resource.c b/src/gallium/drivers/nv50/nv50_resource.c
index 6c0a9696355..ae1a2bf55da 100644
--- a/src/gallium/drivers/nv50/nv50_resource.c
+++ b/src/gallium/drivers/nv50/nv50_resource.c
@@ -3,65 +3,66 @@
 #include "nv50_resource.h"
 #include "nouveau/nouveau_screen.h"
 
-
-/* This doesn't look quite right - this query is supposed to ask
- * whether the particular context has references to the resource in
- * any unflushed rendering command buffer, and hence requires a
- * pipe->flush() for serializing some modification to that resource.
- *
- * This seems to be answering the question of whether the resource is
- * currently on hardware.
- */
-static unsigned int
+static unsigned
 nv50_resource_is_referenced(struct pipe_context *pipe,
-			    struct pipe_resource *resource,
-			    unsigned level, int layer)
+                            struct pipe_resource *resource,
+                            unsigned face, int layer)
 {
-	return nouveau_reference_flags(nv50_resource(resource)->bo);
+   struct nv50_resource *res = nv50_resource(resource);
+   unsigned flags = 0;
+   unsigned bo_flags = nouveau_bo_pending(res->bo);
+
+   if (bo_flags & NOUVEAU_BO_RD)
+      flags = PIPE_REFERENCED_FOR_READ;
+   if (bo_flags & NOUVEAU_BO_WR)
+      flags |= PIPE_REFERENCED_FOR_WRITE;
+
+   return flags;
 }
 
 static struct pipe_resource *
 nv50_resource_create(struct pipe_screen *screen,
-		     const struct pipe_resource *template)
+                     const struct pipe_resource *templ)
 {
-	if (template->target == PIPE_BUFFER)
-		return nv50_buffer_create(screen, template);
-	else
-		return nv50_miptree_create(screen, template);
+   switch (templ->target) {
+   case PIPE_BUFFER:
+      return nv50_buffer_create(screen, templ);
+   default:
+      return nv50_miptree_create(screen, templ);
+   }
 }
 
 static struct pipe_resource *
 nv50_resource_from_handle(struct pipe_screen * screen,
-			  const struct pipe_resource *template,
-			  struct winsys_handle *whandle)
+                          const struct pipe_resource *templ,
+                          struct winsys_handle *whandle)
 {
-	if (template->target == PIPE_BUFFER)
-		return NULL;
-	else
-		return nv50_miptree_from_handle(screen, template, whandle);
+   if (templ->target == PIPE_BUFFER)
+      return NULL;
+   else
+      return nv50_miptree_from_handle(screen, templ, whandle);
 }
 
 void
 nv50_init_resource_functions(struct pipe_context *pcontext)
 {
-	pcontext->get_transfer = u_get_transfer_vtbl;
-	pcontext->transfer_map = u_transfer_map_vtbl;
-	pcontext->transfer_flush_region = u_transfer_flush_region_vtbl;
-	pcontext->transfer_unmap = u_transfer_unmap_vtbl;
-	pcontext->transfer_destroy = u_transfer_destroy_vtbl;
-	pcontext->transfer_inline_write = u_transfer_inline_write_vtbl;
-	pcontext->is_resource_referenced = nv50_resource_is_referenced;
-
-	pcontext->create_surface = nv50_miptree_surface_new;
-	pcontext->surface_destroy = nv50_miptree_surface_del;
+   pcontext->get_transfer = u_get_transfer_vtbl;
+   pcontext->transfer_map = u_transfer_map_vtbl;
+   pcontext->transfer_flush_region = u_transfer_flush_region_vtbl;
+   pcontext->transfer_unmap = u_transfer_unmap_vtbl;
+   pcontext->transfer_destroy = u_transfer_destroy_vtbl;
+   pcontext->transfer_inline_write = u_transfer_inline_write_vtbl;
+   pcontext->is_resource_referenced = nv50_resource_is_referenced;
+   pcontext->create_surface = nv50_miptree_surface_new;
+   pcontext->surface_destroy = nv50_miptree_surface_del;
 }
 
 void
 nv50_screen_init_resource_functions(struct pipe_screen *pscreen)
 {
-	pscreen->resource_create = nv50_resource_create;
-	pscreen->resource_from_handle = nv50_resource_from_handle;
-	pscreen->resource_get_handle = u_resource_get_handle_vtbl;
-	pscreen->resource_destroy = u_resource_destroy_vtbl;
-	pscreen->user_buffer_create = nv50_user_buffer_create;
+   pscreen->resource_create = nv50_resource_create;
+   pscreen->resource_from_handle = nv50_resource_from_handle;
+   pscreen->resource_get_handle = u_resource_get_handle_vtbl;
+   pscreen->resource_destroy = u_resource_destroy_vtbl;
+   pscreen->user_buffer_create = nv50_user_buffer_create;
 }