diff options
| author | Kenneth Graunke <[email protected]> | 2018-06-17 21:47:52 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2019-02-21 10:26:07 -0800 |
| commit | f8179dc760fd312bf606372fd68b398e2cf23dc7 (patch) | |
| tree | e222738abdc85a304a92c444ded57f70731f61b0 /src | |
| parent | 5f3a7ee7019e4cc72363cb2197ad1f89f7a57416 (diff) | |
iris: clean up some warnings so I can see through the noise
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/iris/iris_resource.c | 14 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_state.c | 14 |
2 files changed, 10 insertions, 18 deletions
diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 088ef23ac3d..f4e9318d297 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -556,7 +556,7 @@ iris_transfer_flush_region(struct pipe_context *pipe, static void iris_transfer_unmap(struct pipe_context *pipe, struct pipe_transfer *xfer) { - struct iris_transfer *map = xfer; + struct iris_transfer *map = (void *) xfer; if (map->unmap) map->unmap(map); @@ -581,18 +581,6 @@ iris_flush_resource(struct pipe_context *ctx, struct pipe_resource *resource) { } -static boolean -iris_generate_mipmap(struct pipe_context *ctx, - struct pipe_resource *resource, - enum pipe_format format, - unsigned base_level, - unsigned last_level, - unsigned first_layer, - unsigned last_layer) -{ - return true; -} - void iris_init_screen_resource_functions(struct pipe_screen *pscreen) { diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 904113ddd9c..ca2acbb3921 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -1803,10 +1803,14 @@ iris_populate_fs_key(const struct iris_context *ice, key->coherent_fb_fetch = true; } - //pkt.SamplerCount = \ - //DIV_ROUND_UP(CLAMP(stage_state->sampler_count, 0, 16), 4); \ - //pkt.PerThreadScratchSpace = prog_data->total_scratch == 0 ? 0 : \ - //ffs(stage_state->per_thread_scratch) - 11; \ +#if 0 + // XXX: these need to go in INIT_THREAD_DISPATCH_FIELDS + pkt.SamplerCount = \ + DIV_ROUND_UP(CLAMP(stage_state->sampler_count, 0, 16), 4); \ + pkt.PerThreadScratchSpace = prog_data->total_scratch == 0 ? 0 : \ + ffs(stage_state->per_thread_scratch) - 11; \ + +#endif static uint64_t KSP(const struct iris_compiled_shader *shader) @@ -2172,7 +2176,7 @@ iris_populate_binding_table(struct iris_context *ice, // - textures // - render targets - write and read - struct brw_stage_prog_data *prog_data = (void *) shader->prog_data; + //struct brw_stage_prog_data *prog_data = (void *) shader->prog_data; uint32_t *bt_map = binder->map + binder->bt_offset[stage]; int s = 0; |