fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 03:28:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glthread: use custom marshal/unmarshal for CallList

Browse source 
Will be used in the next commit.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11493>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2020-11-30 17:32:06 +01:00 • committed by Marge Bot
parent 7e2d4f505d
commit b0536119f2
4 changed files with 55 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mapi/glapi/gen/gl_API.xml
View file

@ -1122,8 +1122,7 @@
<glx sop="102"/>
</function>
<function name="CallList" deprecated="3.1"
marshal_call_after="_mesa_glthread_CallList(ctx, list);">
<function name="CallList" deprecated="3.1" marshal="custom">
<param name="list" type="GLuint"/>
<glx rop="1"/>
</function>

47
src/mesa/main/glthread_list.c Normal file
View file

@ -0,0 +1,47 @@
/*
* 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.
*/
#include "c99_alloca.h"
#include "main/glthread_marshal.h"
#include "main/dispatch.h"
uint32_t
_mesa_unmarshal_CallList(struct gl_context *ctx, const struct marshal_cmd_CallList *cmd, const uint64_t *last)
{
const GLuint list = cmd->list;
CALL_CallList(ctx->CurrentServerDispatch, (list));
return cmd->cmd_base.cmd_size;
}
void GLAPIENTRY
_mesa_marshal_CallList(GLuint list)
{
GET_CURRENT_CONTEXT(ctx);
int cmd_size = sizeof(struct marshal_cmd_CallList);
struct marshal_cmd_CallList *cmd;
cmd = _mesa_glthread_allocate_command(ctx, DISPATCH_CMD_CallList, cmd_size);
cmd->list = list;
_mesa_glthread_CallList(ctx, list);
}

6
src/mesa/main/glthread_marshal.h
View file

@ -721,4 +721,10 @@ _mesa_glthread_DeleteLists(struct gl_context *ctx, GLsizei range)
_mesa_glthread_flush_batch(ctx);
}
struct marshal_cmd_CallList
{
struct marshal_cmd_base cmd_base;
GLuint list;
};
#endif /* MARSHAL_H */

1
src/mesa/meson.build
View file

@ -167,6 +167,7 @@ files_libmesa_common = files(
'main/glthread_bufferobj.c',
'main/glthread_draw.c',
'main/glthread_get.c',
'main/glthread_list.c',
'main/glthread_marshal.h',
'main/glthread_shaderobj.c',
'main/glthread_varray.c',