summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Dösinger <stefandoesinger@gmx.at>2012-12-05 23:08:19 +0100
committerAlex Deucher <alexander.deucher@amd.com>2012-12-06 11:37:24 -0500
commit654a945f4d5fa00a40d47b952162a3b7f71dca5d (patch)
treeaa63fde2102acecb4e970ebcfafd8c897d9b5493 /src
parentac24d172582cdb7a79098ca43ca8870712a98068 (diff)
r200: Initialize swrast before setting limits
Otherwise the driver announces 4096 vertex shader constants and other way too high limits. NOTE: This is a candidate for stable release branches. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/r200/r200_context.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 360ba72c13..54cf33e5c6 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -289,13 +289,20 @@ GLboolean r200CreateContext( gl_api api,
rmesa->radeon.swtcl.RenderIndex = ~0;
rmesa->radeon.hw.all_dirty = 1;
+ 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;
@@ -345,14 +352,6 @@ GLboolean r200CreateContext( 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 );