Mesa (master): radeon: Initialize swrast before setting limits
Alex Deucher
agd5f at kemper.freedesktop.org
Thu Dec 6 16:41:19 UTC 2012
Module: Mesa
Branch: master
Commit: f6a4e1bc1eb3df1e9172474b60cf9fce571e35d1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f6a4e1bc1eb3df1e9172474b60cf9fce571e35d1
Author: Stefan Dösinger <stefandoesinger at gmx.at>
Date: Wed Dec 5 23:08:20 2012 +0100
radeon: Initialize swrast before setting limits
NOTE: This is a candidate for stable release branches.
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
src/mesa/drivers/dri/radeon/radeon_context.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 1e0da0b..d29e146 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -251,13 +251,21 @@ r100CreateContext( gl_api api,
rmesa->radeon.swtcl.RenderIndex = ~0;
rmesa->radeon.hw.all_dirty = GL_TRUE;
+ ctx = &rmesa->radeon.glCtx;
+ /* Initialize the software rasterizer and helper modules.
+ */
+ _swrast_CreateContext( ctx );
+ _vbo_CreateContext( ctx );
+ _tnl_CreateContext( ctx );
+ _swsetup_CreateContext( ctx );
+ _ae_create_context( ctx );
+
/* Set the maximum texture size small enough that we can guarentee that
* all texture units can bind a maximal texture and have all of them in
* texturable memory at once. Depending on the allow_large_textures driconf
* setting allow larger textures.
*/
- ctx = &rmesa->radeon.glCtx;
ctx->Const.MaxTextureUnits = driQueryOptioni (&rmesa->radeon.optionCache,
"texture_units");
ctx->Const.MaxTextureImageUnits = ctx->Const.MaxTextureUnits;
@@ -307,14 +315,6 @@ r100CreateContext( gl_api api,
_mesa_set_mvp_with_dp4( ctx, GL_TRUE );
- /* Initialize the software rasterizer and helper modules.
- */
- _swrast_CreateContext( ctx );
- _vbo_CreateContext( ctx );
- _tnl_CreateContext( ctx );
- _swsetup_CreateContext( ctx );
- _ae_create_context( ctx );
-
/* Install the customized pipeline:
*/
_tnl_destroy_pipeline( ctx );
More information about the mesa-commit
mailing list