diff options
| author | Matt Turner <mattst88@gmail.com> | 2017-08-25 20:09:10 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2017-08-29 15:20:57 -0700 |
| commit | 239bbdfaa231a167abfb19480f0a78fe9f663d69 (patch) | |
| tree | 30929bd9907d747fe6bc81731ff01fb5aea1d742 | |
| parent | dff75c7175d7a06cdeafa5c119f3749e84e2561b (diff) | |
i965: Explicitly cast between different enums
Fixes warnings like
warning: implicit conversion from enumeration type 'enum isl_format' to
different enumeration type 'enum GEN10_SURFACE_FORMAT'
[-Wenum-conversion]
.SourceElementFormat = ISL_FORMAT_R32_UINT,
^~~~~~~~~~~~~~~~~~~
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
| -rw-r--r-- | src/mesa/drivers/dri/i965/genX_state_upload.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c index 07553407102..eb370db0237 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c @@ -532,7 +532,7 @@ genX(emit_vertices)(struct brw_context *brw) 1 + GENX(VERTEX_ELEMENT_STATE_length)); struct GENX(VERTEX_ELEMENT_STATE) elem = { .Valid = true, - .SourceElementFormat = ISL_FORMAT_R32G32B32A32_FLOAT, + .SourceElementFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_R32G32B32A32_FLOAT, .Component0Control = VFCOMP_STORE_0, .Component1Control = VFCOMP_STORE_0, .Component2Control = VFCOMP_STORE_0, @@ -725,13 +725,13 @@ genX(emit_vertices)(struct brw_context *brw) if (vs_prog_data->uses_basevertex || vs_prog_data->uses_baseinstance) { elem_state.VertexBufferIndex = brw->vb.nr_buffers; - elem_state.SourceElementFormat = ISL_FORMAT_R32G32_UINT; + elem_state.SourceElementFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_R32G32_UINT; elem_state.Component0Control = VFCOMP_STORE_SRC; elem_state.Component1Control = VFCOMP_STORE_SRC; } #else elem_state.VertexBufferIndex = brw->vb.nr_buffers; - elem_state.SourceElementFormat = ISL_FORMAT_R32G32_UINT; + elem_state.SourceElementFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_R32G32_UINT; if (vs_prog_data->uses_basevertex) elem_state.Component0Control = VFCOMP_STORE_SRC; @@ -753,7 +753,7 @@ genX(emit_vertices)(struct brw_context *brw) struct GENX(VERTEX_ELEMENT_STATE) elem_state = { .Valid = true, .VertexBufferIndex = brw->vb.nr_buffers + 1, - .SourceElementFormat = ISL_FORMAT_R32_UINT, + .SourceElementFormat = (enum GENX(SURFACE_FORMAT)) ISL_FORMAT_R32_UINT, .Component0Control = VFCOMP_STORE_SRC, .Component1Control = VFCOMP_STORE_0, .Component2Control = VFCOMP_STORE_0, |