diff options
| author | Chad Versace <[email protected]> | 2017-05-26 18:33:21 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2017-06-01 12:41:24 -0700 |
| commit | de69002faa71de12a46234da5fbeaf6a5afe4904 (patch) | |
| tree | 42db01f907c4985e3c7d07e24b45dd598ea588a3 | |
| parent | 77e3c836f893d42a609a22bf32a63174ff948070 (diff) | |
i965: Fix return type of translate_tex_format()
It returns an isl_format, not GLuint BRW_FORMAT. I updated every
translate_tex_format() found by git-grep.
No change in behavior.
Reviewed-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state.h | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_surface_formats.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h index cb341f052e5..cbfb8e775e4 100644 --- a/src/mesa/drivers/dri/i965/brw_state.h +++ b/src/mesa/drivers/dri/i965/brw_state.h @@ -209,9 +209,9 @@ enum isl_format brw_isl_format_for_mesa_format(mesa_format mesa_format); GLuint translate_tex_target(GLenum target); -GLuint translate_tex_format(struct brw_context *brw, - mesa_format mesa_format, - GLenum srgb_decode); +enum isl_format translate_tex_format(struct brw_context *brw, + mesa_format mesa_format, + GLenum srgb_decode); int brw_get_texture_swizzle(const struct gl_context *ctx, const struct gl_texture_object *t); diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c index f482f22703f..155146cb92c 100644 --- a/src/mesa/drivers/dri/i965/brw_surface_formats.c +++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c @@ -513,7 +513,7 @@ brw_render_target_supported(struct brw_context *brw, return brw->format_supported_as_render_target[format]; } -GLuint +enum isl_format translate_tex_format(struct brw_context *brw, mesa_format mesa_format, GLenum srgb_decode) diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 42c50780eb3..1a92424b5dd 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -557,8 +557,8 @@ brw_update_texture_surface(struct gl_context *ctx, brw_get_texture_swizzle(&brw->ctx, obj)); mesa_format mesa_fmt = plane == 0 ? intel_obj->_Format : mt->format; - unsigned format = translate_tex_format(brw, mesa_fmt, - sampler->sRGBDecode); + enum isl_format format = translate_tex_format(brw, mesa_fmt, + sampler->sRGBDecode); /* Implement gen6 and gen7 gather work-around */ bool need_green_to_blue = false; |