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

iris: Plumb through ISL_SWIZZLE_IDENTITY in buffer surface emitters 

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke 2019-02-28 01:13:33 -08:00
parent 4787bc944a
commit 9caabd6c5f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1531,6 +1531,7 @@ fill_buffer_surface_state(struct isl_device *isl_dev,
struct iris_bo *bo, struct iris_bo *bo,
void *map, void *map,
enum isl_format format, enum isl_format format,
struct isl_swizzle swizzle,
unsigned offset, unsigned offset,
unsigned size) unsigned size)
{ {
@ -1560,7 +1561,7 @@ fill_buffer_surface_state(struct isl_device *isl_dev,
.address = bo->gtt_offset + offset, .address = bo->gtt_offset + offset,
.size_B = final_size, .size_B = final_size,
.format = format, .format = format,
.swizzle = ISL_SWIZZLE_IDENTITY, .swizzle = swizzle,
.stride_B = cpp, .stride_B = cpp,
.mocs = mocs(bo)); .mocs = mocs(bo));
} }
@ -1697,8 +1698,8 @@ iris_create_sampler_view(struct pipe_context *ctx,
} }
} else { } else {
fill_buffer_surface_state(&screen->isl_dev, isv->res->bo, map, fill_buffer_surface_state(&screen->isl_dev, isv->res->bo, map,
isv->view.format, tmpl->u.buf.offset, isv->view.format, ISL_SWIZZLE_IDENTITY,
tmpl->u.buf.size); tmpl->u.buf.offset, tmpl->u.buf.size);
} }
return &isv->base; return &isv->base;
@ -1903,7 +1904,8 @@ iris_set_shader_images(struct pipe_context *ctx,
if (untyped_fallback) { if (untyped_fallback) {
fill_buffer_surface_state(&screen->isl_dev, res->bo, map, fill_buffer_surface_state(&screen->isl_dev, res->bo, map,
isl_fmt, 0, res->bo->size); isl_fmt, ISL_SWIZZLE_IDENTITY,
0, res->bo->size);
} else { } else {
/* Images don't support compression */ /* Images don't support compression */
unsigned aux_modes = 1 << ISL_AUX_USAGE_NONE; unsigned aux_modes = 1 << ISL_AUX_USAGE_NONE;
@ -1921,8 +1923,8 @@ iris_set_shader_images(struct pipe_context *ctx,
&res->surf, &view); &res->surf, &view);
} else { } else {
fill_buffer_surface_state(&screen->isl_dev, res->bo, map, fill_buffer_surface_state(&screen->isl_dev, res->bo, map,
isl_fmt, img->u.buf.offset, isl_fmt, ISL_SWIZZLE_IDENTITY,
img->u.buf.size); img->u.buf.offset, img->u.buf.size);
fill_buffer_image_param(&shs->image[start_slot + i].param, fill_buffer_image_param(&shs->image[start_slot + i].param,
img->format, img->u.buf.size); img->format, img->u.buf.size);
} }