Fix Windows newlines.

[mesa.git] / src / mesa / shader / arbprogparse.c

diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index a080e7d72408256a767a5145a26ad255bc44711e..b8e5e4bd8aef67d56b6dfeb34c329fc04d9bb6a8 100644 (file)
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -1491,10 +1491,16 @@ parse_attrib_binding(GLcontext * ctx, const GLubyte ** inst,
                GLint weight;
                err = parse_weight_num (ctx, inst, Program, &weight);
                *inputReg = VERT_ATTRIB_WEIGHT;
+#if 1
+               /* hack for Warcraft (see bug 8060) */
+               _mesa_warning(ctx, "Application error: vertex program uses 'vertex.weight' but GL_ARB_vertex_blend not supported.");
+               break;
+#else
                program_error(ctx, Program->Position,
                              "ARB_vertex_blend not supported");
+               return 1;
+#endif
             }
-            return 1;
 
          case VERTEX_ATTRIB_NORMAL:
             *inputReg = VERT_ATTRIB_NORMAL;
@@ -3759,7 +3765,7 @@ enable_parser_extensions(GLcontext *ctx, grammar id)
    /* These are not supported at this time */
    if ((ctx->Extensions.ARB_vertex_blend ||
         ctx->Extensions.EXT_vertex_weighting)
-       && !enable_ext(ctx, id, "point_parameters"))
+       && !enable_ext(ctx, id, "vertex_blend"))
       return GL_FALSE;
    if (ctx->Extensions.ARB_matrix_palette
        && !enable_ext(ctx, id, "matrix_palette"))
@@ -3784,6 +3790,11 @@ enable_parser_extensions(GLcontext *ctx, grammar id)
        && !enable_ext(ctx, id, "draw_buffers"))
       return GL_FALSE;
 
+#if 1
+   /* hack for Warcraft (see bug 8060) */
+   enable_ext(ctx, id, "vertex_blend");
+#endif
+
    return GL_TRUE;
 }