gallium: add bool return to pipe_context::end_query

[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 27197a504545b706b088d95629a147b06c43f563..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;
 }
@@ -157,7 +166,7 @@ static void *noop_transfer_map(struct pipe_context *pipe,
    struct noop_resource *nresource = (struct noop_resource *)resource;
 
    transfer = CALLOC_STRUCT(pipe_transfer);
-   if (transfer == NULL)
+   if (!transfer)
            return NULL;
    pipe_resource_reference(&transfer->resource, resource);
    transfer->level = level;
@@ -259,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;
@@ -280,6 +290,7 @@ static struct pipe_context *noop_create_context(struct pipe_screen *screen, void
        ctx->begin_query = noop_begin_query;
        ctx->end_query = noop_end_query;
        ctx->get_query_result = noop_get_query_result;
+       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;
@@ -305,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";
@@ -367,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;
@@ -376,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;