[Mesa-dev] [PATCH 3/3] intel: Merge identical cases in switch statement.

[Brian Paul]

On 08/25/2010 07:14 AM, Nick Bowler wrote:
> Signed-off-by: Nick Bowler<nbowler at draconx.ca>
> ---
>   src/mesa/drivers/dri/intel/intel_fbo.c |   16 +++++-----------
>   1 files changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
> index 4a83886..2fdb6e4 100644
> --- a/src/mesa/drivers/dri/intel/intel_fbo.c
> +++ b/src/mesa/drivers/dri/intel/intel_fbo.c
> @@ -137,27 +137,21 @@ intel_alloc_renderbuffer_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
>         rb->Format = MESA_FORMAT_A8;
>         rb->DataType = GL_UNSIGNED_BYTE;
>         break;
> +   case GL_DEPTH_COMPONENT16:
> +      rb->Format = MESA_FORMAT_Z16;
> +      rb->DataType = GL_UNSIGNED_SHORT;
> +      break;
>      case GL_STENCIL_INDEX:
>      case GL_STENCIL_INDEX1_EXT:
>      case GL_STENCIL_INDEX4_EXT:
>      case GL_STENCIL_INDEX8_EXT:
>      case GL_STENCIL_INDEX16_EXT:
> -      /* alloc a depth+stencil buffer */
> -      rb->Format = MESA_FORMAT_S8_Z24;
> -      rb->DataType = GL_UNSIGNED_INT_24_8_EXT;
> -      break;
> -   case GL_DEPTH_COMPONENT16:
> -      rb->Format = MESA_FORMAT_Z16;
> -      rb->DataType = GL_UNSIGNED_SHORT;
> -      break;
>      case GL_DEPTH_COMPONENT:
>      case GL_DEPTH_COMPONENT24:
>      case GL_DEPTH_COMPONENT32:
> -      rb->Format = MESA_FORMAT_S8_Z24;
> -      rb->DataType = GL_UNSIGNED_INT_24_8_EXT;
> -      break;
>      case GL_DEPTH_STENCIL_EXT:
>      case GL_DEPTH24_STENCIL8_EXT:
> +      /* alloc a depth+stencil buffer */
>         rb->Format = MESA_FORMAT_S8_Z24;
>         rb->DataType = GL_UNSIGNED_INT_24_8_EXT;
>         break;

Committed.  Thanks.

-Brian