i965: use pack/unpackDouble lowering

[mesa.git] / src / gallium / drivers / i915 / i915_resource_texture.c

diff --git a/src/gallium/drivers/i915/i915_resource_texture.c b/src/gallium/drivers/i915/i915_resource_texture.c
index 9a3279ccb7555a9a5009e036655354ac34e6d86b..af9d97a8acc6c55ff254fcedf42ffe660cd8e781 100644 (file)
--- a/src/gallium/drivers/i915/i915_resource_texture.c
+++ b/src/gallium/drivers/i915/i915_resource_texture.c
@@ -133,7 +133,7 @@ static void
 i915_texture_set_level_info(struct i915_texture *tex,
                             unsigned level, unsigned nr_images)
 {
-   assert(level < Elements(tex->nr_images));
+   assert(level < ARRAY_SIZE(tex->nr_images));
    assert(nr_images);
    assert(!tex->image_offset[level]);
 
@@ -705,7 +705,7 @@ i915_texture_destroy(struct pipe_screen *screen,
    if (tex->buffer)
       iws->buffer_destroy(iws, tex->buffer);
 
-   for (i = 0; i < Elements(tex->image_offset); i++)
+   for (i = 0; i < ARRAY_SIZE(tex->image_offset); i++)
       FREE(tex->image_offset[i]);
 
    FREE(tex);
@@ -728,7 +728,7 @@ i915_texture_transfer_map(struct pipe_context *pipe,
    unsigned offset;
    char *map;
 
-   if (transfer == NULL)
+   if (!transfer)
       return NULL;
 
    transfer->b.resource = resource;
@@ -774,7 +774,7 @@ i915_texture_transfer_map(struct pipe_context *pipe,
 
    map = iws->buffer_map(iws, tex->buffer,
                          (transfer->b.usage & PIPE_TRANSFER_WRITE) ? TRUE : FALSE);
-   if (map == NULL) {
+   if (!map) {
       pipe_resource_reference(&transfer->staging_texture, NULL);
       FREE(transfer);
       return NULL;