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

iris: Drop bonus parameters from iris_init_*_context() 

Nothing uses vtbl or dbg, and screen is available from the batch.
This commit is contained in:
Kenneth Graunke 2019-10-02 10:25:17 -04:00
parent 2d78e55a8c
commit 90a35752b4
3 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gallium/drivers/iris/iris_context.c
View File

@ -79,20 +79,17 @@ iris_lost_context_state(struct iris_batch *batch)
* batch is one of our context's, so hackily claw our way back. * batch is one of our context's, so hackily claw our way back.
*/ */
struct iris_context *ice = NULL; struct iris_context *ice = NULL;
struct iris_screen *screen;
if (batch->name == IRIS_BATCH_RENDER) { if (batch->name == IRIS_BATCH_RENDER) {
ice = container_of(batch, ice, batches[IRIS_BATCH_RENDER]); ice = container_of(batch, ice, batches[IRIS_BATCH_RENDER]);
assert(&ice->batches[IRIS_BATCH_RENDER] == batch); assert(&ice->batches[IRIS_BATCH_RENDER] == batch);
screen = (void *) ice->ctx.screen;
ice->vtbl.init_render_context(screen, batch, &ice->vtbl, &ice->dbg); ice->vtbl.init_render_context(batch);
} else if (batch->name == IRIS_BATCH_COMPUTE) { } else if (batch->name == IRIS_BATCH_COMPUTE) {
ice = container_of(batch, ice, batches[IRIS_BATCH_COMPUTE]); ice = container_of(batch, ice, batches[IRIS_BATCH_COMPUTE]);
assert(&ice->batches[IRIS_BATCH_COMPUTE] == batch); assert(&ice->batches[IRIS_BATCH_COMPUTE] == batch);
screen = (void *) ice->ctx.screen;
ice->vtbl.init_compute_context(screen, batch, &ice->vtbl, &ice->dbg); ice->vtbl.init_compute_context(batch);
} else { } else {
unreachable("unhandled batch reset"); unreachable("unhandled batch reset");
} }
@ -312,10 +309,8 @@ iris_create_context(struct pipe_screen *pscreen, void *priv, unsigned flags)
I915_EXEC_RENDER, priority); I915_EXEC_RENDER, priority);
} }
ice->vtbl.init_render_context(screen, &ice->batches[IRIS_BATCH_RENDER], ice->vtbl.init_render_context(&ice->batches[IRIS_BATCH_RENDER]);
&ice->vtbl, &ice->dbg); ice->vtbl.init_compute_context(&ice->batches[IRIS_BATCH_COMPUTE]);
ice->vtbl.init_compute_context(screen, &ice->batches[IRIS_BATCH_COMPUTE],
&ice->vtbl, &ice->dbg);
return ctx; return ctx;
} }

10
src/gallium/drivers/iris/iris_context.h
View File

@ -414,14 +414,8 @@ struct iris_stream_output_target {
*/ */
struct iris_vtable { struct iris_vtable {
void (*destroy_state)(struct iris_context *ice); void (*destroy_state)(struct iris_context *ice);
void (*init_render_context)(struct iris_screen *screen, void (*init_render_context)(struct iris_batch *batch);
struct iris_batch *batch, void (*init_compute_context)(struct iris_batch *batch);
struct iris_vtable *vtbl,
struct pipe_debug_callback *dbg);
void (*init_compute_context)(struct iris_screen *screen,
struct iris_batch *batch,
struct iris_vtable *vtbl,
struct pipe_debug_callback *dbg);
void (*upload_render_state)(struct iris_context *ice, void (*upload_render_state)(struct iris_context *ice,
struct iris_batch *batch, struct iris_batch *batch,
const struct pipe_draw_info *draw); const struct pipe_draw_info *draw);

14
src/gallium/drivers/iris/iris_state.c
View File

@ -776,12 +776,9 @@ iris_alloc_push_constants(struct iris_batch *batch)
* way, but we never actually change. * way, but we never actually change.
*/ */
static void static void
iris_init_render_context(struct iris_screen *screen, iris_init_render_context(struct iris_batch *batch)
struct iris_batch *batch,
struct iris_vtable *vtbl,
struct pipe_debug_callback *dbg)
{ {
UNUSED const struct gen_device_info *devinfo = &screen->devinfo; UNUSED const struct gen_device_info *devinfo = &batch->screen->devinfo;
uint32_t reg_val; uint32_t reg_val;
emit_pipeline_select(batch, _3D); emit_pipeline_select(batch, _3D);
@ -888,12 +885,9 @@ iris_init_render_context(struct iris_screen *screen,
} }
static void static void
iris_init_compute_context(struct iris_screen *screen, iris_init_compute_context(struct iris_batch *batch)
struct iris_batch *batch,
struct iris_vtable *vtbl,
struct pipe_debug_callback *dbg)
{ {
UNUSED const struct gen_device_info *devinfo = &screen->devinfo; UNUSED const struct gen_device_info *devinfo = &batch->screen->devinfo;
emit_pipeline_select(batch, GPGPU); emit_pipeline_select(batch, GPGPU);