fix the presumably broken check for the allow_large_textures and vblank_mode options...

diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c
index d16b153fac28bbd9e378ac41a79414831c244cfb..7ca601e1b5cee5b304365a10c4587eb2be542c94 100644 (file)
--- 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 783bbc2ab897cff93a51f524fcf7193b0fa51da2..8c99d0e1d670d07ff6828c49b67b9b952a9f6a49 100644 (file)
--- 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 40cb9188d25f994daefb7152d231e32a2132474b..770b330d0a374db0d27e0f9bcef7d6405bf0a301 100644 (file)
--- 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);