X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsvga%2Fsvga_resource.c;h=320d42dd535c5a9d8a05047198b89f50b669d6ee;hb=8a4b0d852c1f28c302e0df6fa63dbc08a32bc683;hp=1c3bcd67afa4fa6d4a3ec836ad900c2ef2d3380d;hpb=83c86e09a8d7610022eae49731ac1ed03ee4f67b;p=mesa.git

diff --git a/src/gallium/drivers/svga/svga_resource.c b/src/gallium/drivers/svga/svga_resource.c
index 1c3bcd67afa..320d42dd535 100644
--- a/src/gallium/drivers/svga/svga_resource.c
+++ b/src/gallium/drivers/svga/svga_resource.c
@@ -33,21 +33,35 @@
 #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;
@@ -61,7 +75,7 @@ svga_resource_from_handle(struct pipe_screen * screen,
  * and format can be created.
  * \Return TRUE if OK, FALSE if too large.
  */
-static boolean
+static bool
 svga_can_create_resource(struct pipe_screen *screen,
                          const struct pipe_resource *res)
 {
@@ -71,6 +85,7 @@ svga_can_create_resource(struct pipe_screen *screen,
    SVGA3dSize base_level_size;
    uint32 numMipLevels;
    uint32 arraySize;
+   uint32 numSamples;
 
    if (res->target == PIPE_BUFFER) {
       format = SVGA3D_BUFFER;
@@ -79,6 +94,7 @@ svga_can_create_resource(struct pipe_screen *screen,
       base_level_size.depth = 1;
       numMipLevels = 1;
       arraySize = 1;
+      numSamples = 0;
 
    } else {
       if (res->target == PIPE_TEXTURE_CUBE)
@@ -86,17 +102,18 @@ svga_can_create_resource(struct pipe_screen *screen,
 
       format = svga_translate_format(svgascreen, res->format, res->bind);
       if (format == SVGA3D_FORMAT_INVALID)
-         return FALSE;
+         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;
+      numSamples = res->nr_samples;
    }
 
    return sws->surface_can_create(sws, format, base_level_size, 
-                                  arraySize, numMipLevels);
+                                  arraySize, numMipLevels, numSamples);
 }
 
 
@@ -106,7 +123,8 @@ svga_init_resource_functions(struct svga_context *svga)
    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_inline_write = u_transfer_inline_write_vtbl;
+   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;