diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2012-11-16 10:30:19 -0800 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2012-12-16 15:30:27 -0800 |
| commit | 4bea4cb9fd55cdb267003a6e6e16f7e903e00940 (patch) | |
| tree | 0d5005a91f6b578a9e4891a662a177a9ac0f4707 /src/mesa/drivers/dri/nouveau | |
| parent | 0924f4e90c47d9e4d7255cd1375c651523c9b1c5 (diff) | |
drivers: compute version and then initialize exec table
This change forces the context version to be computed before
initilizing the exec dispatch tables.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/nouveau')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_context.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c index 7e7dcc49944..8811562dfa8 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_context.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c @@ -31,12 +31,14 @@ #include "nouveau_fbo.h" #include "nv_object.xml.h" +#include "main/api_exec.h" #include "main/dd.h" #include "main/framebuffer.h" #include "main/fbobject.h" #include "main/light.h" #include "main/state.h" #include "main/version.h" +#include "main/vtxfmt.h" #include "drivers/common/meta.h" #include "drivers/common/driverfuncs.h" #include "swrast/swrast.h" @@ -103,6 +105,10 @@ nouveau_context_create(gl_api api, return GL_FALSE; } + /* Exec table initialization requires the version to be computed */ + _mesa_initialize_exec_table(ctx); + _mesa_initialize_vbo_vtxfmt(ctx); + if (nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_VRAM, 0, 4096, NULL, &nctx->fence)) { nouveau_context_destroy(dri_ctx); |