gallium/radeon: don't discard DCC if an external user can write to it

[mesa.git] / src / gallium / drivers / noop / noop_pipe.c

diff --git a/src/gallium/drivers/noop/noop_pipe.c b/src/gallium/drivers/noop/noop_pipe.c
index e47f944b59b5b24e308d08e079aab8fd4e3f3d8b..99e5f1ae1a99a15e631996a0b23850700b5dd5fd 100644 (file)
--- a/src/gallium/drivers/noop/noop_pipe.c
+++ b/src/gallium/drivers/noop/noop_pipe.c
@@ -46,7 +46,7 @@ struct noop_pipe_screen {
 struct noop_query {
        unsigned        query;
 };
-static struct pipe_query *noop_create_query(struct pipe_context *ctx, unsigned query_type)
+static struct pipe_query *noop_create_query(struct pipe_context *ctx, unsigned query_type, unsigned index)
 {
        struct noop_query *query = CALLOC_STRUCT(noop_query);
 
@@ -58,12 +58,14 @@ static void noop_destroy_query(struct pipe_context *ctx, struct pipe_query *quer
        FREE(query);
 }
 
-static void noop_begin_query(struct pipe_context *ctx, struct pipe_query *query)
+static boolean noop_begin_query(struct pipe_context *ctx, struct pipe_query *query)
 {
+   return true;
 }
 
-static void noop_end_query(struct pipe_context *ctx, struct pipe_query *query)
+static bool noop_end_query(struct pipe_context *ctx, struct pipe_query *query)
 {
+   return true;
 }
 
 static boolean noop_get_query_result(struct pipe_context *ctx,
@@ -77,6 +79,11 @@ static boolean noop_get_query_result(struct pipe_context *ctx,
        return TRUE;
 }
 
+static void
+noop_set_active_query_state(struct pipe_context *pipe, boolean enable)
+{
+}
+
 
 /*
  * resource
@@ -95,7 +102,7 @@ static struct pipe_resource *noop_resource_create(struct pipe_screen *screen,
        unsigned stride;
 
        nresource = CALLOC_STRUCT(noop_resource);
-       if (nresource == NULL)
+       if (!nresource)
                return NULL;
 
        stride = util_format_get_stride(templ->format, templ->width0);
@@ -113,14 +120,15 @@ static struct pipe_resource *noop_resource_create(struct pipe_screen *screen,
 
 static struct pipe_resource *noop_resource_from_handle(struct pipe_screen *screen,
                                                        const struct pipe_resource *templ,
-                                                       struct winsys_handle *handle)
+                                                       struct winsys_handle *handle,
+                                                       unsigned usage)
 {
        struct noop_pipe_screen *noop_screen = (struct noop_pipe_screen*)screen;
        struct pipe_screen *oscreen = noop_screen->oscreen;
        struct pipe_resource *result;
        struct pipe_resource *noop_resource;
 
-       result = oscreen->resource_from_handle(oscreen, templ, handle);
+       result = oscreen->resource_from_handle(oscreen, templ, handle, usage);
        noop_resource = noop_resource_create(screen, result);
        pipe_resource_reference(&result, NULL);
        return noop_resource;
@@ -128,7 +136,8 @@ static struct pipe_resource *noop_resource_from_handle(struct pipe_screen *scree
 
 static boolean noop_resource_get_handle(struct pipe_screen *screen,
                                        struct pipe_resource *resource,
-                                       struct winsys_handle *handle)
+                                       struct winsys_handle *handle,
+                                        unsigned usage)
 {
        return FALSE;
 }
@@ -142,53 +151,32 @@ static void noop_resource_destroy(struct pipe_screen *screen,
        FREE(resource);
 }
 
-static struct pipe_resource *noop_user_buffer_create(struct pipe_screen *screen,
-                                                       void *ptr, unsigned bytes,
-                                                       unsigned bind)
-{
-       struct pipe_resource templ;
-
-       templ.target = PIPE_BUFFER;
-       templ.format = PIPE_FORMAT_R8_UNORM;
-       templ.usage = PIPE_USAGE_IMMUTABLE;
-       templ.bind = bind;
-       templ.width0 = bytes;
-       templ.height0 = 1;
-       templ.depth0 = 1;
-       templ.flags = 0;
-       return noop_resource_create(screen, &templ);
-}
-
 
 /*
  * transfer
  */
-static struct pipe_transfer *noop_get_transfer(struct pipe_context *context,
-                                               struct pipe_resource *resource,
-                                               unsigned level,
-                                               enum pipe_transfer_usage usage,
-                                               const struct pipe_box *box)
-{
-       struct pipe_transfer *transfer;
-
-       transfer = CALLOC_STRUCT(pipe_transfer);
-       if (transfer == NULL)
-               return NULL;
-       pipe_resource_reference(&transfer->resource, resource);
-       transfer->level = level;
-       transfer->usage = usage;
-       transfer->box = *box;
-       transfer->stride = 1;
-       transfer->layer_stride = 1;
-       return transfer;
-}
-
 static void *noop_transfer_map(struct pipe_context *pipe,
-                               struct pipe_transfer *transfer)
+                               struct pipe_resource *resource,
+                               unsigned level,
+                               enum pipe_transfer_usage usage,
+                               const struct pipe_box *box,
+                               struct pipe_transfer **ptransfer)
 {
-       struct noop_resource *nresource = (struct noop_resource *)transfer->resource;
+   struct pipe_transfer *transfer;
+   struct noop_resource *nresource = (struct noop_resource *)resource;
 
-       return nresource->data;
+   transfer = CALLOC_STRUCT(pipe_transfer);
+   if (!transfer)
+           return NULL;
+   pipe_resource_reference(&transfer->resource, resource);
+   transfer->level = level;
+   transfer->usage = usage;
+   transfer->box = *box;
+   transfer->stride = 1;
+   transfer->layer_stride = 1;
+   *ptransfer = transfer;
+
+   return nresource->data;
 }
 
 static void noop_transfer_flush_region(struct pipe_context *pipe,
@@ -200,13 +188,8 @@ static void noop_transfer_flush_region(struct pipe_context *pipe,
 static void noop_transfer_unmap(struct pipe_context *pipe,
                                struct pipe_transfer *transfer)
 {
-}
-
-static void noop_transfer_destroy(struct pipe_context *pipe,
-                                       struct pipe_transfer *transfer)
-{
-       pipe_resource_reference(&transfer->resource, NULL);
-       FREE(transfer);
+   pipe_resource_reference(&transfer->resource, NULL);
+   FREE(transfer);
 }
 
 static void noop_transfer_inline_write(struct pipe_context *pipe,
@@ -258,11 +241,25 @@ static void noop_resource_copy_region(struct pipe_context *ctx,
 }
 
 
+static void noop_blit(struct pipe_context *ctx,
+                      const struct pipe_blit_info *info)
+{
+}
+
+
+static void
+noop_flush_resource(struct pipe_context *ctx,
+                    struct pipe_resource *resource)
+{
+}
+
+
 /*
  * context
  */
 static void noop_flush(struct pipe_context *ctx,
-                       struct pipe_fence_handle **fence)
+                       struct pipe_fence_handle **fence,
+                       unsigned flags)
 {
 }
 
@@ -271,11 +268,12 @@ static void noop_destroy_context(struct pipe_context *ctx)
        FREE(ctx);
 }
 
-static struct pipe_context *noop_create_context(struct pipe_screen *screen, void *priv)
+static struct pipe_context *noop_create_context(struct pipe_screen *screen,
+                                                void *priv, unsigned flags)
 {
        struct pipe_context *ctx = CALLOC_STRUCT(pipe_context);
 
-       if (ctx == NULL)
+       if (!ctx)
                return NULL;
        ctx->screen = screen;
        ctx->priv = priv;
@@ -285,16 +283,17 @@ static struct pipe_context *noop_create_context(struct pipe_screen *screen, void
        ctx->clear_render_target = noop_clear_render_target;
        ctx->clear_depth_stencil = noop_clear_depth_stencil;
        ctx->resource_copy_region = noop_resource_copy_region;
+       ctx->blit = noop_blit;
+       ctx->flush_resource = noop_flush_resource;
        ctx->create_query = noop_create_query;
        ctx->destroy_query = noop_destroy_query;
        ctx->begin_query = noop_begin_query;
        ctx->end_query = noop_end_query;
        ctx->get_query_result = noop_get_query_result;
-       ctx->get_transfer = noop_get_transfer;
+       ctx->set_active_query_state = noop_set_active_query_state;
        ctx->transfer_map = noop_transfer_map;
        ctx->transfer_flush_region = noop_transfer_flush_region;
        ctx->transfer_unmap = noop_transfer_unmap;
-       ctx->transfer_destroy = noop_transfer_destroy;
        ctx->transfer_inline_write = noop_transfer_inline_write;
        noop_init_state_functions(ctx);
 
@@ -308,7 +307,7 @@ static struct pipe_context *noop_create_context(struct pipe_screen *screen, void
 static void noop_flush_frontbuffer(struct pipe_screen *_screen,
                                   struct pipe_resource *resource,
                                   unsigned level, unsigned layer,
-                                  void *context_private)
+                                  void *context_private, struct pipe_box *box)
 {
 }
 
@@ -317,6 +316,11 @@ static const char *noop_get_vendor(struct pipe_screen* pscreen)
        return "X.Org";
 }
 
+static const char *noop_get_device_vendor(struct pipe_screen* pscreen)
+{
+       return "NONE";
+}
+
 static const char *noop_get_name(struct pipe_screen* pscreen)
 {
        return "NOOP";
@@ -355,6 +359,11 @@ static boolean noop_is_format_supported(struct pipe_screen* pscreen,
        return screen->is_format_supported(screen, format, target, sample_count, usage);
 }
 
+static uint64_t noop_get_timestamp(struct pipe_screen *pscreen)
+{
+       return 0;
+}
+
 static void noop_destroy_screen(struct pipe_screen *screen)
 {
        struct noop_pipe_screen *noop_screen = (struct noop_pipe_screen*)screen;
@@ -374,7 +383,7 @@ struct pipe_screen *noop_screen_create(struct pipe_screen *oscreen)
        }
 
        noop_screen = CALLOC_STRUCT(noop_pipe_screen);
-       if (noop_screen == NULL) {
+       if (!noop_screen) {
                return NULL;
        }
        noop_screen->oscreen = oscreen;
@@ -383,6 +392,7 @@ struct pipe_screen *noop_screen_create(struct pipe_screen *oscreen)
        screen->destroy = noop_destroy_screen;
        screen->get_name = noop_get_name;
        screen->get_vendor = noop_get_vendor;
+       screen->get_device_vendor = noop_get_device_vendor;
        screen->get_param = noop_get_param;
        screen->get_shader_param = noop_get_shader_param;
        screen->get_paramf = noop_get_paramf;
@@ -392,8 +402,8 @@ struct pipe_screen *noop_screen_create(struct pipe_screen *oscreen)
        screen->resource_from_handle = noop_resource_from_handle;
        screen->resource_get_handle = noop_resource_get_handle;
        screen->resource_destroy = noop_resource_destroy;
-       screen->user_buffer_create = noop_user_buffer_create;
        screen->flush_frontbuffer = noop_flush_frontbuffer;
+        screen->get_timestamp = noop_get_timestamp;
 
        return screen;
 }