summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2012-11-14 10:40:22 -0800
committerEric Anholt <eric@anholt.net>2013-01-03 11:58:22 -0800
commit0ba366a3a83c604eb93eb15481accbd7b4a14c0c (patch)
treefa5cab03935c8879fe96c0dd0dfe19889a7bea67
parent069d8747f38bd676e520132825f2a8ad8a434c9b (diff)
mesa: Custom thread marshalling for ShaderSource.
-rw-r--r--src/mapi/glapi/gen/gl_API.xml2
-rw-r--r--src/mesa/SConscript1
-rw-r--r--src/mesa/main/marshal.c123
-rw-r--r--src/mesa/main/marshal.h10
-rw-r--r--src/mesa/sources.mak1
5 files changed, 136 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 826b0359645..d9fe724304e 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -5613,7 +5613,7 @@
<glx ignore="true"/>
</function>
- <function name="ShaderSource" es2="2.0" offset="assign">
+ <function name="ShaderSource" es2="2.0" offset="assign" marshal="custom">
<param name="shader" type="GLuint"/>
<param name="count" type="GLsizei"/>
<param name="string" type="const GLchar * const *"/>
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 745b7d55b60..f19f3385fd1 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -88,6 +88,7 @@ main_sources = [
'main/imports.c',
'main/light.c',
'main/lines.c',
+ 'main/marshal.c',
'main/marshal_generated.c',
'main/matrix.c',
'main/mipmap.c',
diff --git a/src/mesa/main/marshal.c b/src/mesa/main/marshal.c
new file mode 100644
index 00000000000..55032095aa6
--- /dev/null
+++ b/src/mesa/main/marshal.c
@@ -0,0 +1,123 @@
+/*
+ * Copyright © 2012 Intel Corporation
+ *
+ * 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.
+ */
+
+/** \file marshal.c
+ *
+ * Custom functions for marshalling GL calls from the main thread to a worker
+ * thread when automatic code generation isn't appropriate.
+ */
+
+#include "marshal.h"
+#include "dispatch.h"
+#include "marshal_generated.h"
+
+struct marshal_cmd_ShaderSource
+{
+ struct marshal_cmd_base cmd_base;
+ GLuint shader;
+ GLsizei count;
+ /* Followed by GLint length[count], then the contents of all strings,
+ * concatenated.
+ */
+};
+
+
+void
+_mesa_unmarshal_ShaderSource(struct gl_context *ctx,
+ const struct marshal_cmd_ShaderSource *cmd)
+{
+ const GLint *cmd_length = (const GLint *) (cmd + 1);
+ const GLchar *cmd_strings = (const GLchar *) (cmd_length + cmd->count);
+ /* TODO: how to deal with malloc failure? */
+ const GLchar * *string = malloc(cmd->count * sizeof(const GLchar *));
+ int i;
+
+ for (i = 0; i < cmd->count; ++i) {
+ string[i] = cmd_strings;
+ cmd_strings += cmd_length[i];
+ }
+ CALL_ShaderSource(ctx->CurrentServerDispatch,
+ (cmd->shader, cmd->count, string, cmd_length));
+ free(string);
+}
+
+
+static size_t
+measure_ShaderSource_strings(GLsizei count, const GLchar * const *string,
+ const GLint *length_in, GLint *length_out)
+{
+ int i;
+ size_t total_string_length = 0;
+
+ for (i = 0; i < count; ++i) {
+ if (length_in == NULL || length_in[i] < 0) {
+ if (string[i])
+ length_out[i] = strlen(string[i]);
+ } else {
+ length_out[i] = length_in[i];
+ }
+ total_string_length += length_out[i];
+ }
+ return total_string_length;
+}
+
+
+void GLAPIENTRY
+_mesa_marshal_ShaderSource(GLuint shader, GLsizei count,
+ const GLchar * const *string, const GLint *length)
+{
+ /* TODO: how to report an error if count < 0? */
+
+ GET_CURRENT_CONTEXT(ctx);
+ /* TODO: how to deal with malloc failure? */
+ const size_t fixed_cmd_size = sizeof(struct marshal_cmd_ShaderSource);
+ STATIC_ASSERT(fixed_cmd_size % sizeof(GLint) == 0);
+ size_t length_size = count * sizeof(GLint);
+ GLint *length_tmp = malloc(length_size);
+ size_t total_string_length =
+ measure_ShaderSource_strings(count, string, length, length_tmp);
+ size_t total_cmd_size = fixed_cmd_size + length_size + total_string_length;
+
+ if (total_cmd_size <= MARSHAL_MAX_CMD_SIZE) {
+ struct marshal_cmd_ShaderSource *cmd =
+ _mesa_glthread_allocate_command(ctx, DISPATCH_CMD_ShaderSource,
+ total_cmd_size);
+ GLint *cmd_length = (GLint *) (cmd + 1);
+ GLchar *cmd_strings = (GLchar *) (cmd_length + count);
+ int i;
+
+ cmd->shader = shader;
+ cmd->count = count;
+ memcpy(cmd_length, length_tmp, length_size);
+ for (i = 0; i < count; ++i) {
+ memcpy(cmd_strings, string[i], cmd_length[i]);
+ cmd_strings += cmd_length[i];
+ }
+ _mesa_post_marshal_hook(ctx);
+ } else {
+ _mesa_glthread_finish(ctx);
+ CALL_ShaderSource(ctx->CurrentServerDispatch,
+ (shader, count, string, length_tmp));
+ }
+ free(length_tmp);
+}
diff --git a/src/mesa/main/marshal.h b/src/mesa/main/marshal.h
index b2ad3c99507..447e3230c60 100644
--- a/src/mesa/main/marshal.h
+++ b/src/mesa/main/marshal.h
@@ -89,4 +89,14 @@ _mesa_post_marshal_hook(struct gl_context *ctx)
_mesa_glthread_finish(ctx);
}
+struct marshal_cmd_ShaderSource;
+
+void GLAPIENTRY
+_mesa_marshal_ShaderSource(GLuint shader, GLsizei count,
+ const GLchar * const *string, const GLint *length);
+
+void
+_mesa_unmarshal_ShaderSource(struct gl_context *ctx,
+ const struct marshal_cmd_ShaderSource *cmd);
+
#endif /* MARSHAL_H */
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index bc10d6462ea..53632506cac 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -58,6 +58,7 @@ MAIN_FILES = \
$(SRCDIR)main/imports.c \
$(SRCDIR)main/light.c \
$(SRCDIR)main/lines.c \
+ $(SRCDIR)main/marshal.c \
$(SRCDIR)main/marshal_generated.c \
$(SRCDIR)main/marshal_generated.h \
$(SRCDIR)main/matrix.c \