diff options
| author | Roland Scheidegger <[email protected]> | 2006-09-01 23:36:30 +0000 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2006-09-01 23:36:30 +0000 |
| commit | 5b4e7cdca4be195bbce4620f26b8e7f644862b79 (patch) | |
| tree | 9e3b9f856183badfd331033ce0dbe3fa1fec85da /src | |
| parent | 91650469aeb01f249bcd553d9d309b3016c2f93c (diff) | |
fix the presumably broken check for the allow_large_textures and vblank_mode options (same as bug 8042).
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i830_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_context.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c index d16b153fac2..7ca601e1b5c 100644 --- a/src/mesa/drivers/dri/i915/i830_context.c +++ b/src/mesa/drivers/dri/i915/i830_context.c @@ -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, diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 783bbc2ab89..8c99d0e1d67 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -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, diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index 40cb9188d25..770b330d0a3 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -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); |