← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/glx/x11/glxcurrent.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-01-23 10:20:24 UTC
  • mfrom: (1.2.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20090123102024-1f3kmb3aea7wzk67
Tags: 7.3~rc3-1ubuntu1
* Merge with Debian experimental.
* Drop 102_dont_vblank.patch, since the new drm code in the kernel
  fixes the bugs that it worked around.
* Bump the build-dependency of libdrm to 2.4.4. It's the first version
  with necessary changes to build this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/glx/x11/glxcurrent.c
365
365
   const CARD8 oldOpcode = ((gc == oldGC) || (oldGC == &dummyContext))
366
366
      ? opcode : __glXSetupForCommand(oldGC->currentDpy);
367
367
   Bool bindReturnValue;
368
 
 
 
368
   __GLXattribute *state;
369
369
 
370
370
   if (!opcode || !oldOpcode) {
371
371
      return GL_FALSE;
489
489
            } while (0);
490
490
#endif
491
491
 
492
 
            __GLXattribute *state =
493
 
               (__GLXattribute *) (gc->client_state_private);
 
492
            state = (__GLXattribute *) (gc->client_state_private);
494
493
 
495
494
            gc->currentContextTag = reply.contextTag;
496
495
            if (state->array_state == NULL) {