~ubuntu-branches/ubuntu/natty/mesa/natty-proposed

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/intel/intel_batchbuffer.h

  • Committer: Bazaar Package Importer
  • Author(s): Robert Hooker, Robert Hooker, Christopher James Halse Rogers
  • Date: 2010-09-14 08:55:40 UTC
  • mfrom: (1.2.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20100914085540-m4fpl0hdjlfd4jgz
Tags: 7.9~git20100909-0ubuntu1
[ Robert Hooker ]
* New upstream git snapshot up to commit 94118fe2d4b1e5 (LP: #631413)
* New features include ATI HD5xxx series support in r600, and a vastly
  improved glsl compiler.
* Remove pre-generated .pc's, use the ones generated at build time
  instead.
* Remove all references to mesa-utils now that its no longer shipped
  with the mesa source.
* Disable the experimental ARB_fragment_shader option by default on
  i915, it exposes incomplete functionality that breaks KDE compositing
  among other things. It can be enabled via driconf still. (LP: #628930).

[ Christopher James Halse Rogers ]
* debian/patches/04_osmesa_version.diff:
  - Refresh for new upstream
* Bugs fixed in this release:
  - Fixes severe rendering corruption in Unity on radeon (LP: #628727,
    LP: #596292, LP: #599741, LP: #630315, LP: #613694, LP: #599741).
  - Also fixes rendering in gnome-shell (LP: #578619).
  - Flickering in OpenGL apps on radeon (LP: #626943, LP: #610541).
  - Provides preliminary support for new intel chips (LP: #601052).
* debian/rules:
  - Update configure flags to match upstream reshuffling.
  - Explicitly remove gallium DRI drivers that we don't want to ship.
* Update debian/gbp.conf for this Maverick-specific packaging
* libegl1-mesa-dri-x11,kms: There are no longer separate kms or x11 drivers
  for EGL, libegl1-mesa-drivers now contains a single driver that provides
  both backends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
{
16
16
   struct intel_context *intel;
17
17
 
18
 
   dri_bo *buf;
 
18
   drm_intel_bo *buf;
19
19
 
20
20
   GLubyte *buffer;
21
21
 
23
23
   GLubyte *ptr;
24
24
 
25
25
   GLuint size;
 
26
   uint32_t state_batch_offset;
26
27
 
27
28
#ifdef DEBUG
28
29
   /** Tracking of BEGIN_BATCH()/OUT_BATCH()/ADVANCE_BATCH() debugging */
62
63
                                     GLuint bytes);
63
64
 
64
65
GLboolean intel_batchbuffer_emit_reloc(struct intel_batchbuffer *batch,
65
 
                                       dri_bo *buffer,
 
66
                                       drm_intel_bo *buffer,
66
67
                                       uint32_t read_domains,
67
68
                                       uint32_t write_domain,
68
69
                                       uint32_t offset);
92
93
static INLINE GLint
93
94
intel_batchbuffer_space(struct intel_batchbuffer *batch)
94
95
{
95
 
   return (batch->size - batch->reserved_space) - (batch->ptr - batch->map);
 
96
   return (batch->state_batch_offset - batch->reserved_space) -
 
97
      (batch->ptr - batch->map);
96
98
}
97
99
 
98
100