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

i965/sync: Replace 'intel' prefix with 'brw'

Browse source 
This is yet another patch for the great renaming begun long ago.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Chad Versace 2016-09-27 23:33:45 -07:00
parent ce1d67c2e5
commit 9ea48fc877
3 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_context.c
View file

@ -444,7 +444,7 @@ brw_init_driver_functions(struct brw_context *brw,
intelInitBufferFuncs(functions);
intelInitPixelFuncs(functions);
intelInitBufferObjectFuncs(functions);
intel_init_syncobj_functions(functions);
brw_init_syncobj_functions(functions);
brw_init_object_purgeable_functions(functions);
brwInitFragProgFuncs( functions );

2
src/mesa/drivers/dri/i965/brw_context.h
View file

@ -1604,7 +1604,7 @@ extern int intel_translate_stencil_op(GLenum op);
extern int intel_translate_logic_op(GLenum opcode);
/* intel_syncobj.c */
void intel_init_syncobj_functions(struct dd_function_table *functions);
void brw_init_syncobj_functions(struct dd_function_table *functions);
/* gen6_sol.c */
struct gl_transform_feedback_object *

70
src/mesa/drivers/dri/i965/intel_syncobj.c
View file

@ -52,8 +52,8 @@ struct brw_fence {
bool signalled;
};
struct intel_gl_sync_object {
struct gl_sync_object Base;
struct brw_gl_sync {
struct gl_sync_object gl;
struct brw_fence fence;
};
@ -169,80 +169,80 @@ brw_fence_server_wait(struct brw_context *brw, struct brw_fence *fence)
}
static struct gl_sync_object *
intel_gl_new_sync_object(struct gl_context *ctx, GLuint id)
brw_gl_new_sync(struct gl_context *ctx, GLuint id)
{
struct intel_gl_sync_object *sync;
struct brw_gl_sync *sync;
sync = calloc(1, sizeof(*sync));
if (!sync)
return NULL;
return &sync->Base;
return &sync->gl;
}
static void
intel_gl_delete_sync_object(struct gl_context *ctx, struct gl_sync_object *s)
brw_gl_delete_sync(struct gl_context *ctx, struct gl_sync_object *_sync)
{
struct intel_gl_sync_object *sync = (struct intel_gl_sync_object *)s;
struct brw_gl_sync *sync = (struct brw_gl_sync *) _sync;
brw_fence_finish(&sync->fence);
free(sync);
}
static void
intel_gl_fence_sync(struct gl_context *ctx, struct gl_sync_object *s,
GLenum condition, GLbitfield flags)
brw_gl_fence_sync(struct gl_context *ctx, struct gl_sync_object *_sync,
GLenum condition, GLbitfield flags)
{
struct brw_context *brw = brw_context(ctx);
struct intel_gl_sync_object *sync = (struct intel_gl_sync_object *)s;
struct brw_gl_sync *sync = (struct brw_gl_sync *) _sync;
brw_fence_init(brw, &sync->fence);
brw_fence_insert(brw, &sync->fence);
}
static void
intel_gl_client_wait_sync(struct gl_context *ctx, struct gl_sync_object *s,
GLbitfield flags, GLuint64 timeout)
brw_gl_client_wait_sync(struct gl_context *ctx, struct gl_sync_object *_sync,
GLbitfield flags, GLuint64 timeout)
{
struct brw_context *brw = brw_context(ctx);
struct intel_gl_sync_object *sync = (struct intel_gl_sync_object *)s;
struct brw_gl_sync *sync = (struct brw_gl_sync *) _sync;
if (brw_fence_client_wait(brw, &sync->fence, timeout))
s->StatusFlag = 1;
sync->gl.StatusFlag = 1;
}
static void
intel_gl_server_wait_sync(struct gl_context *ctx, struct gl_sync_object *s,
brw_gl_server_wait_sync(struct gl_context *ctx, struct gl_sync_object *_sync,
GLbitfield flags, GLuint64 timeout)
{
struct brw_context *brw = brw_context(ctx);
struct intel_gl_sync_object *sync = (struct intel_gl_sync_object *)s;
struct brw_gl_sync *sync = (struct brw_gl_sync *) _sync;
brw_fence_server_wait(brw, &sync->fence);
}
static void
intel_gl_check_sync(struct gl_context *ctx, struct gl_sync_object *s)
brw_gl_check_sync(struct gl_context *ctx, struct gl_sync_object *_sync)
{
struct intel_gl_sync_object *sync = (struct intel_gl_sync_object *)s;
struct brw_gl_sync *sync = (struct brw_gl_sync *) _sync;
if (brw_fence_has_completed(&sync->fence))
s->StatusFlag = 1;
sync->gl.StatusFlag = 1;
}
void
intel_init_syncobj_functions(struct dd_function_table *functions)
brw_init_syncobj_functions(struct dd_function_table *functions)
{
functions->NewSyncObject = intel_gl_new_sync_object;
functions->DeleteSyncObject = intel_gl_delete_sync_object;
functions->FenceSync = intel_gl_fence_sync;
functions->CheckSync = intel_gl_check_sync;
functions->ClientWaitSync = intel_gl_client_wait_sync;
functions->ServerWaitSync = intel_gl_server_wait_sync;
functions->NewSyncObject = brw_gl_new_sync;
functions->DeleteSyncObject = brw_gl_delete_sync;
functions->FenceSync = brw_gl_fence_sync;
functions->CheckSync = brw_gl_check_sync;
functions->ClientWaitSync = brw_gl_client_wait_sync;
functions->ServerWaitSync = brw_gl_server_wait_sync;
}
static void *
intel_dri_create_fence(__DRIcontext *ctx)
brw_dri_create_fence(__DRIcontext *ctx)
{
struct brw_context *brw = ctx->driverPrivate;
struct brw_fence *fence;
@ -258,7 +258,7 @@ intel_dri_create_fence(__DRIcontext *ctx)
}
static void
intel_dri_destroy_fence(__DRIscreen *dri_screen, void *driver_fence)
brw_dri_destroy_fence(__DRIscreen *dri_screen, void *driver_fence)
{
struct brw_fence *fence = driver_fence;
@ -267,8 +267,8 @@ intel_dri_destroy_fence(__DRIscreen *dri_screen, void *driver_fence)
}
static GLboolean
intel_dri_client_wait_sync(__DRIcontext *ctx, void *driver_fence, unsigned flags,
uint64_t timeout)
brw_dri_client_wait_sync(__DRIcontext *ctx, void *driver_fence, unsigned flags,
uint64_t timeout)
{
struct brw_fence *fence = driver_fence;
@ -276,7 +276,7 @@ intel_dri_client_wait_sync(__DRIcontext *ctx, void *driver_fence, unsigned flags
}
static void
intel_dri_server_wait_sync(__DRIcontext *ctx, void *driver_fence, unsigned flags)
brw_dri_server_wait_sync(__DRIcontext *ctx, void *driver_fence, unsigned flags)
{
struct brw_fence *fence = driver_fence;
@ -292,9 +292,9 @@ intel_dri_server_wait_sync(__DRIcontext *ctx, void *driver_fence, unsigned flags
const __DRI2fenceExtension intelFenceExtension = {
.base = { __DRI2_FENCE, 1 },
.create_fence = intel_dri_create_fence,
.destroy_fence = intel_dri_destroy_fence,
.client_wait_sync = intel_dri_client_wait_sync,
.server_wait_sync = intel_dri_server_wait_sync,
.create_fence = brw_dri_create_fence,
.destroy_fence = brw_dri_destroy_fence,
.client_wait_sync = brw_dri_client_wait_sync,
.server_wait_sync = brw_dri_server_wait_sync,
.get_fence_from_cl_event = NULL,
};