X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsvga%2Fsvga_resource.c;h=874cfa072235448daab64822f16360263a4d011e;hb=5d8359ff4d8c379fdf1a78758f405bb4cdf69459;hp=bb6236dce6778fc5bc92286d0dbbd38a49bd4280;hpb=59d2c4f8e5a00133c093137b2f4836313f633d60;p=mesa.git

diff --git a/src/gallium/drivers/svga/svga_resource.c b/src/gallium/drivers/svga/svga_resource.c
index bb6236dce67..874cfa07223 100644
--- a/src/gallium/drivers/svga/svga_resource.c
+++ b/src/gallium/drivers/svga/svga_resource.c
@@ -30,23 +30,38 @@
 #include "svga_resource_texture.h"
 #include "svga_context.h"
 #include "svga_screen.h"
+#include "svga_format.h"
 
 
+/**
+ * This is the primary driver entrypoint for allocating graphics memory
+ * (vertex/index/constant buffers, textures, etc)
+ */
 static struct pipe_resource *
 svga_resource_create(struct pipe_screen *screen,
                      const struct pipe_resource *template)
 {
+   struct pipe_resource *r;
+
    if (template->target == PIPE_BUFFER)
-      return svga_buffer_create(screen, template);
+      r = svga_buffer_create(screen, template);
    else
-      return svga_texture_create(screen, template);
+      r = svga_texture_create(screen, template);
+
+   if (!r) {
+      struct svga_screen *svgascreen = svga_screen(screen);
+      svgascreen->hud.num_failed_allocations++;
+   }
+
+   return r;
 }
 
 
 static struct pipe_resource *
 svga_resource_from_handle(struct pipe_screen * screen,
                           const struct pipe_resource *template,
-                          struct winsys_handle *whandle)
+                          struct winsys_handle *whandle,
+                          unsigned usage)
 {
    if (template->target == PIPE_BUFFER)
       return NULL;
@@ -55,16 +70,64 @@ svga_resource_from_handle(struct pipe_screen * screen,
 }
 
 
+/**
+ * Check if a resource (texture, buffer) of the given size
+ * and format can be created.
+ * \Return TRUE if OK, FALSE if too large.
+ */
+static boolean
+svga_can_create_resource(struct pipe_screen *screen,
+                         const struct pipe_resource *res)
+{
+   struct svga_screen *svgascreen = svga_screen(screen);
+   struct svga_winsys_screen *sws = svgascreen->sws;
+   SVGA3dSurfaceFormat format;
+   SVGA3dSize base_level_size;
+   uint32 numMipLevels;
+   uint32 arraySize;
+
+   if (res->target == PIPE_BUFFER) {
+      format = SVGA3D_BUFFER;
+      base_level_size.width = res->width0;
+      base_level_size.height = 1;
+      base_level_size.depth = 1;
+      numMipLevels = 1;
+      arraySize = 1;
+
+   } else {
+      if (res->target == PIPE_TEXTURE_CUBE)
+         assert(res->array_size == 6);
+
+      format = svga_translate_format(svgascreen, res->format, res->bind);
+      if (format == SVGA3D_FORMAT_INVALID)
+         return FALSE;
+
+      base_level_size.width = res->width0;
+      base_level_size.height = res->height0;
+      base_level_size.depth = res->depth0;
+      numMipLevels = res->last_level + 1;
+      arraySize = res->array_size;
+   }
+
+   return sws->surface_can_create(sws, format, base_level_size, 
+                                  arraySize, numMipLevels);
+}
+
+
 void
 svga_init_resource_functions(struct svga_context *svga)
 {
-   svga->pipe.get_transfer = u_get_transfer_vtbl;
    svga->pipe.transfer_map = u_transfer_map_vtbl;
    svga->pipe.transfer_flush_region = u_transfer_flush_region_vtbl;
    svga->pipe.transfer_unmap = u_transfer_unmap_vtbl;
-   svga->pipe.transfer_destroy = u_transfer_destroy_vtbl;
-   svga->pipe.transfer_inline_write = u_transfer_inline_write_vtbl;
-   svga->pipe.redefine_user_buffer = svga_redefine_user_buffer;
+   svga->pipe.buffer_subdata = u_default_buffer_subdata;
+   svga->pipe.texture_subdata = u_default_texture_subdata;
+
+   if (svga_have_vgpu10(svga)) {
+      svga->pipe.generate_mipmap = svga_texture_generate_mipmap;
+   } else {
+      svga->pipe.generate_mipmap = NULL;
+   }
 }
 
 void
@@ -74,5 +137,5 @@ svga_init_screen_resource_functions(struct svga_screen *is)
    is->screen.resource_from_handle = svga_resource_from_handle;
    is->screen.resource_get_handle = u_resource_get_handle_vtbl;
    is->screen.resource_destroy = u_resource_destroy_vtbl;
-   is->screen.user_buffer_create = svga_user_buffer_create;
+   is->screen.can_create_resource = svga_can_create_resource;
 }