Merge Mesa 17.3.9

Mesa 18.x needs an ld with build-id for at least the intel code
Mesa 18.2 assumes linux only memfd syscalls in intel code

Tested by matthieu@, kettenis@ and myself on a variety of hardware and
architectures. ok kettenis@

1 files changed, 12 insertions, 2 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/util/u_helpers.h b/lib/mesa/src/gallium/auxiliary/util/u_helpers.h
index a9a53e434..ab970d791 100644
--- a/lib/mesa/src/gallium/auxiliary/util/u_helpers.h
+++ b/lib/mesa/src/gallium/auxiliary/util/u_helpers.h
@@ -29,6 +29,7 @@
 #define U_HELPERS_H
 
 #include "pipe/p_state.h"
+#include <stdio.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,8 +45,17 @@ void util_set_vertex_buffers_count(struct pipe_vertex_buffer *dst,
                                    const struct pipe_vertex_buffer *src,
                                    unsigned start_slot, unsigned count);
 
-void util_set_index_buffer(struct pipe_index_buffer *dst,
-                           const struct pipe_index_buffer *src);
+bool util_upload_index_buffer(struct pipe_context *pipe,
+                              const struct pipe_draw_info *info,
+                              struct pipe_resource **out_buffer,
+                              unsigned *out_offset);
+
+struct pipe_query *
+util_begin_pipestat_query(struct pipe_context *ctx);
+
+void
+util_end_pipestat_query(struct pipe_context *ctx, struct pipe_query *q,
+                        FILE *f);
 
 #ifdef __cplusplus
 }