diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-18 10:05:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-18 10:05:10 +0100 |
| commit | 1d46380a9bb69897acdadf71b80cd759b0493fad (patch) | |
| tree | d8517cf38e0ac8a6ec098d92293e262e99a4c7b9 /mesalib | |
| parent | 18d9ddc200055ccf6bf285e578e4724159ff69d5 (diff) | |
| parent | 293fd0043af7e861c9c540bebc44630d0da0bf9b (diff) | |
| download | vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.tar.gz vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.tar.bz2 vcxsrv-1d46380a9bb69897acdadf71b80cd759b0493fad.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 18 oct 2012
Diffstat (limited to 'mesalib')
| -rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.cpp | 4 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/windows/gdi/wmesa.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp index 91122cc60..b460c8619 100644 --- a/mesalib/src/glsl/glsl_parser_extras.cpp +++ b/mesalib/src/glsl/glsl_parser_extras.cpp @@ -154,9 +154,9 @@ _mesa_glsl_parse_state::check_version(unsigned required_glsl_version, char *problem = ralloc_vasprintf(this, fmt, args); va_end(args); const char *glsl_version_string - = glsl_compute_version_string(ctx, false, required_glsl_version); + = glsl_compute_version_string(this, false, required_glsl_version); const char *glsl_es_version_string - = glsl_compute_version_string(ctx, true, required_glsl_es_version); + = glsl_compute_version_string(this, true, required_glsl_es_version); const char *requirement_string = ""; if (required_glsl_version && required_glsl_es_version) { requirement_string = ralloc_asprintf(this, " (%s or %s required)", diff --git a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c index af9ae6be6..b76c0edda 100644 --- a/mesalib/src/mesa/drivers/windows/gdi/wmesa.c +++ b/mesalib/src/mesa/drivers/windows/gdi/wmesa.c @@ -12,6 +12,7 @@ #include "main/framebuffer.h" #include "main/renderbuffer.h" #include "main/macros.h" +#include "main/version.h" #include "main/vtxfmt.h" #include "drivers/common/driverfuncs.h" #include "drivers/common/meta.h" |