[Mesa-dev] [PATCH 2/3] mesa: Add support for OPTION ATI_draw_buffers to ARB_fp.

[Ian Romanick]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04/13/2011 12:27 PM, Eric Anholt wrote:
> Tested by piglit ati_draw_buffers-arbfp.
> ---
>  src/mesa/program/program_parse_extra.c |   12 +++++++++++-
>  1 files changed, 11 insertions(+), 1 deletions(-)
> 
> diff --git a/src/mesa/program/program_parse_extra.c b/src/mesa/program/program_parse_extra.c
> index ae98b78..9ade9be 100644
> --- a/src/mesa/program/program_parse_extra.c
> +++ b/src/mesa/program/program_parse_extra.c
> @@ -207,7 +207,7 @@ _mesa_ARBfp_parse_option(struct asm_parser_state *state, const char *option)
>  	 return 0;
>        } else if (strcmp(option, "draw_buffers") == 0) {
>  	 /* Don't need to check extension availability because all Mesa-based
> -	  * drivers support GL_ARB_draw_buffers.
> +	  * drivers support GL_ATI_draw_buffers.

I don't think you wanted this hunk.

>  	  */
>  	 state->option.DrawBuffers = 1;
>  	 return 1;
> @@ -229,6 +229,16 @@ _mesa_ARBfp_parse_option(struct asm_parser_state *state, const char *option)
>              }
>           }
>        }
> +   } else if (strncmp(option, "ATI_", 4) == 0) {
> +      option += 4;
> +
> +      if (strcmp(option, "draw_buffers") == 0) {
> +	 /* Don't need to check extension availability because all Mesa-based
> +	  * drivers support GL_ARB_draw_buffers.

s/ARB/ATI/  Right?

> +	  */
> +	 state->option.DrawBuffers = 1;
> +	 return 1;
> +      }
>     } else if (strncmp(option, "NV_fragment_program", 19) == 0) {
>        option += 19;
>  
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk2mL/QACgkQX1gOwKyEAw/FGwCfUt1Qe9hHMHAZJKnn8F6VnXZw
DNQAnjjsa4oRDedQ1dc2PREkHAtlY7VE
=uigH
-----END PGP SIGNATURE-----