Mesa (master): glthread: upload non-VBO vertices and indices for non-Indirect non-IBM draws
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Apr 30 22:24:58 UTC 2020
Module: Mesa
Branch: master
Commit: 2840bc3065b9e991b2c5880a2ee02e2458a758c4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2840bc3065b9e991b2c5880a2ee02e2458a758c4
Author: Marek Olšák <marek.olsak at amd.com>
Date: Fri Mar 6 16:56:54 2020 -0500
glthread: upload non-VBO vertices and indices for non-Indirect non-IBM draws
This is basically the same thing u_vbuf does.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4314>
---
src/mapi/glapi/gen/ARB_base_instance.xml | 9 +-
.../glapi/gen/ARB_draw_elements_base_vertex.xml | 12 +-
src/mapi/glapi/gen/ARB_draw_instanced.xml | 6 +-
src/mapi/glapi/gen/gl_API.xml | 15 +-
src/mesa/Makefile.sources | 1 +
src/mesa/main/glthread.c | 7 +
src/mesa/main/glthread.h | 1 +
src/mesa/main/glthread_draw.c | 982 +++++++++++++++++++++
src/mesa/meson.build | 1 +
9 files changed, 1006 insertions(+), 28 deletions(-)
diff --git a/src/mapi/glapi/gen/ARB_base_instance.xml b/src/mapi/glapi/gen/ARB_base_instance.xml
index c4c2a5b99ab..0f0d0bfd2fd 100644
--- a/src/mapi/glapi/gen/ARB_base_instance.xml
+++ b/src/mapi/glapi/gen/ARB_base_instance.xml
@@ -8,8 +8,7 @@
<category name="GL_ARB_base_instance" number="107">
- <function name="DrawArraysInstancedBaseInstance" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
+ <function name="DrawArraysInstancedBaseInstance" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="first" type="GLint"/>
<param name="count" type="GLsizei"/>
@@ -17,8 +16,7 @@
<param name="baseinstance" type="GLuint"/>
</function>
- <function name="DrawElementsInstancedBaseInstance" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
+ <function name="DrawElementsInstancedBaseInstance" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
<param name="type" type="GLenum"/>
@@ -27,8 +25,7 @@
<param name="baseinstance" type="GLuint"/>
</function>
- <function name="DrawElementsInstancedBaseVertexBaseInstance" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
+ <function name="DrawElementsInstancedBaseVertexBaseInstance" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
<param name="type" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml b/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml
index 18940b84223..0350dd735a7 100644
--- a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml
+++ b/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml
@@ -8,8 +8,7 @@
<category name="GL_ARB_draw_elements_base_vertex" number="62">
- <function name="DrawElementsBaseVertex" es2="3.2" exec="dynamic" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
+ <function name="DrawElementsBaseVertex" es2="3.2" exec="dynamic" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
<param name="type" type="GLenum"/>
@@ -17,8 +16,7 @@
<param name="basevertex" type="GLint"/>
</function>
- <function name="DrawRangeElementsBaseVertex" es2="3.2" exec="dynamic" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
+ <function name="DrawRangeElementsBaseVertex" es2="3.2" exec="dynamic" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="start" type="GLuint"/>
<param name="end" type="GLuint"/>
@@ -28,8 +26,7 @@
<param name="basevertex" type="GLint"/>
</function>
- <function name="MultiDrawElementsBaseVertex" exec="dynamic" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
+ <function name="MultiDrawElementsBaseVertex" exec="dynamic" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="count" type="const GLsizei *" count="primcount"/>
<param name="type" type="GLenum"/>
@@ -38,8 +35,7 @@
<param name="basevertex" type="const GLint *" count="primcount"/>
</function>
- <function name="DrawElementsInstancedBaseVertex" es2="3.2" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
+ <function name="DrawElementsInstancedBaseVertex" es2="3.2" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
<param name="type" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/ARB_draw_instanced.xml b/src/mapi/glapi/gen/ARB_draw_instanced.xml
index 67846ea1b42..2d67f0a4334 100644
--- a/src/mapi/glapi/gen/ARB_draw_instanced.xml
+++ b/src/mapi/glapi/gen/ARB_draw_instanced.xml
@@ -8,16 +8,14 @@
<category name="GL_ARB_draw_instanced" number="44">
- <function name="DrawArraysInstancedARB" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
+ <function name="DrawArraysInstancedARB" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="first" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="primcount" type="GLsizei"/>
</function>
- <function name="DrawElementsInstancedARB" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
+ <function name="DrawElementsInstancedARB" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
<param name="type" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 42857e4fc68..2c97c6dcedf 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -3181,16 +3181,14 @@
<glx handcode="true"/>
</function>
- <function name="DrawArrays" es1="1.0" es2="2.0" exec="dynamic" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
+ <function name="DrawArrays" es1="1.0" es2="2.0" exec="dynamic" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="first" type="GLint"/>
<param name="count" type="GLsizei"/>
<glx rop="193" handcode="true"/>
</function>
- <function name="DrawElements" es1="1.0" es2="2.0" exec="dynamic" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
+ <function name="DrawElements" es1="1.0" es2="2.0" exec="dynamic" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
<param name="type" type="GLenum"/>
@@ -3760,8 +3758,7 @@
<glx rop="4097"/>
</function>
- <function name="DrawRangeElements" es2="3.0" exec="dynamic" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
+ <function name="DrawRangeElements" es2="3.0" exec="dynamic" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="start" type="GLuint"/>
<param name="end" type="GLuint"/>
@@ -4761,8 +4758,7 @@
<glx handcode="true"/>
</function>
- <function name="MultiDrawArrays" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
+ <function name="MultiDrawArrays" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="first" type="const GLint *" count="primcount"/>
<param name="count" type="const GLsizei *" count="primcount"/>
@@ -10286,8 +10282,7 @@
<param name="primcount" type="GLsizei"/>
</function>
- <function name="MultiDrawElementsEXT" es1="1.0" es2="2.0" exec="dynamic" marshal="draw"
- marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
+ <function name="MultiDrawElementsEXT" es1="1.0" es2="2.0" exec="dynamic" marshal="custom">
<param name="mode" type="GLenum"/>
<param name="count" type="const GLsizei *" count="primcount"/>
<param name="type" type="GLenum"/>
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index ff3c32f556e..345ea9c92b4 100644
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -125,6 +125,7 @@ MAIN_FILES = \
main/glthread.c \
main/glthread.h \
main/glthread_bufferobj.c \
+ main/glthread_draw.c \
main/glthread_marshal.h \
main/glthread_shaderobj.c \
main/glthread_varray.c \
diff --git a/src/mesa/main/glthread.c b/src/mesa/main/glthread.c
index ac86081b679..dd557a026cc 100644
--- a/src/mesa/main/glthread.c
+++ b/src/mesa/main/glthread.c
@@ -113,6 +113,13 @@ _mesa_glthread_init(struct gl_context *ctx)
ctx->Const.BufferCreateMapUnsynchronizedThreadSafe &&
ctx->Const.AllowMappedBuffersDuringExecution;
+ /* If the draw start index is non-zero, glthread can upload to offset 0,
+ * which means the attrib offset has to be -(first * stride).
+ * So require signed vertex buffer offsets.
+ */
+ glthread->SupportsNonVBOUploads = glthread->SupportsBufferUploads &&
+ ctx->Const.VertexBufferOffsetIsInt32;
+
ctx->CurrentClientDispatch = ctx->MarshalExec;
/* Execute the thread initialization function in the thread. */
diff --git a/src/mesa/main/glthread.h b/src/mesa/main/glthread.h
index db733723e15..d09abb8e28f 100644
--- a/src/mesa/main/glthread.h
+++ b/src/mesa/main/glthread.h
@@ -143,6 +143,7 @@ struct glthread_state
/** Caps. */
GLboolean SupportsBufferUploads;
+ GLboolean SupportsNonVBOUploads;
/** Primitive restart state. */
bool PrimitiveRestart;
diff --git a/src/mesa/main/glthread_draw.c b/src/mesa/main/glthread_draw.c
new file mode 100644
index 00000000000..bd53c13fd37
--- /dev/null
+++ b/src/mesa/main/glthread_draw.c
@@ -0,0 +1,982 @@
+/*
+ * Copyright © 2020 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/* Draw function marshalling for glthread.
+ *
+ * The purpose of these glDraw wrappers is to upload non-VBO vertex and
+ * index data, so that glthread doesn't have to execute synchronously.
+ */
+
+#include "main/glthread_marshal.h"
+#include "main/dispatch.h"
+#include "main/varray.h"
+
+static inline unsigned
+get_index_size(GLenum type)
+{
+ /* GL_UNSIGNED_BYTE - GL_UNSIGNED_BYTE = 0
+ * GL_UNSIGNED_SHORT - GL_UNSIGNED_BYTE = 2
+ * GL_UNSIGNED_INT - GL_UNSIGNED_BYTE = 4
+ *
+ * Divide by 2 to get n=0,1,2, then the index size is: 1 << n
+ */
+ return 1 << ((type - GL_UNSIGNED_BYTE) >> 1);
+}
+
+static inline bool
+is_index_type_valid(GLenum type)
+{
+ /* GL_UNSIGNED_BYTE = 0x1401
+ * GL_UNSIGNED_SHORT = 0x1403
+ * GL_UNSIGNED_INT = 0x1405
+ *
+ * The trick is that bit 1 and bit 2 mean USHORT and UINT, respectively.
+ * After clearing those two bits (with ~6), we should get UBYTE.
+ * Both bits can't be set, because the enum would be greater than UINT.
+ */
+ return type <= GL_UNSIGNED_INT && (type & ~6) == GL_UNSIGNED_BYTE;
+}
+
+static ALWAYS_INLINE struct gl_buffer_object *
+upload_indices(struct gl_context *ctx, unsigned count, unsigned index_size,
+ const GLvoid **indices)
+{
+ struct gl_buffer_object *upload_buffer = NULL;
+ unsigned upload_offset = 0;
+
+ assert(count);
+
+ _mesa_glthread_upload(ctx, *indices, index_size * count,
+ &upload_offset, &upload_buffer, NULL);
+ assert(upload_buffer);
+ *indices = (const GLvoid*)(intptr_t)upload_offset;
+
+ return upload_buffer;
+}
+
+static ALWAYS_INLINE struct gl_buffer_object *
+upload_multi_indices(struct gl_context *ctx, unsigned total_count,
+ unsigned index_size, unsigned draw_count,
+ const GLsizei *count, const GLvoid *const *indices,
+ const GLvoid **out_indices)
+{
+ struct gl_buffer_object *upload_buffer = NULL;
+ unsigned upload_offset = 0;
+ uint8_t *upload_ptr = NULL;
+
+ assert(total_count);
+
+ _mesa_glthread_upload(ctx, NULL, index_size * total_count,
+ &upload_offset, &upload_buffer, &upload_ptr);
+ assert(upload_buffer);
+
+ for (unsigned i = 0, offset = 0; i < draw_count; i++) {
+ if (count[i] == 0)
+ continue;
+
+ unsigned size = count[i] * index_size;
+
+ memcpy(upload_ptr + offset, indices[i], size);
+ out_indices[i] = (const GLvoid*)(intptr_t)(upload_offset + offset);
+ offset += size;
+ }
+
+ return upload_buffer;
+}
+
+static ALWAYS_INLINE bool
+upload_vertices(struct gl_context *ctx, unsigned attrib_mask,
+ unsigned start_vertex, unsigned num_vertices,
+ unsigned start_instance, unsigned num_instances,
+ struct glthread_attrib_binding *attribs)
+{
+ struct glthread_vao *vao = ctx->GLThread.CurrentVAO;
+ unsigned attrib_mask_iter = attrib_mask;
+ unsigned num_attribs = 0;
+
+ assert((num_vertices || !(attrib_mask & ~vao->NonZeroDivisorMask)) &&
+ (num_instances || !(attrib_mask & vao->NonZeroDivisorMask)));
+
+ while (attrib_mask_iter) {
+ unsigned i = u_bit_scan(&attrib_mask_iter);
+ struct gl_buffer_object *upload_buffer = NULL;
+ unsigned upload_offset = 0;
+ unsigned stride = vao->Attrib[i].Stride;
+ unsigned instance_div = vao->Attrib[i].Divisor;
+ unsigned element_size = vao->Attrib[i].ElementSize;
+ unsigned offset, size;
+
+ if (instance_div) {
+ /* Per-instance attrib. */
+
+ /* Figure out how many instances we'll render given instance_div. We
+ * can't use the typical div_round_up() pattern because the CTS uses
+ * instance_div = ~0 for a test, which overflows div_round_up()'s
+ * addition.
+ */
+ unsigned count = num_instances / instance_div;
+ if (count * instance_div != num_instances)
+ count++;
+
+ offset = stride * start_instance;
+ size = stride * (count - 1) + element_size;
+ } else {
+ /* Per-vertex attrib. */
+ offset = stride * start_vertex;
+ size = stride * (num_vertices - 1) + element_size;
+ }
+
+ const void *ptr = vao->Attrib[i].Pointer;
+ _mesa_glthread_upload(ctx, (uint8_t*)ptr + offset,
+ size, &upload_offset, &upload_buffer, NULL);
+ assert(upload_buffer);
+
+ attribs[num_attribs].buffer = upload_buffer;
+ attribs[num_attribs].offset = upload_offset - offset;
+ attribs[num_attribs].original_pointer = ptr;
+ num_attribs++;
+ }
+ return true;
+}
+
+struct marshal_cmd_DrawArraysInstancedBaseInstance
+{
+ struct marshal_cmd_base cmd_base;
+ GLenum16 mode;
+ GLint first;
+ GLsizei count;
+ GLsizei instance_count;
+ GLuint baseinstance;
+ GLuint non_vbo_attrib_mask;
+};
+
+void
+_mesa_unmarshal_DrawArraysInstancedBaseInstance(struct gl_context *ctx,
+ const struct marshal_cmd_DrawArraysInstancedBaseInstance *cmd)
+{
+ const GLenum mode = cmd->mode;
+ const GLint first = cmd->first;
+ const GLsizei count = cmd->count;
+ const GLsizei instance_count = cmd->instance_count;
+ const GLuint baseinstance = cmd->baseinstance;
+ const GLuint non_vbo_attrib_mask = cmd->non_vbo_attrib_mask;
+ const struct glthread_attrib_binding *attribs =
+ (const struct glthread_attrib_binding *)(cmd + 1);
+
+ /* Bind uploaded buffers if needed. */
+ if (non_vbo_attrib_mask) {
+ _mesa_InternalBindVertexBuffers(ctx, attribs, non_vbo_attrib_mask,
+ false);
+ }
+
+ CALL_DrawArraysInstancedBaseInstance(ctx->CurrentServerDispatch,
+ (mode, first, count, instance_count,
+ baseinstance));
+
+ /* Restore states. */
+ if (non_vbo_attrib_mask) {
+ _mesa_InternalBindVertexBuffers(ctx, attribs, non_vbo_attrib_mask,
+ true);
+ }
+}
+
+static ALWAYS_INLINE void
+draw_arrays_async(struct gl_context *ctx, GLenum mode, GLint first,
+ GLsizei count, GLsizei instance_count, GLuint baseinstance,
+ unsigned non_vbo_attrib_mask,
+ const struct glthread_attrib_binding *attribs)
+{
+ int attribs_size = util_bitcount(non_vbo_attrib_mask) * sizeof(attribs[0]);
+ int cmd_size = sizeof(struct marshal_cmd_DrawArraysInstancedBaseInstance) +
+ attribs_size;
+ struct marshal_cmd_DrawArraysInstancedBaseInstance *cmd;
+
+ cmd = _mesa_glthread_allocate_command(ctx, DISPATCH_CMD_DrawArraysInstancedBaseInstance,
+ cmd_size);
+ cmd->mode = mode;
+ cmd->first = first;
+ cmd->count = count;
+ cmd->instance_count = instance_count;
+ cmd->baseinstance = baseinstance;
+ cmd->non_vbo_attrib_mask = non_vbo_attrib_mask;
+
+ if (non_vbo_attrib_mask)
+ memcpy(cmd + 1, attribs, attribs_size);
+}
+
+void GLAPIENTRY
+_mesa_marshal_DrawArraysInstancedBaseInstance(GLenum mode, GLint first,
+ GLsizei count, GLsizei instance_count,
+ GLuint baseinstance)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ struct glthread_vao *vao = ctx->GLThread.CurrentVAO;
+ unsigned non_vbo_attrib_mask = vao->UserPointerMask & vao->Enabled;
+
+ /* Fast path when nothing needs to be done.
+ *
+ * This is also an error path. Zero counts should still call the driver
+ * for possible GL errors.
+ */
+ if (ctx->API == API_OPENGL_CORE || !non_vbo_attrib_mask ||
+ count <= 0 || instance_count <= 0) {
+ draw_arrays_async(ctx, mode, first, count, instance_count, baseinstance,
+ 0, NULL);
+ return;
+ }
+
+ /* Upload and draw. */
+ struct glthread_attrib_binding attribs[VERT_ATTRIB_MAX];
+ if (!ctx->GLThread.SupportsNonVBOUploads ||
+ !upload_vertices(ctx, non_vbo_attrib_mask, first, count, baseinstance,
+ instance_count, attribs)) {
+ _mesa_glthread_finish_before(ctx, "DrawArrays");
+ CALL_DrawArraysInstancedBaseInstance(ctx->CurrentServerDispatch,
+ (mode, first, count, instance_count,
+ baseinstance));
+ return;
+ }
+
+ draw_arrays_async(ctx, mode, first, count, instance_count, baseinstance,
+ non_vbo_attrib_mask, attribs);
+}
+
+struct marshal_cmd_MultiDrawArrays
+{
+ struct marshal_cmd_base cmd_base;
+ GLenum16 mode;
+ GLsizei draw_count;
+ GLuint non_vbo_attrib_mask;
+};
+
+void
+_mesa_unmarshal_MultiDrawArrays(struct gl_context *ctx,
+ const struct marshal_cmd_MultiDrawArrays *cmd)
+{
+ const GLenum mode = cmd->mode;
+ const GLsizei draw_count = cmd->draw_count;
+ const GLuint non_vbo_attrib_mask = cmd->non_vbo_attrib_mask;
+
+ const char *variable_data = (const char *)(cmd + 1);
+ const GLint *first = (GLint *)variable_data;
+ variable_data += sizeof(GLint) * draw_count;
+ const GLsizei *count = (GLsizei *)variable_data;
+ variable_data += sizeof(GLsizei) * draw_count;
+ const struct glthread_attrib_binding *attribs =
+ (const struct glthread_attrib_binding *)variable_data;
+
+ /* Bind uploaded buffers if needed. */
+ if (non_vbo_attrib_mask) {
+ _mesa_InternalBindVertexBuffers(ctx, attribs, non_vbo_attrib_mask,
+ false);
+ }
+
+ CALL_MultiDrawArrays(ctx->CurrentServerDispatch,
+ (mode, first, count, draw_count));
+
+ /* Restore states. */
+ if (non_vbo_attrib_mask) {
+ _mesa_InternalBindVertexBuffers(ctx, attribs, non_vbo_attrib_mask,
+ true);
+ }
+}
+
+static ALWAYS_INLINE void
+multi_draw_arrays_async(struct gl_context *ctx, GLenum mode,
+ const GLint *first, const GLsizei *count,
+ GLsizei draw_count, unsigned non_vbo_attrib_mask,
+ const struct glthread_attrib_binding *attribs)
+{
+ int first_size = sizeof(GLint) * draw_count;
+ int count_size = sizeof(GLsizei) * draw_count;
+ int attribs_size = util_bitcount(non_vbo_attrib_mask) * sizeof(attribs[0]);
+ int cmd_size = sizeof(struct marshal_cmd_MultiDrawArrays) +
+ first_size + count_size + attribs_size;
+ struct marshal_cmd_MultiDrawArrays *cmd;
+
+ cmd = _mesa_glthread_allocate_command(ctx, DISPATCH_CMD_MultiDrawArrays,
+ cmd_size);
+ cmd->mode = mode;
+ cmd->draw_count = draw_count;
+ cmd->non_vbo_attrib_mask = non_vbo_attrib_mask;
+
+ char *variable_data = (char*)(cmd + 1);
+ memcpy(variable_data, first, first_size);
+ variable_data += first_size;
+ memcpy(variable_data, count, count_size);
+
+ if (non_vbo_attrib_mask) {
+ variable_data += count_size;
+ memcpy(variable_data, attribs, attribs_size);
+ }
+}
+
+void
+_mesa_marshal_MultiDrawArrays(GLenum mode, const GLint *first,
+ const GLsizei *count, GLsizei draw_count)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ struct glthread_vao *vao = ctx->GLThread.CurrentVAO;
+ unsigned non_vbo_attrib_mask = vao->UserPointerMask & vao->Enabled;
+
+ if (draw_count >= 0 &&
+ (ctx->API == API_OPENGL_CORE || !non_vbo_attrib_mask)) {
+ multi_draw_arrays_async(ctx, mode, first, count, draw_count, 0, NULL);
+ return;
+ }
+
+ /* If the draw count is too high or negative, the queue can't be used. */
+ if (!ctx->GLThread.SupportsNonVBOUploads ||
+ draw_count < 0 || draw_count > MARSHAL_MAX_CMD_SIZE / 16)
+ goto sync;
+
+ unsigned min_index = ~0;
+ unsigned max_index_exclusive = 0;
+
+ for (unsigned i = 0; i < draw_count; i++) {
+ GLsizei vertex_count = count[i];
+
+ if (vertex_count < 0) {
+ /* Just call the driver to set the error. */
+ multi_draw_arrays_async(ctx, mode, first, count, draw_count, 0, NULL);
+ return;
+ }
+ if (vertex_count == 0)
+ continue;
+
+ min_index = MIN2(min_index, first[i]);
+ max_index_exclusive = MAX2(max_index_exclusive, first[i] + vertex_count);
+ }
+
+ unsigned num_vertices = max_index_exclusive - min_index;
+ if (num_vertices == 0) {
+ /* Nothing to do, but call the driver to set possible GL errors. */
+ multi_draw_arrays_async(ctx, mode, first, count, draw_count, 0, NULL);
+ return;
+ }
+
+ /* Upload and draw. */
+ struct glthread_attrib_binding attribs[VERT_ATTRIB_MAX];
+ if (!upload_vertices(ctx, non_vbo_attrib_mask, min_index, num_vertices,
+ 0, 1, attribs))
+ goto sync;
+
+ multi_draw_arrays_async(ctx, mode, first, count, draw_count,
+ non_vbo_attrib_mask, attribs);
+ return;
+
+sync:
+ _mesa_glthread_finish_before(ctx, "MultiDrawArrays");
+ CALL_MultiDrawArrays(ctx->CurrentServerDispatch,
+ (mode, first, count, draw_count));
+}
+
+struct marshal_cmd_DrawElementsInstancedBaseVertexBaseInstance
+{
+ struct marshal_cmd_base cmd_base;
+ bool index_bounds_valid;
+ GLenum16 mode;
+ GLenum16 type;
+ GLsizei count;
+ GLsizei instance_count;
+ GLint basevertex;
+ GLuint baseinstance;
+ GLuint min_index;
+ GLuint max_index;
+ GLuint non_vbo_attrib_mask;
+ const GLvoid *indices;
+ struct gl_buffer_object *index_buffer;
+};
+
+void
+_mesa_unmarshal_DrawElementsInstancedBaseVertexBaseInstance(struct gl_context *ctx,
+ const struct marshal_cmd_DrawElementsInstancedBaseVertexBaseInstance *cmd)
+{
+ const GLenum mode = cmd->mode;
+ const GLsizei count = cmd->count;
+ const GLenum type = cmd->type;
+ const GLvoid *indices = cmd->indices;
+ const GLsizei instance_count = cmd->instance_count;
+ const GLint basevertex = cmd->basevertex;
+ const GLuint baseinstance = cmd->baseinstance;
+ const GLuint min_index = cmd->min_index;
+ const GLuint max_index = cmd->max_index;
+ const GLuint non_vbo_attrib_mask = cmd->non_vbo_attrib_mask;
+ struct gl_buffer_object *index_buffer = cmd->index_buffer;
+ const struct glthread_attrib_binding *attribs =
+ (const struct glthread_attrib_binding *)(cmd + 1);
+
+ /* Bind uploaded buffers if needed. */
+ if (non_vbo_attrib_mask) {
+ _mesa_InternalBindVertexBuffers(ctx, attribs, non_vbo_attrib_mask,
+ false);
+ }
+ if (index_buffer) {
+ _mesa_InternalBindElementBuffer(ctx, index_buffer);
+ }
+
+ /* Draw. */
+ if (cmd->index_bounds_valid && instance_count == 1 && baseinstance == 0) {
+ CALL_DrawRangeElementsBaseVertex(ctx->CurrentServerDispatch,
+ (mode, min_index, max_index, count,
+ type, indices, basevertex));
+ } else {
+ CALL_DrawElementsInstancedBaseVertexBaseInstance(ctx->CurrentServerDispatch,
+ (mode, count, type, indices,
+ instance_count, basevertex,
+ baseinstance));
+ }
+
+ /* Restore states. */
+ if (index_buffer) {
+ _mesa_InternalBindElementBuffer(ctx, NULL);
+ }
+ if (non_vbo_attrib_mask) {
+ _mesa_InternalBindVertexBuffers(ctx, attribs, non_vbo_attrib_mask,
+ true);
+ }
+}
+
+static ALWAYS_INLINE void
+draw_elements_async(struct gl_context *ctx, GLenum mode, GLsizei count,
+ GLenum type, const GLvoid *indices, GLsizei instance_count,
+ GLint basevertex, GLuint baseinstance,
+ bool index_bounds_valid, GLuint min_index, GLuint max_index,
+ struct gl_buffer_object *index_buffer,
+ unsigned non_vbo_attrib_mask,
+ const struct glthread_attrib_binding *attribs)
+{
+ int attribs_size = util_bitcount(non_vbo_attrib_mask) * sizeof(attribs[0]);
+ int cmd_size = sizeof(struct marshal_cmd_DrawElementsInstancedBaseVertexBaseInstance) +
+ attribs_size;
+ struct marshal_cmd_DrawElementsInstancedBaseVertexBaseInstance *cmd;
+
+ cmd = _mesa_glthread_allocate_command(ctx, DISPATCH_CMD_DrawElementsInstancedBaseVertexBaseInstance, cmd_size);
+ cmd->mode = mode;
+ cmd->count = count;
+ cmd->type = type;
+ cmd->indices = indices;
+ cmd->instance_count = instance_count;
+ cmd->basevertex = basevertex;
+ cmd->baseinstance = baseinstance;
+ cmd->min_index = min_index;
+ cmd->max_index = max_index;
+ cmd->non_vbo_attrib_mask = non_vbo_attrib_mask;
+ cmd->index_bounds_valid = index_bounds_valid;
+ cmd->index_buffer = index_buffer;
+
+ if (non_vbo_attrib_mask)
+ memcpy(cmd + 1, attribs, attribs_size);
+}
+
+static void
+draw_elements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices,
+ GLsizei instance_count, GLint basevertex, GLuint baseinstance,
+ bool index_bounds_valid, GLuint min_index, GLuint max_index)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ struct glthread_vao *vao = ctx->GLThread.CurrentVAO;
+ unsigned non_vbo_attrib_mask = vao->UserPointerMask & vao->Enabled;
+ bool has_user_indices = vao->CurrentElementBufferName == 0;
+
+ /* Fast path when nothing needs to be done.
+ *
+ * This is also an error path. Zero counts should still call the driver
+ * for possible GL errors.
+ */
+ if (ctx->API == API_OPENGL_CORE ||
+ count <= 0 || instance_count <= 0 || max_index < min_index ||
+ !is_index_type_valid(type) ||
+ (!non_vbo_attrib_mask && !has_user_indices)) {
+ draw_elements_async(ctx, mode, count, type, indices, instance_count,
+ basevertex, baseinstance, index_bounds_valid,
+ min_index, max_index, 0, 0, NULL);
+ return;
+ }
+
+ if (!ctx->GLThread.SupportsNonVBOUploads)
+ goto sync;
+
+ bool need_index_bounds = non_vbo_attrib_mask & ~vao->NonZeroDivisorMask;
+ unsigned index_size = get_index_size(type);
+
+ if (need_index_bounds && !index_bounds_valid) {
+ /* Sync if indices come from a buffer and vertices come from memory
+ * and index bounds are not valid.
+ *
+ * We would have to map the indices to compute the index bounds, and
+ * for that we would have to sync anyway.
+ */
+ if (!has_user_indices)
+ goto sync;
+
+ /* Compute the index bounds. */
+ min_index = ~0;
+ max_index = 0;
+ vbo_get_minmax_index_mapped(count, index_size,
+ ctx->GLThread._RestartIndex[index_size - 1],
+ ctx->GLThread._PrimitiveRestart, indices,
+ &min_index, &max_index);
+ index_bounds_valid = true;
+ }
+
+ unsigned start_vertex = min_index + basevertex;
+ unsigned num_vertices = max_index + 1 - min_index;
+
+ /* If there is too much data to upload, sync and let the driver unroll
+ * indices. */
+ if (util_is_vbo_upload_ratio_too_large(count, num_vertices))
+ goto sync;
+
+ struct glthread_attrib_binding attribs[VERT_ATTRIB_MAX];
+ if (non_vbo_attrib_mask &&
+ !upload_vertices(ctx, non_vbo_attrib_mask, start_vertex, num_vertices,
+ baseinstance, instance_count, attribs))
+ goto sync;
+
+ /* Upload indices. */
+ struct gl_buffer_object *index_buffer = NULL;
+ if (has_user_indices)
+ index_buffer = upload_indices(ctx, count, index_size, &indices);
+
+ /* Draw asynchronously. */
+ draw_elements_async(ctx, mode, count, type, indices, instance_count,
+ basevertex, baseinstance, index_bounds_valid,
+ min_index, max_index, index_buffer,
+ non_vbo_attrib_mask, attribs);
+ return;
+
+sync:
+ _mesa_glthread_finish_before(ctx, "DrawElements");
+
+ if (index_bounds_valid && instance_count == 1 && baseinstance == 0) {
+ CALL_DrawRangeElementsBaseVertex(ctx->CurrentServerDispatch,
+ (mode, min_index, max_index, count,
+ type, indices, basevertex));
+ } else {
+ CALL_DrawElementsInstancedBaseVertexBaseInstance(ctx->CurrentServerDispatch,
+ (mode, count, type, indices,
+ instance_count, basevertex,
+ baseinstance));
+ }
+}
+
+struct marshal_cmd_MultiDrawElementsBaseVertex
+{
+ struct marshal_cmd_base cmd_base;
+ bool has_base_vertex;
+ GLenum16 mode;
+ GLenum16 type;
+ GLsizei draw_count;
+ GLuint non_vbo_attrib_mask;
+ struct gl_buffer_object *index_buffer;
+};
+
+void
+_mesa_unmarshal_MultiDrawElementsBaseVertex(struct gl_context *ctx,
+ const struct marshal_cmd_MultiDrawElementsBaseVertex *cmd)
+{
+ const GLenum mode = cmd->mode;
+ const GLenum type = cmd->type;
+ const GLsizei draw_count = cmd->draw_count;
+ const GLuint non_vbo_attrib_mask = cmd->non_vbo_attrib_mask;
+ struct gl_buffer_object *index_buffer = cmd->index_buffer;
+ const bool has_base_vertex = cmd->has_base_vertex;
+
+ const char *variable_data = (const char *)(cmd + 1);
+ const GLsizei *count = (GLsizei *)variable_data;
+ variable_data += sizeof(GLsizei) * draw_count;
+ const GLvoid *const *indices = (const GLvoid *const *)variable_data;
+ variable_data += sizeof(const GLvoid *const *) * draw_count;
+ const GLsizei *basevertex = NULL;
+ if (has_base_vertex) {
+ basevertex = (GLsizei *)variable_data;
+ variable_data += sizeof(GLsizei) * draw_count;
+ }
+ const struct glthread_attrib_binding *attribs =
+ (const struct glthread_attrib_binding *)variable_data;
+
+ /* Bind uploaded buffers if needed. */
+ if (non_vbo_attrib_mask) {
+ _mesa_InternalBindVertexBuffers(ctx, attribs, non_vbo_attrib_mask,
+ false);
+ }
+ if (index_buffer) {
+ _mesa_InternalBindElementBuffer(ctx, index_buffer);
+ }
+
+ /* Draw. */
+ if (has_base_vertex) {
+ CALL_MultiDrawElementsBaseVertex(ctx->CurrentServerDispatch,
+ (mode, count, type, indices, draw_count,
+ basevertex));
+ } else {
+ CALL_MultiDrawElementsEXT(ctx->CurrentServerDispatch,
+ (mode, count, type, indices, draw_count));
+ }
+
+ /* Restore states. */
+ if (index_buffer) {
+ _mesa_InternalBindElementBuffer(ctx, NULL);
+ }
+ if (non_vbo_attrib_mask) {
+ _mesa_InternalBindVertexBuffers(ctx, attribs, non_vbo_attrib_mask,
+ true);
+ }
+}
+
+static ALWAYS_INLINE void
+multi_draw_elements_async(struct gl_context *ctx, GLenum mode,
+ const GLsizei *count, GLenum type,
+ const GLvoid *const *indices, GLsizei draw_count,
+ const GLsizei *basevertex,
+ struct gl_buffer_object *index_buffer,
+ unsigned non_vbo_attrib_mask,
+ const struct glthread_attrib_binding *attribs)
+{
+ int count_size = sizeof(GLsizei) * draw_count;
+ int indices_size = sizeof(indices[0]) * draw_count;
+ int basevertex_size = basevertex ? sizeof(GLsizei) * draw_count : 0;
+ int attribs_size = util_bitcount(non_vbo_attrib_mask) * sizeof(attribs[0]);
+ int cmd_size = sizeof(struct marshal_cmd_MultiDrawElementsBaseVertex) +
+ count_size + indices_size + basevertex_size + attribs_size;
+ struct marshal_cmd_MultiDrawElementsBaseVertex *cmd;
+
+ cmd = _mesa_glthread_allocate_command(ctx, DISPATCH_CMD_MultiDrawElementsBaseVertex, cmd_size);
+ cmd->mode = mode;
+ cmd->type = type;
+ cmd->draw_count = draw_count;
+ cmd->non_vbo_attrib_mask = non_vbo_attrib_mask;
+ cmd->index_buffer = index_buffer;
+ cmd->has_base_vertex = basevertex != NULL;
+
+ char *variable_data = (char*)(cmd + 1);
+ memcpy(variable_data, count, count_size);
+ variable_data += count_size;
+ memcpy(variable_data, indices, indices_size);
+ variable_data += indices_size;
+
+ if (basevertex) {
+ memcpy(variable_data, basevertex, basevertex_size);
+ variable_data += basevertex_size;
+ }
+
+ if (non_vbo_attrib_mask)
+ memcpy(variable_data, attribs, attribs_size);
+}
+
+void GLAPIENTRY
+_mesa_marshal_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count,
+ GLenum type,
+ const GLvoid *const *indices,
+ GLsizei draw_count,
+ const GLsizei *basevertex)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ struct glthread_vao *vao = ctx->GLThread.CurrentVAO;
+ unsigned non_vbo_attrib_mask = vao->UserPointerMask & vao->Enabled;
+ bool has_user_indices = vao->CurrentElementBufferName == 0;
+
+ /* Fast path when nothing needs to be done. */
+ if (draw_count >= 0 &&
+ (ctx->API == API_OPENGL_CORE ||
+ !is_index_type_valid(type) ||
+ (!non_vbo_attrib_mask && !has_user_indices))) {
+ multi_draw_elements_async(ctx, mode, count, type, indices, draw_count,
+ basevertex, 0, 0, NULL);
+ return;
+ }
+
+ bool need_index_bounds = non_vbo_attrib_mask & ~vao->NonZeroDivisorMask;
+
+ /* If the draw count is too high or negative, the queue can't be used.
+ *
+ * Sync if indices come from a buffer and vertices come from memory
+ * and index bounds are not valid. We would have to map the indices
+ * to compute the index bounds, and for that we would have to sync anyway.
+ */
+ if (!ctx->GLThread.SupportsNonVBOUploads ||
+ draw_count < 0 || draw_count > MARSHAL_MAX_CMD_SIZE / 32 ||
+ (need_index_bounds && !has_user_indices))
+ goto sync;
+
+ unsigned index_size = get_index_size(type);
+ unsigned min_index = ~0;
+ unsigned max_index = 0;
+ unsigned total_count = 0;
+ unsigned num_vertices = 0;
+
+ /* This is always true if there is per-vertex data that needs to be
+ * uploaded.
+ */
+ if (need_index_bounds) {
+ /* Compute the index bounds. */
+ for (unsigned i = 0; i < draw_count; i++) {
+ GLsizei vertex_count = count[i];
+
+ if (vertex_count < 0) {
+ /* Just call the driver to set the error. */
+ multi_draw_elements_async(ctx, mode, count, type, indices, draw_count,
+ basevertex, 0, 0, NULL);
+ return;
+ }
+ if (vertex_count == 0)
+ continue;
+
+ unsigned min = ~0, max = 0;
+ vbo_get_minmax_index_mapped(vertex_count, index_size,
+ ctx->GLThread._RestartIndex[index_size - 1],
+ ctx->GLThread._PrimitiveRestart, indices[i],
+ &min, &max);
+ if (basevertex) {
+ min += basevertex[i];
+ max += basevertex[i];
+ }
+ min_index = MIN2(min_index, min);
+ max_index = MAX2(max_index, max);
+ total_count += vertex_count;
+ }
+
+ num_vertices = max_index + 1 - min_index;
+
+ if (total_count == 0 || num_vertices == 0) {
+ /* Nothing to do, but call the driver to set possible GL errors. */
+ multi_draw_elements_async(ctx, mode, count, type, indices, draw_count,
+ basevertex, 0, 0, NULL);
+ return;
+ }
+
+ /* If there is too much data to upload, sync and let the driver unroll
+ * indices. */
+ if (util_is_vbo_upload_ratio_too_large(total_count, num_vertices))
+ goto sync;
+ } else if (has_user_indices) {
+ /* Only compute total_count for the upload of indices. */
+ for (unsigned i = 0; i < draw_count; i++) {
+ GLsizei vertex_count = count[i];
+
+ if (vertex_count < 0) {
+ /* Just call the driver to set the error. */
+ multi_draw_elements_async(ctx, mode, count, type, indices, draw_count,
+ basevertex, 0, 0, NULL);
+ return;
+ }
+ if (vertex_count == 0)
+ continue;
+
+ total_count += vertex_count;
+ }
+
+ if (total_count == 0) {
+ /* Nothing to do, but call the driver to set possible GL errors. */
+ multi_draw_elements_async(ctx, mode, count, type, indices, draw_count,
+ basevertex, 0, 0, NULL);
+ return;
+ }
+ }
+
+ /* Upload vertices. */
+ struct glthread_attrib_binding attribs[VERT_ATTRIB_MAX];
+ if (non_vbo_attrib_mask &&
+ !upload_vertices(ctx, non_vbo_attrib_mask, min_index, num_vertices,
+ 0, 1, attribs))
+ goto sync;
+
+ /* Upload indices. */
+ struct gl_buffer_object *index_buffer = NULL;
+ if (has_user_indices) {
+ const GLvoid **out_indices = alloca(sizeof(indices[0]) * draw_count);
+
+ index_buffer = upload_multi_indices(ctx, total_count, index_size,
+ draw_count, count, indices,
+ out_indices);
+ indices = out_indices;
+ }
+
+ /* Draw asynchronously. */
+ multi_draw_elements_async(ctx, mode, count, type, indices, draw_count,
+ basevertex, index_buffer, non_vbo_attrib_mask,
+ attribs);
+ return;
+
+sync:
+ _mesa_glthread_finish_before(ctx, "DrawElements");
+
+ if (basevertex) {
+ CALL_MultiDrawElementsBaseVertex(ctx->CurrentServerDispatch,
+ (mode, count, type, indices, draw_count,
+ basevertex));
+ } else {
+ CALL_MultiDrawElementsEXT(ctx->CurrentServerDispatch,
+ (mode, count, type, indices, draw_count));
+ }
+}
+
+void GLAPIENTRY
+_mesa_marshal_DrawArrays(GLenum mode, GLint first, GLsizei count)
+{
+ _mesa_marshal_DrawArraysInstancedBaseInstance(mode, first, count, 1, 0);
+}
+
+void GLAPIENTRY
+_mesa_marshal_DrawArraysInstancedARB(GLenum mode, GLint first, GLsizei count,
+ GLsizei instance_count)
+{
+ _mesa_marshal_DrawArraysInstancedBaseInstance(mode, first, count,
+ instance_count, 0);
+}
+
+void GLAPIENTRY
+_mesa_marshal_DrawElements(GLenum mode, GLsizei count, GLenum type,
+ const GLvoid *indices)
+{
+ draw_elements(mode, count, type, indices, 1, 0, 0, false, 0, 0);
+}
+
+void GLAPIENTRY
+_mesa_marshal_DrawRangeElements(GLenum mode, GLuint start, GLuint end,
+ GLsizei count, GLenum type,
+ const GLvoid *indices)
+{
+ draw_elements(mode, count, type, indices, 1, 0, 0, true, start, end);
+}
+
+void GLAPIENTRY
+_mesa_marshal_DrawElementsInstancedARB(GLenum mode, GLsizei count, GLenum type,
+ const GLvoid *indices, GLsizei instance_count)
+{
+ draw_elements(mode, count, type, indices, instance_count, 0, 0, false, 0, 0);
+}
+
+void GLAPIENTRY
+_mesa_marshal_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
+ const GLvoid *indices, GLint basevertex)
+{
+ draw_elements(mode, count, type, indices, 1, basevertex, 0, false, 0, 0);
+}
+
+void GLAPIENTRY
+_mesa_marshal_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
+ GLsizei count, GLenum type,
+ const GLvoid *indices, GLint basevertex)
+{
+ draw_elements(mode, count, type, indices, 1, basevertex, 0, true, start, end);
+}
+
+void GLAPIENTRY
+_mesa_marshal_DrawElementsInstancedBaseVertex(GLenum mode, GLsizei count,
+ GLenum type, const GLvoid *indices,
+ GLsizei instance_count, GLint basevertex)
+{
+ draw_elements(mode, count, type, indices, instance_count, basevertex, 0, false, 0, 0);
+}
+
+void GLAPIENTRY
+_mesa_marshal_DrawElementsInstancedBaseInstance(GLenum mode, GLsizei count,
+ GLenum type, const GLvoid *indices,
+ GLsizei instance_count, GLuint baseinstance)
+{
+ draw_elements(mode, count, type, indices, instance_count, 0, baseinstance, false, 0, 0);
+}
+
+void GLAPIENTRY
+_mesa_marshal_DrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count,
+ GLenum type, const GLvoid *indices,
+ GLsizei instance_count, GLint basevertex,
+ GLuint baseinstance)
+{
+ draw_elements(mode, count, type, indices, instance_count, basevertex, baseinstance, false, 0, 0);
+}
+
+void GLAPIENTRY
+_mesa_marshal_MultiDrawElementsEXT(GLenum mode, const GLsizei *count,
+ GLenum type, const GLvoid *const *indices,
+ GLsizei draw_count)
+{
+ _mesa_marshal_MultiDrawElementsBaseVertex(mode, count, type, indices,
+ draw_count, NULL);
+}
+
+void
+_mesa_unmarshal_DrawArrays(struct gl_context *ctx, const struct marshal_cmd_DrawArrays *cmd)
+{
+ unreachable("never used - DrawArraysInstancedBaseInstance is used instead");
+}
+
+void
+_mesa_unmarshal_DrawArraysInstancedARB(struct gl_context *ctx, const struct marshal_cmd_DrawArraysInstancedARB *cmd)
+{
+ unreachable("never used - DrawArraysInstancedBaseInstance is used instead");
+}
+
+void
+_mesa_unmarshal_DrawElements(struct gl_context *ctx, const struct marshal_cmd_DrawElements *cmd)
+{
+ unreachable("never used - DrawElementsInstancedBaseVertexBaseInstance is used instead");
+}
+
+void
+_mesa_unmarshal_DrawRangeElements(struct gl_context *ctx, const struct marshal_cmd_DrawRangeElements *cmd)
+{
+ unreachable("never used - DrawElementsInstancedBaseVertexBaseInstance is used instead");
+}
+
+void
+_mesa_unmarshal_DrawElementsInstancedARB(struct gl_context *ctx, const struct marshal_cmd_DrawElementsInstancedARB *cmd)
+{
+ unreachable("never used - DrawElementsInstancedBaseVertexBaseInstance is used instead");
+}
+
+void
+_mesa_unmarshal_DrawElementsBaseVertex(struct gl_context *ctx, const struct marshal_cmd_DrawElementsBaseVertex *cmd)
+{
+ unreachable("never used - DrawElementsInstancedBaseVertexBaseInstance is used instead");
+}
+
+void
+_mesa_unmarshal_DrawRangeElementsBaseVertex(struct gl_context *ctx, const struct marshal_cmd_DrawRangeElementsBaseVertex *cmd)
+{
+ unreachable("never used - DrawElementsInstancedBaseVertexBaseInstance is used instead");
+}
+
+void
+_mesa_unmarshal_DrawElementsInstancedBaseVertex(struct gl_context *ctx, const struct marshal_cmd_DrawElementsInstancedBaseVertex *cmd)
+{
+ unreachable("never used - DrawElementsInstancedBaseVertexBaseInstance is used instead");
+}
+
+void
+_mesa_unmarshal_DrawElementsInstancedBaseInstance(struct gl_context *ctx, const struct marshal_cmd_DrawElementsInstancedBaseInstance *cmd)
+{
+ unreachable("never used - DrawElementsInstancedBaseVertexBaseInstance is used instead");
+}
+
+void
+_mesa_unmarshal_MultiDrawElementsEXT(struct gl_context *ctx, const struct marshal_cmd_MultiDrawElementsEXT *cmd)
+{
+ unreachable("never used - MultiDrawElementsBaseVertex is used instead");
+}
diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index 1a0fedc2a74..edacad9a5f2 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -167,6 +167,7 @@ files_libmesa_common = files(
'main/glthread.c',
'main/glthread.h',
'main/glthread_bufferobj.c',
+ 'main/glthread_draw.c',
'main/glthread_marshal.h',
'main/glthread_shaderobj.c',
'main/glthread_varray.c',
More information about the mesa-commit
mailing list