diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-26 15:01:24 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-26 15:01:24 +0200 |
| commit | 2fe2056807d1304de86deb2b59992d51d9252ad0 (patch) | |
| tree | 665d730ee19df03e4dfca01371009ec778a343af /mesalib/src/glsl/linker.cpp | |
| parent | fa791414601df61d20d860299dba80fdb62565df (diff) | |
| download | vcxsrv-2fe2056807d1304de86deb2b59992d51d9252ad0.tar.gz vcxsrv-2fe2056807d1304de86deb2b59992d51d9252ad0.tar.bz2 vcxsrv-2fe2056807d1304de86deb2b59992d51d9252ad0.zip | |
libXext mesa git update 29 June 20013
libXext commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4
mesa commit 9aebad618c0aab527a0b838ce0a79ffa6dd426bb
Diffstat (limited to 'mesalib/src/glsl/linker.cpp')
| -rw-r--r-- | mesalib/src/glsl/linker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp index cd8d680ae..c168e47e0 100644 --- a/mesalib/src/glsl/linker.cpp +++ b/mesalib/src/glsl/linker.cpp @@ -66,6 +66,7 @@ #include "main/core.h" #include "glsl_symbol_table.h" +#include "glsl_parser_extras.h" #include "ir.h" #include "program.h" #include "program/hash_table.h" @@ -1009,8 +1010,7 @@ link_intrastage_shaders(void *mem_ctx, if (main == NULL) { linker_error(prog, "%s shader lacks `main'\n", - (shader_list[0]->Type == GL_VERTEX_SHADER) - ? "vertex" : "fragment"); + _mesa_glsl_shader_target_name(shader_list[0]->Type)); return NULL; } |