KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/st: add support for semaphore object create/import/delete v3 

Add basic semaphore object operations.

v2: s/semaphore/fence for pipe objects
v3: added missing license headers

Signed-off-by: Andres Rodriguez <andresx7@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Andres Rodriguez 2017-10-16 20:09:46 -04:00
parent 67d5d08682
commit 382067f065
5 changed files with 132 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/Makefile.sources
View File

@ -485,6 +485,8 @@ STATETRACKER_FILES = \
state_tracker/st_cb_rasterpos.h \
state_tracker/st_cb_readpixels.c \
state_tracker/st_cb_readpixels.h \
state_tracker/st_cb_semaphoreobjects.c \
state_tracker/st_cb_semaphoreobjects.h \
state_tracker/st_cb_strings.c \
state_tracker/st_cb_strings.h \
state_tracker/st_cb_syncobj.c \

2
src/mesa/meson.build
View File

@ -535,6 +535,8 @@ files_libmesa_gallium = files(
'state_tracker/st_cb_readpixels.h',
'state_tracker/st_cb_strings.c',
'state_tracker/st_cb_strings.h',
'state_tracker/st_cb_semaphoreobjects.c',
'state_tracker/st_cb_semaphoreobjects.h',
'state_tracker/st_cb_syncobj.c',
'state_tracker/st_cb_syncobj.h',
'state_tracker/st_cb_texturebarrier.c',

78
src/mesa/state_tracker/st_cb_semaphoreobjects.c Normal file
View File

@ -0,0 +1,78 @@
/*
* Copyright © 2017 Valve 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 "main/imports.h"
#include "main/mtypes.h"
#include "main/externalobjects.h"
#include "st_context.h"
#include "st_cb_semaphoreobjects.h"
#include "state_tracker/drm_driver.h"
#include "pipe/p_context.h"
#include "pipe/p_screen.h"
static struct gl_semaphore_object *
st_semaphoreobj_alloc(struct gl_context *ctx, GLuint name)
{
struct st_semaphore_object *st_obj = ST_CALLOC_STRUCT(st_semaphore_object);
if (!st_obj)
return NULL;
_mesa_initialize_semaphore_object(ctx, &st_obj->Base, name);
return &st_obj->Base;
}
static void
st_semaphoreobj_free(struct gl_context *ctx,
struct gl_semaphore_object *semObj)
{
_mesa_delete_semaphore_object(ctx, semObj);
}
static void
st_import_semaphoreobj_fd(struct gl_context *ctx,
struct gl_semaphore_object *semObj,
int fd)
{
struct st_semaphore_object *st_obj = st_semaphore_object(semObj);
struct st_context *st = st_context(ctx);
struct pipe_context *pipe = st->pipe;
pipe->create_fence_fd(pipe, &st_obj->fence, fd, PIPE_FD_TYPE_SYNCOBJ);
#if !defined(_WIN32)
/* We own fd, but we no longer need it. So get rid of it */
close(fd);
#endif
}
void
st_init_semaphoreobject_functions(struct dd_function_table *functions)
{
functions->NewSemaphoreObject = st_semaphoreobj_alloc;
functions->DeleteSemaphoreObject = st_semaphoreobj_free;
functions->ImportSemaphoreFd = st_import_semaphoreobj_fd;
}

48
src/mesa/state_tracker/st_cb_semaphoreobjects.h Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright © 2017 Valve 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.
*/
#ifndef ST_CB_SEMAPHOREOBJECTS_H
#define ST_CB_SEMAPHOREOBJECTS_H
#include "main/compiler.h"
#include "main/mtypes.h"
struct dd_function_table;
struct pipe_screen;
struct st_semaphore_object
{
struct gl_semaphore_object Base;
struct pipe_fence_handle *fence;
};
static inline struct st_semaphore_object *
st_semaphore_object(struct gl_semaphore_object *obj)
{
return (struct st_semaphore_object *)obj;
}
extern void
st_init_semaphoreobject_functions(struct dd_function_table *functions);
#endif

2
src/mesa/state_tracker/st_context.c
View File

@ -60,6 +60,7 @@
#include "st_cb_program.h"
#include "st_cb_queryobj.h"
#include "st_cb_readpixels.h"
#include "st_cb_semaphoreobjects.h"
#include "st_cb_texture.h"
#include "st_cb_xformfb.h"
#include "st_cb_flush.h"
@ -734,6 +735,7 @@ st_init_driver_functions(struct pipe_screen *screen,
st_init_query_functions(functions);
st_init_cond_render_functions(functions);
st_init_readpixels_functions(functions);
st_init_semaphoreobject_functions(functions);
st_init_texture_functions(functions);
st_init_texture_barrier_functions(functions);
st_init_flush_functions(screen, functions);