fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

r200: Initialize swrast before setting limits

Browse source 
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>
This commit is contained in:
Stefan Dösinger 2012-12-05 23:08:19 +01:00 • committed by Alex Deucher
parent ac24d17258
commit 654a945f4d
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/mesa/drivers/dri/r200/r200_context.c
View file

@ -289,13 +289,20 @@ GLboolean r200CreateContext( gl_api api,
rmesa->radeon.swtcl.RenderIndex = ~0; rmesa->radeon.swtcl.RenderIndex = ~0;
rmesa->radeon.hw.all_dirty = 1; 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 /* 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 * 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 * texturable memory at once. Depending on the allow_large_textures driconf
* setting allow larger textures. * setting allow larger textures.
*/ */
ctx = &rmesa->radeon.glCtx;
ctx->Const.MaxTextureUnits = driQueryOptioni (&rmesa->radeon.optionCache, ctx->Const.MaxTextureUnits = driQueryOptioni (&rmesa->radeon.optionCache,
"texture_units"); "texture_units");
ctx->Const.MaxTextureImageUnits = ctx->Const.MaxTextureUnits; ctx->Const.MaxTextureImageUnits = ctx->Const.MaxTextureUnits;
@ -345,14 +352,6 @@ GLboolean r200CreateContext( gl_api api,
_mesa_set_mvp_with_dp4( ctx, GL_TRUE ); _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: /* Install the customized pipeline:
*/ */
_tnl_destroy_pipeline( ctx ); _tnl_destroy_pipeline( ctx );