diff options
| author | marha <marha@users.sourceforge.net> | 2014-02-07 23:46:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-02-07 23:46:30 +0100 |
| commit | 6daf40f6b1138efad98dbb579cd35520cbc349bb (patch) | |
| tree | 7f45dbb347f5e1a73b18a720633b9d801c968490 /mesalib/src/mapi/glapi/gen/gl_genexec.py | |
| parent | 5c64f94cf4cf8457a5616fe20b9a27174895f1a8 (diff) | |
| parent | 982ac918afe6a1c02d5cf735d7b6c56443a048cc (diff) | |
| download | vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.gz vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.bz2 vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014
Conflicts:
mesalib/src/glsl/glcpp/glcpp.c
openssl/Makefile
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/gl_genexec.py')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/gl_genexec.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_genexec.py b/mesalib/src/mapi/glapi/gen/gl_genexec.py index b7ac16b06..1765a51ad 100644 --- a/mesalib/src/mapi/glapi/gen/gl_genexec.py +++ b/mesalib/src/mapi/glapi/gen/gl_genexec.py @@ -51,12 +51,14 @@ header = """/** #include "main/atifragshader.h" #include "main/attrib.h" #include "main/blend.h" +#include "main/blit.h" #include "main/bufferobj.h" #include "main/arrayobj.h" #include "main/buffers.h" #include "main/clear.h" #include "main/clip.h" #include "main/colortab.h" +#include "main/compute.h" #include "main/condrender.h" #include "main/context.h" #include "main/convolve.h" @@ -74,6 +76,7 @@ header = """/** #include "main/fog.h" #include "main/fbobject.h" #include "main/framebuffer.h" +#include "main/genmipmap.h" #include "main/hint.h" #include "main/histogram.h" #include "main/imports.h" |