diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-04 11:56:11 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-04 11:56:11 +0100 |
| commit | ebd6dea009479e612c67d78416b8680bb23dba94 (patch) | |
| tree | 51c6fcfc53498f324497ef2bc41613a8703e795e | |
| parent | 33f0b4b96662d953052232b1c0477ced0c326a62 (diff) | |
uxa/dri: Make sure is_glamor_pixmap is always initialised
The code paths are too twisty to be sure otherwise.
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/intel_dri.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/intel_dri.c b/src/intel_dri.c index 389ecdd9..a1778159 100644 --- a/src/intel_dri.c +++ b/src/intel_dri.c @@ -263,7 +263,7 @@ I830DRI2CreateBuffers(DrawablePtr drawable, unsigned int *attachments, DRI2BufferPtr buffers; I830DRI2BufferPrivatePtr privates; PixmapPtr pixmap, pDepthPixmap; - int is_glamor_pixmap = FALSE; + bool is_glamor_pixmap = false; int i; buffers = calloc(count, sizeof *buffers); @@ -282,7 +282,7 @@ I830DRI2CreateBuffers(DrawablePtr drawable, unsigned int *attachments, pixmap = get_front_buffer(drawable); if (pixmap && intel_get_pixmap_private(pixmap) == NULL) { - is_glamor_pixmap = TRUE; + is_glamor_pixmap = true; drawable = &pixmap->drawable; pixmap = NULL; } @@ -390,7 +390,7 @@ I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment, DRI2Buffer2Ptr buffer; I830DRI2BufferPrivatePtr privates; PixmapPtr pixmap; - int is_glamor_pixmap; + bool is_glamor_pixmap = false; buffer = calloc(1, sizeof *buffer); if (buffer == NULL) @@ -406,7 +406,7 @@ I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment, pixmap = get_front_buffer(drawable); if (pixmap && intel_get_pixmap_private(pixmap) == NULL) { - is_glamor_pixmap = TRUE; + is_glamor_pixmap = true; drawable = &pixmap->drawable; pixmap = NULL; } |