[Mesa-dev] [PATCH 12/38] main: Fix indents in former get_texture_for_framebuffer functions.

Fredrik Höglund fredrik at kde.org
Sun Apr 12 08:40:50 PDT 2015


This patch is:

Reviewed-by: Fredrik Höglund <fredrik at kde.org>

On Wednesday 04 March 2015, Laura Ekstrand wrote:
> ---
>  src/mesa/main/fbobject.c | 82 ++++++++++++++++++++++++------------------------
>  1 file changed, 41 insertions(+), 41 deletions(-)
> 
> diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
> index 4df0b6b..1435576 100644
> --- a/src/mesa/main/fbobject.c
> +++ b/src/mesa/main/fbobject.c
> @@ -2469,32 +2469,32 @@ check_layered_texture_target(struct gl_context *ctx, GLenum target,
>  {
>     *layered = true;
>  
> -         switch (target) {
> -         case GL_TEXTURE_3D:
> -         case GL_TEXTURE_1D_ARRAY_EXT:
> -         case GL_TEXTURE_2D_ARRAY_EXT:
> -         case GL_TEXTURE_CUBE_MAP:
> -         case GL_TEXTURE_CUBE_MAP_ARRAY:
> -         case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> -            return true;
> -         case GL_TEXTURE_1D:
> -         case GL_TEXTURE_2D:
> -         case GL_TEXTURE_RECTANGLE:
> -         case GL_TEXTURE_2D_MULTISAMPLE:
> -            /* These texture types are valid to pass to
> -             * glFramebufferTexture(), but since they aren't layered, it
> -             * is equivalent to calling glFramebufferTexture{1D,2D}().
> -             *
> -             * textarget can remain 0 since CUBE MAP is not valid here.
> -             */
> -            *layered = false;
> -            return true;
> -         }
> +   switch (target) {
> +   case GL_TEXTURE_3D:
> +   case GL_TEXTURE_1D_ARRAY_EXT:
> +   case GL_TEXTURE_2D_ARRAY_EXT:
> +   case GL_TEXTURE_CUBE_MAP:
> +   case GL_TEXTURE_CUBE_MAP_ARRAY:
> +   case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> +      return true;
> +   case GL_TEXTURE_1D:
> +   case GL_TEXTURE_2D:
> +   case GL_TEXTURE_RECTANGLE:
> +   case GL_TEXTURE_2D_MULTISAMPLE:
> +      /* These texture types are valid to pass to
> +       * glFramebufferTexture(), but since they aren't layered, it
> +       * is equivalent to calling glFramebufferTexture{1D,2D}().
> +       *
> +       * textarget can remain 0 since CUBE MAP is not valid here.
> +       */
> +      *layered = false;
> +      return true;
> +   }
>  
> -      _mesa_error(ctx, GL_INVALID_OPERATION,
> -                  "%s(invalid texture target %s)", caller,
> -                  _mesa_lookup_enum_by_nr(target));
> -      return false;
> +   _mesa_error(ctx, GL_INVALID_OPERATION,
> +               "%s(invalid texture target %s)", caller,
> +               _mesa_lookup_enum_by_nr(target));
> +   return false;
>  }
>  
>  /**
> @@ -2507,23 +2507,23 @@ static bool
>  check_texture_target(struct gl_context *ctx, GLenum target,
>                       const char *caller)
>  {
> -         /* We're being called by glFramebufferTextureLayer() and
> -          * textarget is not used.  The only legal texture types for
> -          * that function are 3D and 1D/2D arrays textures.
> -          */
> -         switch (target) {
> -         case GL_TEXTURE_3D:
> -         case GL_TEXTURE_1D_ARRAY_EXT:
> -         case GL_TEXTURE_2D_ARRAY_EXT:
> -         case GL_TEXTURE_CUBE_MAP_ARRAY:
> -         case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> -            return true;
> -         }
> +   /* We're being called by glFramebufferTextureLayer() and
> +    * textarget is not used.  The only legal texture types for
> +    * that function are 3D and 1D/2D arrays textures.
> +    */
> +   switch (target) {
> +   case GL_TEXTURE_3D:
> +   case GL_TEXTURE_1D_ARRAY_EXT:
> +   case GL_TEXTURE_2D_ARRAY_EXT:
> +   case GL_TEXTURE_CUBE_MAP_ARRAY:
> +   case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> +      return true;
> +   }
>  
> -      _mesa_error(ctx, GL_INVALID_OPERATION,
> -                  "%s(invalid texture target %s)", caller,
> -                  _mesa_lookup_enum_by_nr(target));
> -      return false;
> +   _mesa_error(ctx, GL_INVALID_OPERATION,
> +               "%s(invalid texture target %s)", caller,
> +               _mesa_lookup_enum_by_nr(target));
> +   return false;
>  }
>  
>  /**
> 



More information about the mesa-dev mailing list