diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-11 10:09:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-11 10:09:13 +0200 |
| commit | 30c05ead4fe1b6a341d5b585e3a6b5d255edf650 (patch) | |
| tree | 932b22aede860e3ab2efe50116ad776f81c04606 /mesalib/src/mesa/main/context.c | |
| parent | ac799961eb382e48c68ffda1e1a89b346eb97f81 (diff) | |
| parent | 8223fb176264123c86c0d3eb845973d00fd62cc2 (diff) | |
| download | vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.gz vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.bz2 vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xwininfo mesa git update 11 oct 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_proto_recv.py
mesalib/src/mapi/glapi/gen/glX_proto_size.py
mesalib/src/mapi/glapi/gen/glX_server_table.py
mesalib/src/mapi/glapi/gen/gl_table.py
mesalib/src/mesa/main/.gitignore
Diffstat (limited to 'mesalib/src/mesa/main/context.c')
| -rw-r--r-- | mesalib/src/mesa/main/context.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index d3fced946..29f28bd18 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -404,9 +404,6 @@ one_time_init( struct gl_context *ctx ) _mesa_get_cpu_features(); - /* context dependence is never a one-time thing... */ - _mesa_init_get_hash(ctx); - for (i = 0; i < 256; i++) { _mesa_ubyte_to_float_color_tab[i] = (float) i / 255.0F; } @@ -425,6 +422,8 @@ one_time_init( struct gl_context *ctx ) /* per-API one-time init */ if (!(api_init_mask & (1 << ctx->API))) { + _mesa_init_get_hash(ctx); + /* * This is fine as ES does not use the remap table, but it may not be * future-proof. We cannot always initialize the remap table because |