Reviewed-by: Marek Olšák <[email protected]> Marek
On Sun, Aug 30, 2015 at 12:41 PM, Dave Airlie <[email protected]> wrote: > From: Dave Airlie <[email protected]> > > This should avoid C++ fail including this header. > > Signed-off-by: Dave Airlie <[email protected]> > --- > src/gallium/drivers/r600/r600_pipe.h | 26 +------------------------- > src/gallium/drivers/r600/r600_state_common.c | 25 +++++++++++++++++++++++++ > 2 files changed, 26 insertions(+), 25 deletions(-) > > diff --git a/src/gallium/drivers/r600/r600_pipe.h > b/src/gallium/drivers/r600/r600_pipe.h > index c6483b0..65f33fa 100644 > --- a/src/gallium/drivers/r600/r600_pipe.h > +++ b/src/gallium/drivers/r600/r600_pipe.h > @@ -945,29 +945,5 @@ static inline bool r600_can_read_depth(struct > r600_texture *rtex) > #define V_028A6C_OUTPRIM_TYPE_LINESTRIP 1 > #define V_028A6C_OUTPRIM_TYPE_TRISTRIP 2 > > -static inline unsigned r600_conv_prim_to_gs_out(unsigned mode) > -{ > - static const int prim_conv[] = { > - [PIPE_PRIM_POINTS] = > V_028A6C_OUTPRIM_TYPE_POINTLIST, > - [PIPE_PRIM_LINES] = > V_028A6C_OUTPRIM_TYPE_LINESTRIP, > - [PIPE_PRIM_LINE_LOOP] = > V_028A6C_OUTPRIM_TYPE_LINESTRIP, > - [PIPE_PRIM_LINE_STRIP] = > V_028A6C_OUTPRIM_TYPE_LINESTRIP, > - [PIPE_PRIM_TRIANGLES] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > - [PIPE_PRIM_TRIANGLE_STRIP] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > - [PIPE_PRIM_TRIANGLE_FAN] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > - [PIPE_PRIM_QUADS] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > - [PIPE_PRIM_QUAD_STRIP] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > - [PIPE_PRIM_POLYGON] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > - [PIPE_PRIM_LINES_ADJACENCY] = > V_028A6C_OUTPRIM_TYPE_LINESTRIP, > - [PIPE_PRIM_LINE_STRIP_ADJACENCY] = > V_028A6C_OUTPRIM_TYPE_LINESTRIP, > - [PIPE_PRIM_TRIANGLES_ADJACENCY] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > - [PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > - [PIPE_PRIM_PATCHES] = > V_028A6C_OUTPRIM_TYPE_POINTLIST, > - [R600_PRIM_RECTANGLE_LIST] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP > - }; > - assert(mode < Elements(prim_conv)); > - > - return prim_conv[mode]; > -} > - > +unsigned r600_conv_prim_to_gs_out(unsigned mode); > #endif > diff --git a/src/gallium/drivers/r600/r600_state_common.c > b/src/gallium/drivers/r600/r600_state_common.c > index d9cf736..a650649 100644 > --- a/src/gallium/drivers/r600/r600_state_common.c > +++ b/src/gallium/drivers/r600/r600_state_common.c > @@ -124,6 +124,31 @@ static unsigned r600_conv_pipe_prim(unsigned prim) > return prim_conv[prim]; > } > > +unsigned r600_conv_prim_to_gs_out(unsigned mode) > +{ > + static const int prim_conv[] = { > + [PIPE_PRIM_POINTS] = > V_028A6C_OUTPRIM_TYPE_POINTLIST, > + [PIPE_PRIM_LINES] = > V_028A6C_OUTPRIM_TYPE_LINESTRIP, > + [PIPE_PRIM_LINE_LOOP] = > V_028A6C_OUTPRIM_TYPE_LINESTRIP, > + [PIPE_PRIM_LINE_STRIP] = > V_028A6C_OUTPRIM_TYPE_LINESTRIP, > + [PIPE_PRIM_TRIANGLES] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > + [PIPE_PRIM_TRIANGLE_STRIP] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > + [PIPE_PRIM_TRIANGLE_FAN] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > + [PIPE_PRIM_QUADS] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > + [PIPE_PRIM_QUAD_STRIP] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > + [PIPE_PRIM_POLYGON] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > + [PIPE_PRIM_LINES_ADJACENCY] = > V_028A6C_OUTPRIM_TYPE_LINESTRIP, > + [PIPE_PRIM_LINE_STRIP_ADJACENCY] = > V_028A6C_OUTPRIM_TYPE_LINESTRIP, > + [PIPE_PRIM_TRIANGLES_ADJACENCY] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > + [PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP, > + [PIPE_PRIM_PATCHES] = > V_028A6C_OUTPRIM_TYPE_POINTLIST, > + [R600_PRIM_RECTANGLE_LIST] = > V_028A6C_OUTPRIM_TYPE_TRISTRIP > + }; > + assert(mode < Elements(prim_conv)); > + > + return prim_conv[mode]; > +} > + > /* common state between evergreen and r600 */ > > static void r600_bind_blend_state_internal(struct r600_context *rctx, > -- > 2.4.3 > > _______________________________________________ > mesa-dev mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
