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

fix the presumably broken check for the allow_large_textures and vblank_mode options (same as bug 8042).

Browse source
This commit is contained in:
Roland Scheidegger 2006-09-01 23:36:30 +00:00
parent 91650469ae
commit 5b4e7cdca4
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i915/i830_context.c
View file

@ -93,7 +93,7 @@ GLboolean i830CreateContext( const __GLcontextModes *mesaVis,
* FIXME: packed, but they're not in Intel graphics hardware. * FIXME: packed, but they're not in Intel graphics hardware.
*/ */
intel->ctx.Const.MaxTextureUnits = I830_TEX_UNITS; intel->ctx.Const.MaxTextureUnits = I830_TEX_UNITS;
i = driQueryOptioni( &intel->intelScreen->optionCache, "allow_large_textures"); i = driQueryOptioni( &intel->optionCache, "allow_large_textures");
driCalculateMaxTextureLevels( intel->texture_heaps, driCalculateMaxTextureLevels( intel->texture_heaps,
intel->nr_heaps, intel->nr_heaps,
&intel->ctx.Const, &intel->ctx.Const,

2
src/mesa/drivers/dri/i915/i915_context.c
View file

@ -137,7 +137,7 @@ GLboolean i915CreateContext( const __GLcontextModes *mesaVis,
* hardware. * hardware.
*/ */
ctx->Const.MaxTextureUnits = I915_TEX_UNITS; ctx->Const.MaxTextureUnits = I915_TEX_UNITS;
i = driQueryOptioni( &intel->intelScreen->optionCache, "allow_large_textures"); i = driQueryOptioni( &intel->optionCache, "allow_large_textures");
driCalculateMaxTextureLevels( intel->texture_heaps, driCalculateMaxTextureLevels( intel->texture_heaps,
intel->nr_heaps, intel->nr_heaps,
&intel->ctx.Const, &intel->ctx.Const,

2
src/mesa/drivers/dri/i915/intel_context.c
View file

@ -388,7 +388,7 @@ GLboolean intelInitContext( intelContextPtr intel,
intel->do_usleeps = (fthrottle_mode == DRI_CONF_FTHROTTLE_USLEEPS); intel->do_usleeps = (fthrottle_mode == DRI_CONF_FTHROTTLE_USLEEPS);
intel->vblank_flags = (intel->intelScreen->irq_active != 0) intel->vblank_flags = (intel->intelScreen->irq_active != 0)
? driGetDefaultVBlankFlags(&intelScreen->optionCache) : VBLANK_FLAG_NO_IRQ; ? driGetDefaultVBlankFlags(&intel->optionCache) : VBLANK_FLAG_NO_IRQ;
(*dri_interface->getUST)(&intel->swap_ust); (*dri_interface->getUST)(&intel->swap_ust);
_math_matrix_ctr (&intel->ViewportMatrix); _math_matrix_ctr (&intel->ViewportMatrix);