[Mesa-dev] [PATCH] st/mesa: implement depth texture modes

[Brian Paul]

On 07/19/2010 02:53 PM, Marek Olšák wrote:
> Hi,
>
> the attached patch implements depth texture modes which have been
> missing in st/mesa since ever. It works with both software pipes and
> r300g, so it should be ok.
>
> Please review.

Comments below.


>
> -Marek

> 0001-st-mesa-implement-depth-texture-modes.patch
>
> From 209f91d0f74279cea42bf6f34b39720f5052e1fb Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <maraeo at gmail.com>
> Date: Mon, 19 Jul 2010 20:46:15 +0200
> Subject: [PATCH] st/mesa: implement depth texture modes
>
> ---
>  src/mesa/state_tracker/st_atom_texture.c |   67 ++++++++++++++++++++++++++---
>  1 files changed, 60 insertions(+), 7 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
> index 5a650b3..86ded95 100644
> --- a/src/mesa/state_tracker/st_atom_texture.c
> +++ b/src/mesa/state_tracker/st_atom_texture.c
> @@ -41,12 +41,59 @@
>  #include "st_format.h"
>  #include "st_cb_texture.h"
>  #include "pipe/p_context.h"
> +#include "util/u_format.h"
>  #include "util/u_inlines.h"
>  #include "cso_cache/cso_context.h"
>

Please put a comment on this function explaining what it does.


> +static uint32_t apply_depthmode(enum pipe_format format,
> +                                uint32_t _swizzle, uint32_t depthmode)

Let's change "uint32_t _swizzle" to "GLuint swizzle".
'depthmode' should be a GLenum.


> +{
> +   const struct util_format_description *desc =
> +         util_format_description(format);
> +   unsigned char swiz[4];
> +   unsigned i;
> +
> +   if (desc->colorspace != UTIL_FORMAT_COLORSPACE_ZS ||
> +       desc->swizzle[0] == UTIL_FORMAT_SWIZZLE_NONE) {
> +      /* Not a depth format. */
> +      return _swizzle;
> +   }
> +
> +   for (i = 0; i < 4; i++)
> +      swiz[i] = GET_SWZ(_swizzle, i);
> +
> +   switch (depthmode) {
> +      case GL_LUMINANCE:
> +         for (i = 0; i < 4; i++)
> +            if (swiz[i] == SWIZZLE_W)
> +               swiz[i] = SWIZZLE_ONE;
> +            else if (swiz[i] < SWIZZLE_W)
> +               swiz[i] = SWIZZLE_X;
> +         break;
> +
> +      case GL_INTENSITY:
> +         for (i = 0; i < 4; i++)
> +            if (swiz[i] <= SWIZZLE_W)
> +               swiz[i] = SWIZZLE_X;
> +         break;
> +
> +      case GL_ALPHA:
> +         for (i = 0; i < 4; i++)
> +            if (swiz[i] == SWIZZLE_W)
> +               swiz[i] = SWIZZLE_X;
> +            else if (swiz[i] < SWIZZLE_W)
> +               swiz[i] = SWIZZLE_ZERO;
> +         break;
> +   }
> +
> +   return MAKE_SWIZZLE4(swiz[0], swiz[1], swiz[2], swiz[3]);
> +}
> +


We should have a comment on this function too (though I know you 
didn't write it).


>  static boolean check_sampler_swizzle(struct pipe_sampler_view *sv,
> -				   uint32_t _swizzle)
> +                                     uint32_t _swizzle, uint32_t depthmode)

Let's fix _swizzle and depthmode as above here too.


>  {
> +   _swizzle = apply_depthmode(sv->texture->format, _swizzle, depthmode);
> +
>     if ((sv->swizzle_r != GET_SWZ(_swizzle, 0)) ||
>         (sv->swizzle_g != GET_SWZ(_swizzle, 1)) ||
>         (sv->swizzle_b != GET_SWZ(_swizzle, 2)) ||
> @@ -62,16 +109,19 @@ st_create_texture_sampler_view_from_stobj(struct pipe_context *pipe,
>  					
>  {
>     struct pipe_sampler_view templ;
> +   uint32_t _swizzle = apply_depthmode(stObj->pt->format,
> +                                       stObj->base._Swizzle,
> +                                       stObj->base.DepthMode);
>
>     u_sampler_view_default_template(&templ,
>                                     stObj->pt,
>                                     format);
>
> -   if (stObj->base._Swizzle != SWIZZLE_NOOP) {
> -      templ.swizzle_r = GET_SWZ(stObj->base._Swizzle, 0);
> -      templ.swizzle_g = GET_SWZ(stObj->base._Swizzle, 1);
> -      templ.swizzle_b = GET_SWZ(stObj->base._Swizzle, 2);
> -      templ.swizzle_a = GET_SWZ(stObj->base._Swizzle, 3);
> +   if (_swizzle != SWIZZLE_NOOP) {
> +      templ.swizzle_r = GET_SWZ(_swizzle, 0);
> +      templ.swizzle_g = GET_SWZ(_swizzle, 1);
> +      templ.swizzle_b = GET_SWZ(_swizzle, 2);
> +      templ.swizzle_a = GET_SWZ(_swizzle, 3);
>     }
>
>     return pipe->create_sampler_view(pipe, stObj->pt, &templ);
> @@ -150,7 +200,10 @@ update_textures(struct st_context *st)
>
>  	 /* if sampler view has changed dereference it */
>  	 if (stObj->sampler_view)
> -	    if (check_sampler_swizzle(stObj->sampler_view, stObj->base._Swizzle) || (st_view_format != stObj->sampler_view->format))

Please break that long line into two sub-80-column lines.


> +            if (check_sampler_swizzle(stObj->sampler_view,
> +                                      stObj->base._Swizzle,
> +                                      stObj->base.DepthMode) ||
> +                (st_view_format != stObj->sampler_view->format))
>  	       pipe_sampler_view_reference(&stObj->sampler_view, NULL);
>
>           sampler_view = st_get_texture_sampler_view_from_stobj(stObj, pipe, st_view_format);
> --


Have you tested with all the piglit depth-tex-modes tests?  You should 
probably run all the piglit texture tests for that matter.

Thanks.

-Brian