header = """
#include "api_exec.h"
-#include "context.h"
+#include "glthread_marshal.h"
#include "dispatch.h"
-#include "glthread.h"
-#include "marshal.h"
#define COMPAT (ctx->API != API_OPENGL_CORE)
main/glthread.c \
main/glthread.h \
main/glthread_bufferobj.c \
+ main/glthread_marshal.h \
+ main/glthread_shaderobj.c \
main/glthread_varray.c \
main/glheader.h \
main/hash.c \
main/lines.c \
main/lines.h \
main/macros.h \
- main/marshal.c \
- main/marshal.h \
main/marshal_generated.c \
main/marshal_generated.h \
main/matrix.c \
#include "main/mtypes.h"
#include "main/glthread.h"
-#include "main/marshal.h"
+#include "main/glthread_marshal.h"
#include "main/hash.h"
#include "util/u_atomic.h"
#include "util/u_thread.h"
* IN THE SOFTWARE.
*/
-#include "marshal.h"
+#include "glthread_marshal.h"
#include "dispatch.h"
/** Tracks the current bindings for the vertex array and index array buffers.
--- /dev/null
+/*
+ * 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 glthread_marshal.h
+ *
+ * Declarations of functions related to marshalling GL calls from a client
+ * thread to a server thread.
+ */
+
+#ifndef MARSHAL_H
+#define MARSHAL_H
+
+#include "main/glthread.h"
+#include "main/context.h"
+#include "main/macros.h"
+#include "marshal_generated.h"
+
+struct marshal_cmd_base
+{
+ /**
+ * Type of command. See enum marshal_dispatch_cmd_id.
+ */
+ uint16_t cmd_id;
+
+ /**
+ * Size of command, in multiples of 4 bytes, including cmd_base.
+ */
+ uint16_t cmd_size;
+};
+
+typedef void (*_mesa_unmarshal_func)(struct gl_context *ctx, const void *cmd);
+extern const _mesa_unmarshal_func _mesa_unmarshal_dispatch[NUM_DISPATCH_CMD];
+
+static inline void *
+_mesa_glthread_allocate_command(struct gl_context *ctx,
+ uint16_t cmd_id,
+ int size)
+{
+ struct glthread_state *glthread = ctx->GLThread;
+ struct glthread_batch *next = &glthread->batches[glthread->next];
+ struct marshal_cmd_base *cmd_base;
+ const int aligned_size = ALIGN(size, 8);
+
+ if (unlikely(next->used + size > MARSHAL_MAX_CMD_SIZE)) {
+ _mesa_glthread_flush_batch(ctx);
+ next = &glthread->batches[glthread->next];
+ }
+
+ cmd_base = (struct marshal_cmd_base *)&next->buffer[next->used];
+ next->used += aligned_size;
+ cmd_base->cmd_id = cmd_id;
+ cmd_base->cmd_size = aligned_size;
+ return cmd_base;
+}
+
+/**
+ * Instead of conditionally handling marshaling immediate index data in draw
+ * calls (deprecated and removed in GL core), we just disable threading.
+ */
+static inline bool
+_mesa_glthread_is_non_vbo_draw_elements(const struct gl_context *ctx)
+{
+ struct glthread_state *glthread = ctx->GLThread;
+
+ return ctx->API != API_OPENGL_CORE &&
+ (glthread->CurrentVAO->IndexBufferIsUserPointer ||
+ glthread->CurrentVAO->HasUserPointer);
+}
+
+static inline bool
+_mesa_glthread_is_non_vbo_draw_arrays(const struct gl_context *ctx)
+{
+ struct glthread_state *glthread = ctx->GLThread;
+
+ return ctx->API != API_OPENGL_CORE && glthread->CurrentVAO->HasUserPointer;
+}
+
+static inline bool
+_mesa_glthread_is_non_vbo_draw_arrays_indirect(const struct gl_context *ctx)
+{
+ struct glthread_state *glthread = ctx->GLThread;
+
+ return ctx->API != API_OPENGL_CORE &&
+ (!glthread->draw_indirect_buffer_is_vbo ||
+ glthread->CurrentVAO->HasUserPointer );
+}
+
+static inline bool
+_mesa_glthread_is_non_vbo_draw_elements_indirect(const struct gl_context *ctx)
+{
+ struct glthread_state *glthread = ctx->GLThread;
+
+ return ctx->API != API_OPENGL_CORE &&
+ (!glthread->draw_indirect_buffer_is_vbo ||
+ glthread->CurrentVAO->IndexBufferIsUserPointer ||
+ glthread->CurrentVAO->HasUserPointer);
+}
+
+
+struct _glapi_table *
+_mesa_create_marshal_table(const struct gl_context *ctx);
+
+void
+_mesa_glthread_BindBuffer(struct gl_context *ctx, GLenum target, GLuint buffer);
+
+static inline unsigned
+_mesa_buffer_enum_to_count(GLenum buffer)
+{
+ switch (buffer) {
+ case GL_COLOR:
+ return 4;
+ case GL_DEPTH_STENCIL:
+ return 2;
+ case GL_STENCIL:
+ case GL_DEPTH:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+static inline unsigned
+_mesa_tex_param_enum_to_count(GLenum pname)
+{
+ switch (pname) {
+ case GL_TEXTURE_MIN_FILTER:
+ case GL_TEXTURE_MAG_FILTER:
+ case GL_TEXTURE_WRAP_S:
+ case GL_TEXTURE_WRAP_T:
+ case GL_TEXTURE_WRAP_R:
+ case GL_TEXTURE_BASE_LEVEL:
+ case GL_TEXTURE_MAX_LEVEL:
+ case GL_GENERATE_MIPMAP_SGIS:
+ case GL_TEXTURE_COMPARE_MODE_ARB:
+ case GL_TEXTURE_COMPARE_FUNC_ARB:
+ case GL_DEPTH_TEXTURE_MODE_ARB:
+ case GL_DEPTH_STENCIL_TEXTURE_MODE:
+ case GL_TEXTURE_SRGB_DECODE_EXT:
+ case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+ case GL_TEXTURE_SWIZZLE_R:
+ case GL_TEXTURE_SWIZZLE_G:
+ case GL_TEXTURE_SWIZZLE_B:
+ case GL_TEXTURE_SWIZZLE_A:
+ case GL_TEXTURE_MIN_LOD:
+ case GL_TEXTURE_MAX_LOD:
+ case GL_TEXTURE_PRIORITY:
+ case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+ case GL_TEXTURE_LOD_BIAS:
+ case GL_TEXTURE_TILING_EXT:
+ return 1;
+ case GL_TEXTURE_CROP_RECT_OES:
+ case GL_TEXTURE_SWIZZLE_RGBA:
+ case GL_TEXTURE_BORDER_COLOR:
+ return 4;
+ default:
+ return 0;
+ }
+}
+
+static inline unsigned
+_mesa_fog_enum_to_count(GLenum pname)
+{
+ switch (pname) {
+ case GL_FOG_MODE:
+ case GL_FOG_DENSITY:
+ case GL_FOG_START:
+ case GL_FOG_END:
+ case GL_FOG_INDEX:
+ case GL_FOG_COORDINATE_SOURCE_EXT:
+ case GL_FOG_DISTANCE_MODE_NV:
+ return 1;
+ case GL_FOG_COLOR:
+ return 4;
+ default:
+ return 0;
+ }
+}
+
+static inline unsigned
+_mesa_light_enum_to_count(GLenum pname)
+{
+ switch (pname) {
+ case GL_AMBIENT:
+ case GL_DIFFUSE:
+ case GL_SPECULAR:
+ case GL_POSITION:
+ return 4;
+ case GL_SPOT_DIRECTION:
+ return 3;
+ case GL_SPOT_EXPONENT:
+ case GL_SPOT_CUTOFF:
+ case GL_CONSTANT_ATTENUATION:
+ case GL_LINEAR_ATTENUATION:
+ case GL_QUADRATIC_ATTENUATION:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+static inline unsigned
+_mesa_light_model_enum_to_count(GLenum pname)
+{
+ switch (pname) {
+ case GL_LIGHT_MODEL_AMBIENT:
+ return 4;
+ case GL_LIGHT_MODEL_LOCAL_VIEWER:
+ case GL_LIGHT_MODEL_TWO_SIDE:
+ case GL_LIGHT_MODEL_COLOR_CONTROL:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+static inline unsigned
+_mesa_texenv_enum_to_count(GLenum pname)
+{
+ switch (pname) {
+ case GL_TEXTURE_ENV_MODE:
+ case GL_COMBINE_RGB:
+ case GL_COMBINE_ALPHA:
+ case GL_SOURCE0_RGB:
+ case GL_SOURCE1_RGB:
+ case GL_SOURCE2_RGB:
+ case GL_SOURCE3_RGB_NV:
+ case GL_SOURCE0_ALPHA:
+ case GL_SOURCE1_ALPHA:
+ case GL_SOURCE2_ALPHA:
+ case GL_SOURCE3_ALPHA_NV:
+ case GL_OPERAND0_RGB:
+ case GL_OPERAND1_RGB:
+ case GL_OPERAND2_RGB:
+ case GL_OPERAND3_RGB_NV:
+ case GL_OPERAND0_ALPHA:
+ case GL_OPERAND1_ALPHA:
+ case GL_OPERAND2_ALPHA:
+ case GL_OPERAND3_ALPHA_NV:
+ case GL_RGB_SCALE:
+ case GL_ALPHA_SCALE:
+ case GL_TEXTURE_LOD_BIAS_EXT:
+ case GL_COORD_REPLACE_NV:
+ return 1;
+ case GL_TEXTURE_ENV_COLOR:
+ return 4;
+ default:
+ return 0;
+ }
+}
+
+static inline unsigned
+_mesa_texgen_enum_to_count(GLenum pname)
+{
+ switch (pname) {
+ case GL_TEXTURE_GEN_MODE:
+ return 1;
+ case GL_OBJECT_PLANE:
+ case GL_EYE_PLANE:
+ return 4;
+ default:
+ return 0;
+ }
+}
+
+static inline unsigned
+_mesa_material_enum_to_count(GLenum pname)
+{
+ switch (pname) {
+ case GL_EMISSION:
+ case GL_AMBIENT:
+ case GL_DIFFUSE:
+ case GL_SPECULAR:
+ case GL_AMBIENT_AND_DIFFUSE:
+ return 4;
+ case GL_COLOR_INDEXES:
+ return 3;
+ case GL_SHININESS:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+static inline unsigned
+_mesa_point_param_enum_to_count(GLenum pname)
+{
+ switch (pname) {
+ case GL_DISTANCE_ATTENUATION_EXT:
+ return 3;
+ case GL_POINT_SIZE_MIN_EXT:
+ case GL_POINT_SIZE_MAX_EXT:
+ case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
+ case GL_POINT_SPRITE_R_MODE_NV:
+ case GL_POINT_SPRITE_COORD_ORIGIN:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+static inline unsigned
+_mesa_calllists_enum_to_count(GLenum type)
+{
+ switch (type) {
+ case GL_BYTE:
+ case GL_UNSIGNED_BYTE:
+ return 1;
+ case GL_SHORT:
+ case GL_UNSIGNED_SHORT:
+ case GL_2_BYTES:
+ return 2;
+ case GL_3_BYTES:
+ return 3;
+ case GL_INT:
+ case GL_UNSIGNED_INT:
+ case GL_FLOAT:
+ case GL_4_BYTES:
+ return 4;
+ default:
+ return 0;
+ }
+}
+
+static inline unsigned
+_mesa_patch_param_enum_to_count(GLenum pname)
+{
+ switch (pname) {
+ case GL_PATCH_DEFAULT_OUTER_LEVEL:
+ return 4;
+ case GL_PATCH_DEFAULT_INNER_LEVEL:
+ return 2;
+ default:
+ return 0;
+ }
+}
+
+static inline unsigned
+_mesa_memobj_enum_to_count(GLenum pname)
+{
+ switch (pname) {
+ case GL_DEDICATED_MEMORY_OBJECT_EXT:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+static inline unsigned
+_mesa_semaphore_enum_to_count(GLenum pname)
+{
+ switch (pname) {
+ /* EXT_semaphore and EXT_semaphore_fd define no parameters */
+ default:
+ return 0;
+ }
+}
+
+#endif /* MARSHAL_H */
--- /dev/null
+/*
+ * 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.
+ */
+
+#include "glthread_marshal.h"
+#include "dispatch.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((void *)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(sizeof(struct marshal_cmd_ShaderSource) % 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 && count > 0) {
+ 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];
+ }
+ } else {
+ _mesa_glthread_finish(ctx);
+ CALL_ShaderSource(ctx->CurrentServerDispatch,
+ (shader, count, string, length_tmp));
+ }
+ free(length_tmp);
+}
+++ /dev/null
-/*
- * 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 "main/enums.h"
-#include "main/macros.h"
-#include "marshal.h"
-#include "dispatch.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((void *)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(sizeof(struct marshal_cmd_ShaderSource) % 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 && count > 0) {
- 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];
- }
- } else {
- _mesa_glthread_finish(ctx);
- CALL_ShaderSource(ctx->CurrentServerDispatch,
- (shader, count, string, length_tmp));
- }
- free(length_tmp);
-}
+++ /dev/null
-/*
- * 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.h
- *
- * Declarations of functions related to marshalling GL calls from a client
- * thread to a server thread.
- */
-
-#ifndef MARSHAL_H
-#define MARSHAL_H
-
-#include "main/glthread.h"
-#include "main/context.h"
-#include "main/macros.h"
-#include "marshal_generated.h"
-
-struct marshal_cmd_base
-{
- /**
- * Type of command. See enum marshal_dispatch_cmd_id.
- */
- uint16_t cmd_id;
-
- /**
- * Size of command, in multiples of 4 bytes, including cmd_base.
- */
- uint16_t cmd_size;
-};
-
-typedef void (*_mesa_unmarshal_func)(struct gl_context *ctx, const void *cmd);
-extern const _mesa_unmarshal_func _mesa_unmarshal_dispatch[NUM_DISPATCH_CMD];
-
-static inline void *
-_mesa_glthread_allocate_command(struct gl_context *ctx,
- uint16_t cmd_id,
- int size)
-{
- struct glthread_state *glthread = ctx->GLThread;
- struct glthread_batch *next = &glthread->batches[glthread->next];
- struct marshal_cmd_base *cmd_base;
- const int aligned_size = ALIGN(size, 8);
-
- if (unlikely(next->used + size > MARSHAL_MAX_CMD_SIZE)) {
- _mesa_glthread_flush_batch(ctx);
- next = &glthread->batches[glthread->next];
- }
-
- cmd_base = (struct marshal_cmd_base *)&next->buffer[next->used];
- next->used += aligned_size;
- cmd_base->cmd_id = cmd_id;
- cmd_base->cmd_size = aligned_size;
- return cmd_base;
-}
-
-/**
- * Instead of conditionally handling marshaling immediate index data in draw
- * calls (deprecated and removed in GL core), we just disable threading.
- */
-static inline bool
-_mesa_glthread_is_non_vbo_draw_elements(const struct gl_context *ctx)
-{
- struct glthread_state *glthread = ctx->GLThread;
-
- return ctx->API != API_OPENGL_CORE &&
- (glthread->CurrentVAO->IndexBufferIsUserPointer ||
- glthread->CurrentVAO->HasUserPointer);
-}
-
-static inline bool
-_mesa_glthread_is_non_vbo_draw_arrays(const struct gl_context *ctx)
-{
- struct glthread_state *glthread = ctx->GLThread;
-
- return ctx->API != API_OPENGL_CORE && glthread->CurrentVAO->HasUserPointer;
-}
-
-static inline bool
-_mesa_glthread_is_non_vbo_draw_arrays_indirect(const struct gl_context *ctx)
-{
- struct glthread_state *glthread = ctx->GLThread;
-
- return ctx->API != API_OPENGL_CORE &&
- (!glthread->draw_indirect_buffer_is_vbo ||
- glthread->CurrentVAO->HasUserPointer );
-}
-
-static inline bool
-_mesa_glthread_is_non_vbo_draw_elements_indirect(const struct gl_context *ctx)
-{
- struct glthread_state *glthread = ctx->GLThread;
-
- return ctx->API != API_OPENGL_CORE &&
- (!glthread->draw_indirect_buffer_is_vbo ||
- glthread->CurrentVAO->IndexBufferIsUserPointer ||
- glthread->CurrentVAO->HasUserPointer);
-}
-
-
-struct _glapi_table *
-_mesa_create_marshal_table(const struct gl_context *ctx);
-
-void
-_mesa_glthread_BindBuffer(struct gl_context *ctx, GLenum target, GLuint buffer);
-
-static inline unsigned
-_mesa_buffer_enum_to_count(GLenum buffer)
-{
- switch (buffer) {
- case GL_COLOR:
- return 4;
- case GL_DEPTH_STENCIL:
- return 2;
- case GL_STENCIL:
- case GL_DEPTH:
- return 1;
- default:
- return 0;
- }
-}
-
-static inline unsigned
-_mesa_tex_param_enum_to_count(GLenum pname)
-{
- switch (pname) {
- case GL_TEXTURE_MIN_FILTER:
- case GL_TEXTURE_MAG_FILTER:
- case GL_TEXTURE_WRAP_S:
- case GL_TEXTURE_WRAP_T:
- case GL_TEXTURE_WRAP_R:
- case GL_TEXTURE_BASE_LEVEL:
- case GL_TEXTURE_MAX_LEVEL:
- case GL_GENERATE_MIPMAP_SGIS:
- case GL_TEXTURE_COMPARE_MODE_ARB:
- case GL_TEXTURE_COMPARE_FUNC_ARB:
- case GL_DEPTH_TEXTURE_MODE_ARB:
- case GL_DEPTH_STENCIL_TEXTURE_MODE:
- case GL_TEXTURE_SRGB_DECODE_EXT:
- case GL_TEXTURE_CUBE_MAP_SEAMLESS:
- case GL_TEXTURE_SWIZZLE_R:
- case GL_TEXTURE_SWIZZLE_G:
- case GL_TEXTURE_SWIZZLE_B:
- case GL_TEXTURE_SWIZZLE_A:
- case GL_TEXTURE_MIN_LOD:
- case GL_TEXTURE_MAX_LOD:
- case GL_TEXTURE_PRIORITY:
- case GL_TEXTURE_MAX_ANISOTROPY_EXT:
- case GL_TEXTURE_LOD_BIAS:
- case GL_TEXTURE_TILING_EXT:
- return 1;
- case GL_TEXTURE_CROP_RECT_OES:
- case GL_TEXTURE_SWIZZLE_RGBA:
- case GL_TEXTURE_BORDER_COLOR:
- return 4;
- default:
- return 0;
- }
-}
-
-static inline unsigned
-_mesa_fog_enum_to_count(GLenum pname)
-{
- switch (pname) {
- case GL_FOG_MODE:
- case GL_FOG_DENSITY:
- case GL_FOG_START:
- case GL_FOG_END:
- case GL_FOG_INDEX:
- case GL_FOG_COORDINATE_SOURCE_EXT:
- case GL_FOG_DISTANCE_MODE_NV:
- return 1;
- case GL_FOG_COLOR:
- return 4;
- default:
- return 0;
- }
-}
-
-static inline unsigned
-_mesa_light_enum_to_count(GLenum pname)
-{
- switch (pname) {
- case GL_AMBIENT:
- case GL_DIFFUSE:
- case GL_SPECULAR:
- case GL_POSITION:
- return 4;
- case GL_SPOT_DIRECTION:
- return 3;
- case GL_SPOT_EXPONENT:
- case GL_SPOT_CUTOFF:
- case GL_CONSTANT_ATTENUATION:
- case GL_LINEAR_ATTENUATION:
- case GL_QUADRATIC_ATTENUATION:
- return 1;
- default:
- return 0;
- }
-}
-
-static inline unsigned
-_mesa_light_model_enum_to_count(GLenum pname)
-{
- switch (pname) {
- case GL_LIGHT_MODEL_AMBIENT:
- return 4;
- case GL_LIGHT_MODEL_LOCAL_VIEWER:
- case GL_LIGHT_MODEL_TWO_SIDE:
- case GL_LIGHT_MODEL_COLOR_CONTROL:
- return 1;
- default:
- return 0;
- }
-}
-
-static inline unsigned
-_mesa_texenv_enum_to_count(GLenum pname)
-{
- switch (pname) {
- case GL_TEXTURE_ENV_MODE:
- case GL_COMBINE_RGB:
- case GL_COMBINE_ALPHA:
- case GL_SOURCE0_RGB:
- case GL_SOURCE1_RGB:
- case GL_SOURCE2_RGB:
- case GL_SOURCE3_RGB_NV:
- case GL_SOURCE0_ALPHA:
- case GL_SOURCE1_ALPHA:
- case GL_SOURCE2_ALPHA:
- case GL_SOURCE3_ALPHA_NV:
- case GL_OPERAND0_RGB:
- case GL_OPERAND1_RGB:
- case GL_OPERAND2_RGB:
- case GL_OPERAND3_RGB_NV:
- case GL_OPERAND0_ALPHA:
- case GL_OPERAND1_ALPHA:
- case GL_OPERAND2_ALPHA:
- case GL_OPERAND3_ALPHA_NV:
- case GL_RGB_SCALE:
- case GL_ALPHA_SCALE:
- case GL_TEXTURE_LOD_BIAS_EXT:
- case GL_COORD_REPLACE_NV:
- return 1;
- case GL_TEXTURE_ENV_COLOR:
- return 4;
- default:
- return 0;
- }
-}
-
-static inline unsigned
-_mesa_texgen_enum_to_count(GLenum pname)
-{
- switch (pname) {
- case GL_TEXTURE_GEN_MODE:
- return 1;
- case GL_OBJECT_PLANE:
- case GL_EYE_PLANE:
- return 4;
- default:
- return 0;
- }
-}
-
-static inline unsigned
-_mesa_material_enum_to_count(GLenum pname)
-{
- switch (pname) {
- case GL_EMISSION:
- case GL_AMBIENT:
- case GL_DIFFUSE:
- case GL_SPECULAR:
- case GL_AMBIENT_AND_DIFFUSE:
- return 4;
- case GL_COLOR_INDEXES:
- return 3;
- case GL_SHININESS:
- return 1;
- default:
- return 0;
- }
-}
-
-static inline unsigned
-_mesa_point_param_enum_to_count(GLenum pname)
-{
- switch (pname) {
- case GL_DISTANCE_ATTENUATION_EXT:
- return 3;
- case GL_POINT_SIZE_MIN_EXT:
- case GL_POINT_SIZE_MAX_EXT:
- case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
- case GL_POINT_SPRITE_R_MODE_NV:
- case GL_POINT_SPRITE_COORD_ORIGIN:
- return 1;
- default:
- return 0;
- }
-}
-
-static inline unsigned
-_mesa_calllists_enum_to_count(GLenum type)
-{
- switch (type) {
- case GL_BYTE:
- case GL_UNSIGNED_BYTE:
- return 1;
- case GL_SHORT:
- case GL_UNSIGNED_SHORT:
- case GL_2_BYTES:
- return 2;
- case GL_3_BYTES:
- return 3;
- case GL_INT:
- case GL_UNSIGNED_INT:
- case GL_FLOAT:
- case GL_4_BYTES:
- return 4;
- default:
- return 0;
- }
-}
-
-static inline unsigned
-_mesa_patch_param_enum_to_count(GLenum pname)
-{
- switch (pname) {
- case GL_PATCH_DEFAULT_OUTER_LEVEL:
- return 4;
- case GL_PATCH_DEFAULT_INNER_LEVEL:
- return 2;
- default:
- return 0;
- }
-}
-
-static inline unsigned
-_mesa_memobj_enum_to_count(GLenum pname)
-{
- switch (pname) {
- case GL_DEDICATED_MEMORY_OBJECT_EXT:
- return 1;
- default:
- return 0;
- }
-}
-
-static inline unsigned
-_mesa_semaphore_enum_to_count(GLenum pname)
-{
- switch (pname) {
- /* EXT_semaphore and EXT_semaphore_fd define no parameters */
- default:
- return 0;
- }
-}
-
-#endif /* MARSHAL_H */
'main/glthread.c',
'main/glthread.h',
'main/glthread_bufferobj.c',
+ 'main/glthread_marshal.h',
+ 'main/glthread_shaderobj.c',
'main/glthread_varray.c',
'main/glheader.h',
'main/hash.c',
'main/lines.c',
'main/lines.h',
'main/macros.h',
- 'main/marshal.c',
- 'main/marshal.h',
'main/matrix.c',
'main/matrix.h',
'main/mipmap.c',
projects / mesa.git / commitdiff