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

isl: prefix non-static API with isl_

Browse Source 
The rest of ISL already follows this approach. Be consistent and resolve
the final references.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>
This commit is contained in:
Emil Velikov
2016-10-11 18:26:16 +01:00
committed by Emil Velikov
parent 84f9ef1de4
commit 5b1efb65ce
11 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/isl/isl.c
+16 -16
View File
@@ -253,10 +253,10 @@ isl_surf_choose_tiling(const struct isl_device *dev,
} }
if (ISL_DEV_GEN(dev) >= 6) { if (ISL_DEV_GEN(dev) >= 6) {
gen6_filter_tiling(dev, info, &tiling_flags); isl_gen6_filter_tiling(dev, info, &tiling_flags);
} else { } else {
isl_finishme("%s: gen%u", __func__, ISL_DEV_GEN(dev)); isl_finishme("%s: gen%u", __func__, ISL_DEV_GEN(dev));
gen6_filter_tiling(dev, info, &tiling_flags); isl_gen6_filter_tiling(dev, info, &tiling_flags);
} }
#define CHOOSE(__tiling) \ #define CHOOSE(__tiling) \
@@ -300,13 +300,13 @@ isl_choose_msaa_layout(const struct isl_device *dev,
enum isl_msaa_layout *msaa_layout) enum isl_msaa_layout *msaa_layout)
{ {
if (ISL_DEV_GEN(dev) >= 8) { if (ISL_DEV_GEN(dev) >= 8) {
return gen8_choose_msaa_layout(dev, info, tiling, msaa_layout); return isl_gen8_choose_msaa_layout(dev, info, tiling, msaa_layout);
} else if (ISL_DEV_GEN(dev) >= 7) { } else if (ISL_DEV_GEN(dev) >= 7) {
return gen7_choose_msaa_layout(dev, info, tiling, msaa_layout); return isl_gen7_choose_msaa_layout(dev, info, tiling, msaa_layout);
} else if (ISL_DEV_GEN(dev) >= 6) { } else if (ISL_DEV_GEN(dev) >= 6) {
return gen6_choose_msaa_layout(dev, info, tiling, msaa_layout); return isl_gen6_choose_msaa_layout(dev, info, tiling, msaa_layout);
} else { } else {
return gen4_choose_msaa_layout(dev, info, tiling, msaa_layout); return isl_gen4_choose_msaa_layout(dev, info, tiling, msaa_layout);
} }
} }
@@ -471,20 +471,20 @@ isl_choose_image_alignment_el(const struct isl_device *dev,
} }
if (ISL_DEV_GEN(dev) >= 9) { if (ISL_DEV_GEN(dev) >= 9) {
gen9_choose_image_alignment_el(dev, info, tiling, dim_layout, isl_gen9_choose_image_alignment_el(dev, info, tiling, dim_layout,
msaa_layout, image_align_el); msaa_layout, image_align_el);
} else if (ISL_DEV_GEN(dev) >= 8) { } else if (ISL_DEV_GEN(dev) >= 8) {
gen8_choose_image_alignment_el(dev, info, tiling, dim_layout, isl_gen8_choose_image_alignment_el(dev, info, tiling, dim_layout,
msaa_layout, image_align_el); msaa_layout, image_align_el);
} else if (ISL_DEV_GEN(dev) >= 7) { } else if (ISL_DEV_GEN(dev) >= 7) {
gen7_choose_image_alignment_el(dev, info, tiling, dim_layout, isl_gen7_choose_image_alignment_el(dev, info, tiling, dim_layout,
msaa_layout, image_align_el); msaa_layout, image_align_el);
} else if (ISL_DEV_GEN(dev) >= 6) { } else if (ISL_DEV_GEN(dev) >= 6) {
gen6_choose_image_alignment_el(dev, info, tiling, dim_layout, isl_gen6_choose_image_alignment_el(dev, info, tiling, dim_layout,
msaa_layout, image_align_el); msaa_layout, image_align_el);
} else { } else {
gen4_choose_image_alignment_el(dev, info, tiling, dim_layout, isl_gen4_choose_image_alignment_el(dev, info, tiling, dim_layout,
msaa_layout, image_align_el); msaa_layout, image_align_el);
} }
} }
src/intel/isl/isl_gen4.c
+10 -10
View File
@@ -25,10 +25,10 @@
#include "isl_priv.h" #include "isl_priv.h"
bool bool
gen4_choose_msaa_layout(const struct isl_device *dev, isl_gen4_choose_msaa_layout(const struct isl_device *dev,
const struct isl_surf_init_info *info, const struct isl_surf_init_info *info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_msaa_layout *msaa_layout) enum isl_msaa_layout *msaa_layout)
{ {
/* Gen4 and Gen5 do not support MSAA */ /* Gen4 and Gen5 do not support MSAA */
assert(info->samples >= 1); assert(info->samples >= 1);
@@ -38,12 +38,12 @@ gen4_choose_msaa_layout(const struct isl_device *dev,
} }
void void
gen4_choose_image_alignment_el(const struct isl_device *dev, isl_gen4_choose_image_alignment_el(const struct isl_device *dev,
const struct isl_surf_init_info *restrict info, const struct isl_surf_init_info *restrict info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_dim_layout dim_layout, enum isl_dim_layout dim_layout,
enum isl_msaa_layout msaa_layout, enum isl_msaa_layout msaa_layout,
struct isl_extent3d *image_align_el) struct isl_extent3d *image_align_el)
{ {
assert(info->samples == 1); assert(info->samples == 1);
assert(msaa_layout == ISL_MSAA_LAYOUT_NONE); assert(msaa_layout == ISL_MSAA_LAYOUT_NONE);
src/intel/isl/isl_gen4.h
+10 -10
View File
@@ -30,18 +30,18 @@ extern "C" {
#endif #endif
bool bool
gen4_choose_msaa_layout(const struct isl_device *dev, isl_gen4_choose_msaa_layout(const struct isl_device *dev,
const struct isl_surf_init_info *info, const struct isl_surf_init_info *info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_msaa_layout *msaa_layout); enum isl_msaa_layout *msaa_layout);
void void
gen4_choose_image_alignment_el(const struct isl_device *dev, isl_gen4_choose_image_alignment_el(const struct isl_device *dev,
const struct isl_surf_init_info *restrict info, const struct isl_surf_init_info *restrict info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_dim_layout dim_layout, enum isl_dim_layout dim_layout,
enum isl_msaa_layout msaa_layout, enum isl_msaa_layout msaa_layout,
struct isl_extent3d *image_align_el); struct isl_extent3d *image_align_el);
#ifdef __cplusplus #ifdef __cplusplus
} }
src/intel/isl/isl_gen6.c
+10 -10
View File
@@ -25,10 +25,10 @@
#include "isl_priv.h" #include "isl_priv.h"
bool bool
gen6_choose_msaa_layout(const struct isl_device *dev, isl_gen6_choose_msaa_layout(const struct isl_device *dev,
const struct isl_surf_init_info *info, const struct isl_surf_init_info *info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_msaa_layout *msaa_layout) enum isl_msaa_layout *msaa_layout)
{ {
assert(ISL_DEV_GEN(dev) == 6); assert(ISL_DEV_GEN(dev) == 6);
assert(info->samples >= 1); assert(info->samples >= 1);
@@ -66,12 +66,12 @@ gen6_choose_msaa_layout(const struct isl_device *dev,
} }
void void
gen6_choose_image_alignment_el(const struct isl_device *dev, isl_gen6_choose_image_alignment_el(const struct isl_device *dev,
const struct isl_surf_init_info *restrict info, const struct isl_surf_init_info *restrict info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_dim_layout dim_layout, enum isl_dim_layout dim_layout,
enum isl_msaa_layout msaa_layout, enum isl_msaa_layout msaa_layout,
struct isl_extent3d *image_align_el) struct isl_extent3d *image_align_el)
{ {
/* Handled by isl_choose_image_alignment_el */ /* Handled by isl_choose_image_alignment_el */
assert(info->format != ISL_FORMAT_HIZ); assert(info->format != ISL_FORMAT_HIZ);
src/intel/isl/isl_gen6.h
+10 -10
View File
@@ -30,18 +30,18 @@ extern "C" {
#endif #endif
bool bool
gen6_choose_msaa_layout(const struct isl_device *dev, isl_gen6_choose_msaa_layout(const struct isl_device *dev,
const struct isl_surf_init_info *info, const struct isl_surf_init_info *info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_msaa_layout *msaa_layout); enum isl_msaa_layout *msaa_layout);
void void
gen6_choose_image_alignment_el(const struct isl_device *dev, isl_gen6_choose_image_alignment_el(const struct isl_device *dev,
const struct isl_surf_init_info *restrict info, const struct isl_surf_init_info *restrict info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_dim_layout dim_layout, enum isl_dim_layout dim_layout,
enum isl_msaa_layout msaa_layout, enum isl_msaa_layout msaa_layout,
struct isl_extent3d *image_align_el); struct isl_extent3d *image_align_el);
#ifdef __cplusplus #ifdef __cplusplus
} }
src/intel/isl/isl_gen7.c
+13 -13
View File
@@ -25,10 +25,10 @@
#include "isl_priv.h" #include "isl_priv.h"
bool bool
gen7_choose_msaa_layout(const struct isl_device *dev, isl_gen7_choose_msaa_layout(const struct isl_device *dev,
const struct isl_surf_init_info *info, const struct isl_surf_init_info *info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_msaa_layout *msaa_layout) enum isl_msaa_layout *msaa_layout)
{ {
bool require_array = false; bool require_array = false;
bool require_interleaved = false; bool require_interleaved = false;
@@ -184,9 +184,9 @@ gen7_format_needs_valign2(const struct isl_device *dev,
* flags except ISL_TILING_X_BIT and ISL_TILING_LINEAR_BIT. * flags except ISL_TILING_X_BIT and ISL_TILING_LINEAR_BIT.
*/ */
void void
gen6_filter_tiling(const struct isl_device *dev, isl_gen6_filter_tiling(const struct isl_device *dev,
const struct isl_surf_init_info *restrict info, const struct isl_surf_init_info *restrict info,
isl_tiling_flags_t *flags) isl_tiling_flags_t *flags)
{ {
/* IVB+ requires separate stencil */ /* IVB+ requires separate stencil */
assert(ISL_DEV_USE_SEPARATE_STENCIL(dev)); assert(ISL_DEV_USE_SEPARATE_STENCIL(dev));
@@ -384,12 +384,12 @@ gen7_choose_valign_el(const struct isl_device *dev,
} }
void void
gen7_choose_image_alignment_el(const struct isl_device *dev, isl_gen7_choose_image_alignment_el(const struct isl_device *dev,
const struct isl_surf_init_info *restrict info, const struct isl_surf_init_info *restrict info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_dim_layout dim_layout, enum isl_dim_layout dim_layout,
enum isl_msaa_layout msaa_layout, enum isl_msaa_layout msaa_layout,
struct isl_extent3d *image_align_el) struct isl_extent3d *image_align_el)
{ {
/* Handled by isl_choose_image_alignment_el */ /* Handled by isl_choose_image_alignment_el */
assert(info->format != ISL_FORMAT_HIZ); assert(info->format != ISL_FORMAT_HIZ);
src/intel/isl/isl_gen7.h
+13 -13
View File
@@ -30,23 +30,23 @@ extern "C" {
#endif #endif
void void
gen6_filter_tiling(const struct isl_device *dev, isl_gen6_filter_tiling(const struct isl_device *dev,
const struct isl_surf_init_info *restrict info, const struct isl_surf_init_info *restrict info,
isl_tiling_flags_t *flags); isl_tiling_flags_t *flags);
bool bool
gen7_choose_msaa_layout(const struct isl_device *dev, isl_gen7_choose_msaa_layout(const struct isl_device *dev,
const struct isl_surf_init_info *info, const struct isl_surf_init_info *info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_msaa_layout *msaa_layout); enum isl_msaa_layout *msaa_layout);
void void
gen7_choose_image_alignment_el(const struct isl_device *dev, isl_gen7_choose_image_alignment_el(const struct isl_device *dev,
const struct isl_surf_init_info *restrict info, const struct isl_surf_init_info *restrict info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_dim_layout dim_layout, enum isl_dim_layout dim_layout,
enum isl_msaa_layout msaa_layout, enum isl_msaa_layout msaa_layout,
struct isl_extent3d *image_align_el); struct isl_extent3d *image_align_el);
#ifdef __cplusplus #ifdef __cplusplus
} }
src/intel/isl/isl_gen8.c
+10 -10
View File
@@ -25,10 +25,10 @@
#include "isl_priv.h" #include "isl_priv.h"
bool bool
gen8_choose_msaa_layout(const struct isl_device *dev, isl_gen8_choose_msaa_layout(const struct isl_device *dev,
const struct isl_surf_init_info *info, const struct isl_surf_init_info *info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_msaa_layout *msaa_layout) enum isl_msaa_layout *msaa_layout)
{ {
bool require_array = false; bool require_array = false;
bool require_interleaved = false; bool require_interleaved = false;
@@ -180,12 +180,12 @@ gen8_choose_valign_el(const struct isl_device *dev,
} }
void void
gen8_choose_image_alignment_el(const struct isl_device *dev, isl_gen8_choose_image_alignment_el(const struct isl_device *dev,
const struct isl_surf_init_info *restrict info, const struct isl_surf_init_info *restrict info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_dim_layout dim_layout, enum isl_dim_layout dim_layout,
enum isl_msaa_layout msaa_layout, enum isl_msaa_layout msaa_layout,
struct isl_extent3d *image_align_el) struct isl_extent3d *image_align_el)
{ {
/* Handled by isl_choose_image_alignment_el */ /* Handled by isl_choose_image_alignment_el */
assert(info->format != ISL_FORMAT_HIZ); assert(info->format != ISL_FORMAT_HIZ);
src/intel/isl/isl_gen8.h
+10 -10
View File
@@ -30,18 +30,18 @@ extern "C" {
#endif #endif
bool bool
gen8_choose_msaa_layout(const struct isl_device *dev, isl_gen8_choose_msaa_layout(const struct isl_device *dev,
const struct isl_surf_init_info *info, const struct isl_surf_init_info *info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_msaa_layout *msaa_layout); enum isl_msaa_layout *msaa_layout);
void void
gen8_choose_image_alignment_el(const struct isl_device *dev, isl_gen8_choose_image_alignment_el(const struct isl_device *dev,
const struct isl_surf_init_info *restrict info, const struct isl_surf_init_info *restrict info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_dim_layout dim_layout, enum isl_dim_layout dim_layout,
enum isl_msaa_layout msaa_layout, enum isl_msaa_layout msaa_layout,
struct isl_extent3d *image_align_el); struct isl_extent3d *image_align_el);
#ifdef __cplusplus #ifdef __cplusplus
} }
src/intel/isl/isl_gen9.c
+8 -8
View File
@@ -97,12 +97,12 @@ gen9_calc_std_image_alignment_sa(const struct isl_device *dev,
} }
void void
gen9_choose_image_alignment_el(const struct isl_device *dev, isl_gen9_choose_image_alignment_el(const struct isl_device *dev,
const struct isl_surf_init_info *restrict info, const struct isl_surf_init_info *restrict info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_dim_layout dim_layout, enum isl_dim_layout dim_layout,
enum isl_msaa_layout msaa_layout, enum isl_msaa_layout msaa_layout,
struct isl_extent3d *image_align_el) struct isl_extent3d *image_align_el)
{ {
/* Handled by isl_choose_image_alignment_el */ /* Handled by isl_choose_image_alignment_el */
assert(info->format != ISL_FORMAT_HIZ); assert(info->format != ISL_FORMAT_HIZ);
@@ -196,6 +196,6 @@ gen9_choose_image_alignment_el(const struct isl_device *dev,
return; return;
} }
gen8_choose_image_alignment_el(dev, info, tiling, dim_layout, isl_gen8_choose_image_alignment_el(dev, info, tiling, dim_layout,
msaa_layout, image_align_el); msaa_layout, image_align_el);
} }
src/intel/isl/isl_gen9.h
+6 -6
View File
@@ -30,12 +30,12 @@ extern "C" {
#endif #endif
void void
gen9_choose_image_alignment_el(const struct isl_device *dev, isl_gen9_choose_image_alignment_el(const struct isl_device *dev,
const struct isl_surf_init_info *restrict info, const struct isl_surf_init_info *restrict info,
enum isl_tiling tiling, enum isl_tiling tiling,
enum isl_dim_layout dim_layout, enum isl_dim_layout dim_layout,
enum isl_msaa_layout msaa_layout, enum isl_msaa_layout msaa_layout,
struct isl_extent3d *image_align_el); struct isl_extent3d *image_align_el);
#ifdef __cplusplus #ifdef __cplusplus
} }