iris: move target to isl dim translate to inline.
This avoids a conflict in namespace when crocus wants to use the same function. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Adam Jackson <ajax@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10308>
This commit is contained in:
parent
a067399e37
commit
a49ef6e731
|
@ -175,28 +175,6 @@ select_best_modifier(struct gen_device_info *devinfo, enum pipe_format pfmt,
|
|||
return priority_to_modifier[prio];
|
||||
}
|
||||
|
||||
enum isl_surf_dim
|
||||
target_to_isl_surf_dim(enum pipe_texture_target target)
|
||||
{
|
||||
switch (target) {
|
||||
case PIPE_BUFFER:
|
||||
case PIPE_TEXTURE_1D:
|
||||
case PIPE_TEXTURE_1D_ARRAY:
|
||||
return ISL_SURF_DIM_1D;
|
||||
case PIPE_TEXTURE_2D:
|
||||
case PIPE_TEXTURE_CUBE:
|
||||
case PIPE_TEXTURE_RECT:
|
||||
case PIPE_TEXTURE_2D_ARRAY:
|
||||
case PIPE_TEXTURE_CUBE_ARRAY:
|
||||
return ISL_SURF_DIM_2D;
|
||||
case PIPE_TEXTURE_3D:
|
||||
return ISL_SURF_DIM_3D;
|
||||
case PIPE_MAX_TEXTURE_TYPES:
|
||||
break;
|
||||
}
|
||||
unreachable("invalid texture type");
|
||||
}
|
||||
|
||||
static inline bool is_modifier_external_only(enum pipe_format pfmt,
|
||||
uint64_t modifier)
|
||||
{
|
||||
|
|
|
@ -452,7 +452,28 @@ iris_resource_access_raw(struct iris_context *ice,
|
|||
enum isl_dim_layout iris_get_isl_dim_layout(const struct gen_device_info *devinfo,
|
||||
enum isl_tiling tiling,
|
||||
enum pipe_texture_target target);
|
||||
enum isl_surf_dim target_to_isl_surf_dim(enum pipe_texture_target target);
|
||||
static inline enum isl_surf_dim
|
||||
target_to_isl_surf_dim(enum pipe_texture_target target)
|
||||
{
|
||||
switch (target) {
|
||||
case PIPE_BUFFER:
|
||||
case PIPE_TEXTURE_1D:
|
||||
case PIPE_TEXTURE_1D_ARRAY:
|
||||
return ISL_SURF_DIM_1D;
|
||||
case PIPE_TEXTURE_2D:
|
||||
case PIPE_TEXTURE_CUBE:
|
||||
case PIPE_TEXTURE_RECT:
|
||||
case PIPE_TEXTURE_2D_ARRAY:
|
||||
case PIPE_TEXTURE_CUBE_ARRAY:
|
||||
return ISL_SURF_DIM_2D;
|
||||
case PIPE_TEXTURE_3D:
|
||||
return ISL_SURF_DIM_3D;
|
||||
case PIPE_MAX_TEXTURE_TYPES:
|
||||
break;
|
||||
}
|
||||
unreachable("invalid texture type");
|
||||
}
|
||||
|
||||
uint32_t iris_resource_get_tile_offsets(const struct iris_resource *res,
|
||||
uint32_t level, uint32_t z,
|
||||
uint32_t *tile_x, uint32_t *tile_y);
|
||||
|
|
Loading…
Reference in New Issue