diff options
| author | Kenneth Graunke <[email protected]> | 2018-02-13 18:13:51 -0800 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2018-03-05 09:51:08 -0800 |
| commit | 0472aa3efe325ba53dc25a20a541f18d30d31b0c (patch) | |
| tree | 93e9ed9c3a682a797b34522af56ec76c89b604e1 /src/intel/isl/isl_surface_state.c | |
| parent | 755e7e6c20b8778bd5becb516c437f44c7b37984 (diff) | |
intel: Drop SURFACE_FORMAT enum from genxml.
We want people to be using ISL_FORMAT_*, rather than the genxml format
enumerations. This patch drops 10 separate copies, and drops a bunch
of ugly casting.
Reviewed-by: Jordan Justen <[email protected]>
[[email protected]: Minor changes for rebase]
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
Diffstat (limited to 'src/intel/isl/isl_surface_state.c')
| -rw-r--r-- | src/intel/isl/isl_surface_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c index 1f729f89f4f..32a5429f2bf 100644 --- a/src/intel/isl/isl_surface_state.c +++ b/src/intel/isl/isl_surface_state.c @@ -270,7 +270,7 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state, assert(surf_fmtl->bh == view_fmtl->bh); } - s.SurfaceFormat = (enum GENX(SURFACE_FORMAT)) info->view->format; + s.SurfaceFormat = info->view->format; #if GEN_GEN <= 5 s.ColorBufferComponentWriteDisables = info->write_disables; @@ -718,7 +718,7 @@ isl_genX(buffer_fill_state_s)(void *state, struct GENX(RENDER_SURFACE_STATE) s = { 0, }; s.SurfaceType = SURFTYPE_BUFFER; - s.SurfaceFormat = (enum GENX(SURFACE_FORMAT)) info->format; + s.SurfaceFormat = info->format; #if GEN_GEN >= 6 s.SurfaceVerticalAlignment = isl_to_gen_valign[4]; @@ -776,7 +776,7 @@ isl_genX(null_fill_state)(void *state, struct isl_extent3d size) { struct GENX(RENDER_SURFACE_STATE) s = { .SurfaceType = SURFTYPE_NULL, - .SurfaceFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_B8G8R8A8_UNORM, + .SurfaceFormat = ISL_FORMAT_B8G8R8A8_UNORM, #if GEN_GEN >= 7 .SurfaceArray = size.depth > 0, #endif |