Mesa (master): meta: Fix blit shader compile on non-glsl-130 drivers.

Eric Anholt anholt at kemper.freedesktop.org
Tue Feb 18 18:37:22 UTC 2014


Module: Mesa
Branch: master
Commit: b3dcce65c9b400e8d658f672130c617d8ac84cc9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3dcce65c9b400e8d658f672130c617d8ac84cc9

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Feb 14 14:31:17 2014 -0800

meta: Fix blit shader compile on non-glsl-130 drivers.

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
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 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"




More information about the mesa-commit mailing list