On Sun, Aug 14, 2016 at 11:09 AM, Ilia Mirkin <[email protected]> wrote:
> Signed-off-by: Ilia Mirkin <[email protected]> > Cc: "11.2 12.0" <[email protected]> > --- > src/gallium/auxiliary/Makefile.sources | 3 +- > src/gallium/auxiliary/util/u_viewport.h | 59 > +++++++++++++++++++++++++++++++++ > 2 files changed, 61 insertions(+), 1 deletion(-) > create mode 100644 src/gallium/auxiliary/util/u_viewport.h > > diff --git a/src/gallium/auxiliary/Makefile.sources > b/src/gallium/auxiliary/Makefile.sources > index 586f057..2a4919b 100644 > --- a/src/gallium/auxiliary/Makefile.sources > +++ b/src/gallium/auxiliary/Makefile.sources > @@ -309,7 +309,8 @@ C_SOURCES := \ > util/u_upload_mgr.h \ > util/u_vbuf.c \ > util/u_vbuf.h \ > - util/u_video.h > + util/u_video.h \ > + util/u_viewport.h > > NIR_SOURCES := \ > nir/tgsi_to_nir.c \ > diff --git a/src/gallium/auxiliary/util/u_viewport.h > b/src/gallium/auxiliary/util/u_viewport.h > new file mode 100644 > index 0000000..a731b34 > --- /dev/null > +++ b/src/gallium/auxiliary/util/u_viewport.h > @@ -0,0 +1,59 @@ > +/********************************************************** > **************** > + * > + * Copyright 2016 Ilia Mirkin. > + * All Rights Reserved. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the > + * "Software"), to deal in the Software without restriction, including > + * without limitation the rights to use, copy, modify, merge, publish, > + * distribute, sub license, and/or sell copies of the Software, and to > + * permit persons to whom the Software is furnished to do so, subject to > + * the following conditions: > + * > + * The above copyright notice and this permission notice (including the > + * next paragraph) shall be included in all copies or substantial portions > + * of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS > + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. > + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR > + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF > CONTRACT, > + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE > + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > + * > + ************************************************************ > **************/ > + > +#ifndef U_VIEWPORT_H > +#define U_VIEWPORT_H > + > +#include "c99_compat.h" > +#include "pipe/p_state.h" > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +static inline void > +util_viewport_zmin_zmax(const struct pipe_viewport_state *vp, bool halfz, > + float *zmin, float *zmax) > +{ > + float a, b; > + if (halfz) { > + a = vp->translate[2]; > + b = vp->translate[2] + vp->scale[2]; > + } else { > + a = vp->translate[2] - vp->scale[2]; > + b = vp->translate[2] + vp->scale[2]; > + } > + > + *zmin = a < b ? a : b; > + *zmax = a < b ? b : a; > or, *zmin = MIN2(a, b); *zmax = MAX2(a, b); -Brian > +} > + > +#ifdef __cplusplus > +} > +#endif > + > +#endif > -- > 2.7.3 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
