Browse Source

radeon: Unify the style of function pointer calls in structs

Signed-off-by: Boyan Ding <boyan.j.ding@gmail.com>
[Emil Velikov: handle the all cases]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
tags/17.0-branchpoint
Boyan Ding 9 years ago
parent
commit
2d05425d3e

+ 4
- 4
src/mesa/drivers/dri/radeon/radeon_common.c View File

@@ -426,7 +426,7 @@ static void radeon_print_state_atom(radeonContextPtr radeon, struct radeon_state
if (!radeon_is_debug_enabled(RADEON_STATE, RADEON_VERBOSE) )
return;

dwords = (*state->check) (&radeon->glCtx, state);
dwords = state->check(&radeon->glCtx, state);

fprintf(stderr, " emit %s %d/%d\n", state->name, dwords, state->cmd_size);

@@ -491,13 +491,13 @@ static inline void radeon_emit_atom(radeonContextPtr radeon, struct radeon_state
BATCH_LOCALS(radeon);
int dwords;

dwords = (*atom->check) (&radeon->glCtx, atom);
dwords = atom->check(&radeon->glCtx, atom);
if (dwords) {

radeon_print_state_atom(radeon, atom);

if (atom->emit) {
(*atom->emit)(&radeon->glCtx, atom);
atom->emit(&radeon->glCtx, atom);
} else {
BEGIN_BATCH(dwords);
OUT_BATCH_TABLE(atom->cmd, dwords);
@@ -591,7 +591,7 @@ flush_front:
*/
radeon->front_buffer_dirty = GL_FALSE;

(*screen->dri2.loader->flushFrontBuffer)(drawable, drawable->loaderPrivate);
screen->dri2.loader->flushFrontBuffer(drawable, drawable->loaderPrivate);
}
}
}

+ 12
- 12
src/mesa/drivers/dri/radeon/radeon_common_context.c View File

@@ -418,12 +418,12 @@ radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable,
}
}

buffers = (*screen->dri2.loader->getBuffersWithFormat)(drawable,
&drawable->w,
&drawable->h,
attachments, i / 2,
&count,
drawable->loaderPrivate);
buffers = screen->dri2.loader->getBuffersWithFormat(drawable,
&drawable->w,
&drawable->h,
attachments, i / 2,
&count,
drawable->loaderPrivate);
} else if (screen->dri2.loader) {
i = 0;
if (draw->color_rb[0])
@@ -437,12 +437,12 @@ radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable,
attachments[i++] = __DRI_BUFFER_STENCIL;
}

buffers = (*screen->dri2.loader->getBuffers)(drawable,
&drawable->w,
&drawable->h,
attachments, i,
&count,
drawable->loaderPrivate);
buffers = screen->dri2.loader->getBuffers(drawable,
&drawable->w,
&drawable->h,
attachments, i,
&count,
drawable->loaderPrivate);
}

if (buffers == NULL)

+ 1
- 1
src/mesa/drivers/dri/radeon/radeon_queryobj.c View File

@@ -206,7 +206,7 @@ void radeon_emit_queryobj(struct gl_context *ctx, struct radeon_state_atom *atom
BATCH_LOCALS(radeon);
int dwords;

dwords = (*atom->check) (ctx, atom);
dwords = atom->check(ctx, atom);

BEGIN_BATCH(dwords);
OUT_BATCH_TABLE(atom->cmd, dwords);

Loading…
Cancel
Save