diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-17 16:16:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-17 16:16:11 +0200 |
| commit | c72f683c50e774b21967f0121245a286539fa555 (patch) | |
| tree | fa5e86f04a33b8bcebf937d1966052ccf1fefbeb /mesalib/src/glsl/glcpp/glcpp.c | |
| parent | 86fb7e4a298199b30bd16565569a9b3dfe7a1f11 (diff) | |
| parent | e3c4aa34268f99562e66b43a7d9efcd16ca072e6 (diff) | |
| download | vcxsrv-c72f683c50e774b21967f0121245a286539fa555.tar.gz vcxsrv-c72f683c50e774b21967f0121245a286539fa555.tar.bz2 vcxsrv-c72f683c50e774b21967f0121245a286539fa555.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/syncobj.h
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/glsl/glcpp/glcpp.c')
| -rw-r--r-- | mesalib/src/glsl/glcpp/glcpp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/glcpp/glcpp.c b/mesalib/src/glsl/glcpp/glcpp.c index 106c9916b..130f4324d 100644 --- a/mesalib/src/glsl/glcpp/glcpp.c +++ b/mesalib/src/glsl/glcpp/glcpp.c @@ -119,7 +119,7 @@ main (int argc, char *argv[]) if (shader == NULL) return 1; - ret = preprocess(ctx, &shader, &info_log, NULL, API_OPENGL); + ret = glcpp_preprocess(ctx, &shader, &info_log, NULL, API_OPENGL); printf("%s", shader); fprintf(stderr, "%s", info_log); |