[Mesa-dev] [PATCH] st/mesa: set the correct window renderbuffer internal format

[Brian Paul]

On 07/21/2012 05:37 PM, Marek Olšák wrote:
> The multisample-resolve blit relies on this being correct.
> ---
>   src/mesa/state_tracker/st_cb_fbo.c |   10 +++++++++-
>   1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
> index e1818ab..7eef5c6 100644
> --- a/src/mesa/state_tracker/st_cb_fbo.c
> +++ b/src/mesa/state_tracker/st_cb_fbo.c
> @@ -291,13 +291,21 @@ st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)
>      case PIPE_FORMAT_R8G8B8A8_UNORM:
>      case PIPE_FORMAT_B8G8R8A8_UNORM:
>      case PIPE_FORMAT_A8R8G8B8_UNORM:
> +      strb->Base.InternalFormat = GL_RGBA8;
> +      break;
>      case PIPE_FORMAT_R8G8B8X8_UNORM:
>      case PIPE_FORMAT_B8G8R8X8_UNORM:
>      case PIPE_FORMAT_X8R8G8B8_UNORM:
> +      strb->Base.InternalFormat = GL_RGB8;
> +      break;
>      case PIPE_FORMAT_B5G5R5A1_UNORM:
> +      strb->Base.InternalFormat = GL_RGB5_A1;
> +      break;
>      case PIPE_FORMAT_B4G4R4A4_UNORM:
> +      strb->Base.InternalFormat = GL_RGBA4;
> +      break;
>      case PIPE_FORMAT_B5G6R5_UNORM:
> -      strb->Base.InternalFormat = GL_RGBA;
> +      strb->Base.InternalFormat = GL_RGB565;
>         break;
>      case PIPE_FORMAT_Z16_UNORM:
>         strb->Base.InternalFormat = GL_DEPTH_COMPONENT16;


Reviewed-by: Brian Paul <brianp at vmware.com>