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/blorp | |
| 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/blorp')
| -rw-r--r-- | src/intel/blorp/blorp_genX_exec.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h index 7182399c9c2..1348659233c 100644 --- a/src/intel/blorp/blorp_genX_exec.h +++ b/src/intel/blorp/blorp_genX_exec.h @@ -390,7 +390,7 @@ blorp_emit_vertex_elements(struct blorp_batch *batch, ve[slot] = (struct GENX(VERTEX_ELEMENT_STATE)) { .VertexBufferIndex = 1, .Valid = true, - .SourceElementFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_R32G32B32A32_FLOAT, + .SourceElementFormat = ISL_FORMAT_R32G32B32A32_FLOAT, .SourceElementOffset = 0, .Component0Control = VFCOMP_STORE_SRC, @@ -422,7 +422,7 @@ blorp_emit_vertex_elements(struct blorp_batch *batch, ve[slot] = (struct GENX(VERTEX_ELEMENT_STATE)) { .VertexBufferIndex = 0, .Valid = true, - .SourceElementFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_R32G32B32_FLOAT, + .SourceElementFormat = ISL_FORMAT_R32G32B32_FLOAT, .SourceElementOffset = 0, .Component0Control = VFCOMP_STORE_SRC, .Component1Control = VFCOMP_STORE_SRC, @@ -436,7 +436,7 @@ blorp_emit_vertex_elements(struct blorp_batch *batch, ve[slot] = (struct GENX(VERTEX_ELEMENT_STATE)) { .VertexBufferIndex = 0, .Valid = true, - .SourceElementFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_R32G32B32_FLOAT, + .SourceElementFormat = ISL_FORMAT_R32G32B32_FLOAT, .SourceElementOffset = 0, .Component0Control = VFCOMP_STORE_SRC, .Component1Control = VFCOMP_STORE_SRC, @@ -461,13 +461,13 @@ blorp_emit_vertex_elements(struct blorp_batch *batch, .SourceElementOffset = 0, .Component0Control = VFCOMP_STORE_SRC, #if GEN_GEN >= 9 - .SourceElementFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_R32G32B32A32_FLOAT, + .SourceElementFormat = ISL_FORMAT_R32G32B32A32_FLOAT, .Component1Control = VFCOMP_STORE_SRC, .Component2Control = VFCOMP_STORE_SRC, .Component3Control = VFCOMP_STORE_SRC, #else /* Clear colors on gen7-8 are for bits out of one dword */ - .SourceElementFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_R32_FLOAT, + .SourceElementFormat = ISL_FORMAT_R32_FLOAT, .Component1Control = VFCOMP_STORE_0, .Component2Control = VFCOMP_STORE_0, .Component3Control = VFCOMP_STORE_0, @@ -479,7 +479,7 @@ blorp_emit_vertex_elements(struct blorp_batch *batch, ve[slot] = (struct GENX(VERTEX_ELEMENT_STATE)) { .VertexBufferIndex = 1, .Valid = true, - .SourceElementFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_R32G32B32A32_FLOAT, + .SourceElementFormat = ISL_FORMAT_R32G32B32A32_FLOAT, .SourceElementOffset = 16 + i * 4 * sizeof(float), .Component0Control = VFCOMP_STORE_SRC, .Component1Control = VFCOMP_STORE_SRC, @@ -1356,7 +1356,7 @@ blorp_emit_null_surface_state(struct blorp_batch *batch, { struct GENX(RENDER_SURFACE_STATE) ss = { .SurfaceType = SURFTYPE_NULL, - .SurfaceFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_R8G8B8A8_UNORM, + .SurfaceFormat = ISL_FORMAT_R8G8B8A8_UNORM, .Width = surface->surf.logical_level0_px.width - 1, .Height = surface->surf.logical_level0_px.height - 1, .MIPCountLOD = surface->view.base_level, |