fix the presumably broken check for the allow_large_textures and vblank_mode options (same as bug 8042).
This commit is contained in:
@@ -93,7 +93,7 @@ GLboolean i830CreateContext( const __GLcontextModes *mesaVis,
|
||||
* FIXME: packed, but they're not in Intel graphics hardware.
|
||||
*/
|
||||
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,
|
||||
intel->nr_heaps,
|
||||
&intel->ctx.Const,
|
||||
|
@@ -137,7 +137,7 @@ GLboolean i915CreateContext( const __GLcontextModes *mesaVis,
|
||||
* hardware.
|
||||
*/
|
||||
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,
|
||||
intel->nr_heaps,
|
||||
&intel->ctx.Const,
|
||||
|
@@ -388,7 +388,7 @@ GLboolean intelInitContext( intelContextPtr intel,
|
||||
intel->do_usleeps = (fthrottle_mode == DRI_CONF_FTHROTTLE_USLEEPS);
|
||||
|
||||
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);
|
||||
_math_matrix_ctr (&intel->ViewportMatrix);
|
||||
|
Reference in New Issue
Block a user