radeonsi: use shader_info::cs::local_size_variable to clean up some code

[mesa.git] / src / gallium / drivers / i915 / i915_query.c

diff --git a/src/gallium/drivers/i915/i915_query.c b/src/gallium/drivers/i915/i915_query.c
index c886df74bad5564687d9e03e3c2be16a9d1baa16..42f309553e2ab9a74917a27c1d9203acbba88581 100644 (file)
--- a/src/gallium/drivers/i915/i915_query.c
+++ b/src/gallium/drivers/i915/i915_query.c
@@ -40,7 +40,8 @@ struct i915_query
 };
 
 static struct pipe_query *i915_create_query(struct pipe_context *ctx,
-                                            unsigned query_type)
+                                            unsigned query_type,
+                                            unsigned index)
 {
    struct i915_query *query = CALLOC_STRUCT( i915_query );
 
@@ -53,25 +54,32 @@ static void i915_destroy_query(struct pipe_context *ctx,
    FREE(query);
 }
 
-static void i915_begin_query(struct pipe_context *ctx,
+static bool i915_begin_query(struct pipe_context *ctx,
                              struct pipe_query *query)
 {
+   return true;
 }
 
-static void i915_end_query(struct pipe_context *ctx, struct pipe_query *query)
+static bool i915_end_query(struct pipe_context *ctx, struct pipe_query *query)
 {
+   return true;
 }
 
-static boolean i915_get_query_result(struct pipe_context *ctx,
-                                     struct pipe_query *query,
-                                     boolean wait,
-                                     void *vresult)
+static bool i915_get_query_result(struct pipe_context *ctx,
+                                  struct pipe_query *query,
+                                  bool wait,
+                                  union pipe_query_result *vresult)
 {
    uint64_t *result = (uint64_t*)vresult;
 
    /* 2* viewport Max */
    *result = 512*1024*1024;
-   return TRUE;
+   return true;
+}
+
+static void
+i915_set_active_query_state(struct pipe_context *pipe, bool enable)
+{
 }
 
 void
@@ -82,5 +90,6 @@ i915_init_query_functions(struct i915_context *i915)
    i915->base.begin_query = i915_begin_query;
    i915->base.end_query = i915_end_query;
    i915->base.get_query_result = i915_get_query_result;
+   i915->base.set_active_query_state = i915_set_active_query_state;
 }