~ubuntu-branches/ubuntu/raring/mesa/raring-proposed

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/mga/mga_xmesa.c

  • Committer: Bazaar Package Importer
  • Author(s): Cyril Brulebois
  • Date: 2011-06-19 21:26:00 UTC
  • mfrom: (1.6.1 upstream) (3.3.18 sid)
  • mto: (3.3.20 sid)
  • mto: This revision was merged to the branch mainline in revision 145.
  • Revision ID: james.westby@ubuntu.com-20110619212600-rleaapdmnbtstekb
Tags: 7.11~0-2
Thank you sbuild for giving a green light when that's not actually the
case. Fix missing Pre-Depends for the libegl1-mesa-drivers package
(multiarch-support).

Show diffs side-by-side

added added

removed removed

Lines of Context:
66
66
 
67
67
#include "GL/internal/dri_interface.h"
68
68
 
 
69
#define need_GL_ARB_vertex_array_object
69
70
#define need_GL_ARB_vertex_program
70
71
#define need_GL_EXT_fog_coord
71
72
#define need_GL_EXT_gpu_program_parameters
382
383
static const struct dri_extension card_extensions[] =
383
384
{
384
385
   { "GL_ARB_texture_rectangle",      NULL },
 
386
   { "GL_ARB_vertex_array_object",    GL_ARB_vertex_array_object_functions },
385
387
   { "GL_EXT_blend_logic_op",         NULL },
386
388
   { "GL_EXT_fog_coord",              GL_EXT_fog_coord_functions },
387
389
   /* paletted_textures currently doesn't work, but we could fix them later */
457
459
      shareCtx = ((mgaContextPtr) sharedContextPrivate)->glCtx;
458
460
   else 
459
461
      shareCtx = NULL;
460
 
   mmesa->glCtx = _mesa_create_context(mesaVis, shareCtx,
 
462
   mmesa->glCtx = _mesa_create_context(API_OPENGL, mesaVis, shareCtx,
461
463
                                       &functions, (void *) mmesa);
462
464
   if (!mmesa->glCtx) {
463
465
      FREE(mmesa);