← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/mesa/jaunty

« back to all changes in this revision

Viewing changes to src/mesa/main/getstring.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-04-03 12:42:06 UTC
  • mfrom: (1.2.16 upstream) (3.1.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20090403124206-0oo9dl0tcmd0qr38
Tags: 7.4-0ubuntu1
https://launchpad.net/bugs/330476
https://launchpad.net/bugs/347171
https://launchpad.net/bugs/349127
https://launchpad.net/bugs/146298
https://launchpad.net/bugs/324854
* New upstream release, merge from debian-experimental
  (LP: #330476, #347171, #349127)
* Drop 103_rs600_support.patch, included in this version.
* Drop 104_swrast_fbconfigs.patch, included in this version.
* Add 103_bump_965_texture_limit.diff. (LP: #146298)
* Add 104_fix_dri2_ext_tfp.diff. (LP: #324854)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/main/getstring.c
82
82
                              ctx->Extensions.ARB_vertex_shader &&
83
83
                              ctx->Extensions.ARB_fragment_shader &&
84
84
                              ctx->Extensions.ARB_texture_non_power_of_two &&
85
 
                              ctx->Extensions.EXT_blend_equation_separate);
 
85
                              ctx->Extensions.EXT_blend_equation_separate &&
 
86
 
 
87
                              /* Technically, 2.0 requires the functionality
 
88
                               * of the EXT version.  Enable 2.0 if either
 
89
                               * extension is available, and assume that a
 
90
                               * driver that only exposes the ATI extension
 
91
                               * will fallback to software when necessary.
 
92
                               */
 
93
                              (ctx->Extensions.EXT_stencil_two_side
 
94
                               || ctx->Extensions.ATI_separate_stencil));
86
95
   const GLboolean ver_2_1 = (ver_2_0 &&
87
 
                              /*ctx->Extensions.ARB_shading_language_120 &&*/
 
96
                              ctx->Extensions.ARB_shading_language_120 &&
88
97
                              ctx->Extensions.EXT_pixel_buffer_object &&
89
98
                              ctx->Extensions.EXT_texture_sRGB);
90
99
   if (ver_2_1)