diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-17 12:16:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-17 12:16:30 +0100 |
| commit | b3f7d4f6ce0d42d826f384223144936ba6797a10 (patch) | |
| tree | 2f329beffff890b402625bff8547e243071c47bd /mesalib/src/mesa/drivers/dri/swrast | |
| parent | c648afe73ef43a15094508d2dd439e05738735bf (diff) | |
| parent | 840c8745518b92303d40f6834e9c616587242231 (diff) | |
| download | vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.tar.gz vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.tar.bz2 vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libXft pixman mesa git update 17 dec 2012
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/swrast')
| -rwxr-xr-x[-rw-r--r--] | mesalib/src/mesa/drivers/dri/swrast/swrast.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c index 005ab08d4..c6b2f0df7 100644..100755 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c @@ -36,12 +36,15 @@ #include <windows.h> #endif +#include "main/api_exec.h" #include "main/context.h" #include "main/extensions.h" #include "main/formats.h" #include "main/framebuffer.h" #include "main/imports.h" #include "main/renderbuffer.h" +#include "main/version.h" +#include "main/vtxfmt.h" #include "swrast/swrast.h" #include "swrast/s_renderbuffer.h" #include "swrast_setup/swrast_setup.h" @@ -791,6 +794,11 @@ dri_create_context(gl_api api, break; } + _mesa_compute_version(mesaCtx); + + _mesa_initialize_exec_table(mesaCtx); + _mesa_initialize_vbo_vtxfmt(mesaCtx); + *error = __DRI_CTX_ERROR_SUCCESS; return GL_TRUE; |