Ideally would have caught these when adding the interface but this just switches a few return type for the INTEL_performance_query backend interface to bool instead of GLboolean.
Signed-off-by: Robert Bragg <rob...@sixbynine.org> --- src/mesa/drivers/dri/i965/brw_performance_query.c | 4 ++-- src/mesa/main/dd.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c index 46847bef53..6cd5bf4caa 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c @@ -202,7 +202,7 @@ snapshot_statistics_registers(struct brw_context *brw, /** * Driver hook for glBeginPerfQueryINTEL(). */ -static GLboolean +static bool brw_begin_perf_query(struct gl_context *ctx, struct gl_perf_query_object *o) { @@ -351,7 +351,7 @@ brw_wait_perf_query(struct gl_context *ctx, struct gl_perf_query_object *o) drm_intel_bo_wait_rendering(bo); } -static GLboolean +static bool brw_is_perf_query_ready(struct gl_context *ctx, struct gl_perf_query_object *o) { diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index aba301cf22..63fc62103a 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -804,14 +804,14 @@ struct dd_function_table { unsigned queryIndex); void (*DeletePerfQuery)(struct gl_context *ctx, struct gl_perf_query_object *obj); - GLboolean (*BeginPerfQuery)(struct gl_context *ctx, - struct gl_perf_query_object *obj); + bool (*BeginPerfQuery)(struct gl_context *ctx, + struct gl_perf_query_object *obj); void (*EndPerfQuery)(struct gl_context *ctx, struct gl_perf_query_object *obj); void (*WaitPerfQuery)(struct gl_context *ctx, struct gl_perf_query_object *obj); - GLboolean (*IsPerfQueryReady)(struct gl_context *ctx, - struct gl_perf_query_object *obj); + bool (*IsPerfQueryReady)(struct gl_context *ctx, + struct gl_perf_query_object *obj); void (*GetPerfQueryData)(struct gl_context *ctx, struct gl_perf_query_object *obj, GLsizei dataSize, -- 2.11.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev