[Mesa-dev] [PATCH 1/8] meta: Fix blit shader compile on non-glsl-130 drivers.

[Kenneth Graunke]

On 02/14/2014 03:00 PM, Eric Anholt wrote:
> Compare this VS to the one for the post-130 case.  Fixes piglit
> glsl-lod-bias, and presumably tons of other code (I haven't done a full
> piglit run on swrast).
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74911
> ---
>  src/mesa/drivers/common/meta.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
> index d3ca3b7..dd905dd 100644
> --- a/src/mesa/drivers/common/meta.c
> +++ b/src/mesa/drivers/common/meta.c
> @@ -193,7 +193,7 @@ _mesa_meta_setup_blit_shader(struct gl_context *ctx,
>         || ctx->Const.GLSLVersion < 130) {
>        vs_source =
>           "attribute vec2 position;\n"
> -         "attribute vec3 textureCoords;\n"
> +         "attribute vec4 textureCoords;\n"
>           "varying vec4 texCoords;\n"
>           "void main()\n"
>           "{\n"
> 

This is obviously:
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

But I wonder, would it be terribly harmful to just override
ctx->Const.GLSLVersion to 130 in Meta so #version 130 works?

Sure, you could get into trouble if you tried to use things like
ClipDistance and they weren't supported, but I don't see us needing that.

We would need integer, but I don't know of any drivers that allow you to
make integer textures that can't handle integers.  (Gen4-5 expose
EXT_texture_integer without GLSL 1.30, but they can do GLSL 1.30...we
just never finished advertising it...)

Just an idea; I'm not suggesting altering any of these patches.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20140214/5860eabf/attachment.pgp>