From 09fe35b450ed15b3cfc956304e96723b4c600ad8 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sun, 26 Jun 2016 13:56:42 -0400 Subject: gallium: un-inline pipe_surface_desc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Want to re-use this struct, so un-inline it. Signed-off-by: Rob Clark Reviewed-by: Marek Olšák --- src/gallium/include/pipe/p_state.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index f4bee38a195..ad7bf0f88db 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -387,6 +387,17 @@ struct pipe_sampler_state union pipe_color_union border_color; }; +union pipe_surface_desc { + struct { + unsigned level; + unsigned first_layer:16; + unsigned last_layer:16; + } tex; + struct { + unsigned first_element; + unsigned last_element; + } buf; +}; /** * A view into a texture that can be bound to a color render target / @@ -405,17 +416,7 @@ struct pipe_surface unsigned writable:1; /**< writable shader resource */ - union { - struct { - unsigned level; - unsigned first_layer:16; - unsigned last_layer:16; - } tex; - struct { - unsigned first_element; - unsigned last_element; - } buf; - } u; + union pipe_surface_desc u; }; -- cgit v1.2.3