~ubuntu-branches/ubuntu/quantal/mesa/quantal

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/i915/i915_context.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-02-21 12:44:07 UTC
  • mfrom: (1.2.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: james.westby@ubuntu.com-20070221124407-rgcacs32mycrtadl
ImportĀ upstreamĀ versionĀ 6.5.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
50
50
    { "GL_ARB_depth_texture",              NULL },
51
51
    { "GL_ARB_fragment_program",           NULL },
52
52
    { "GL_ARB_shadow",                     NULL },
 
53
    { "GL_ARB_texture_env_crossbar",       NULL },
53
54
    { "GL_EXT_shadow_funcs",               NULL },
54
55
    /* ARB extn won't work if not enabled */
55
56
    { "GL_SGIX_depth_texture",             NULL },
137
138
    * hardware.
138
139
    */
139
140
   ctx->Const.MaxTextureUnits = I915_TEX_UNITS;
140
 
   i = driQueryOptioni( &intel->intelScreen->optionCache, "allow_large_textures");
 
141
   i = driQueryOptioni( &intel->optionCache, "allow_large_textures");
141
142
   driCalculateMaxTextureLevels( intel->texture_heaps,
142
143
                                 intel->nr_heaps,
143
144
                                 &intel->ctx.Const,
165
166
                                                I915_MAX_TEX_INSN);
166
167
   ctx->Const.FragmentProgram.MaxNativeTexIndirections = I915_MAX_TEX_INDIRECT;
167
168
   ctx->Const.FragmentProgram.MaxNativeAddressRegs = 0; /* I don't think we have one */
 
169
   ctx->_MaintainTexEnvProgram = 1;
 
170
   ctx->_UseTexEnvProgram = 1;
168
171
 
169
172
 
170
173
   driInitExtensions( ctx, i915_extensions, GL_FALSE );