diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-03-01 10:25:01 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-03-01 10:25:01 +0000 |
commit | e8c819c5227d29dfdf503022339276eb725a3e97 (patch) | |
tree | 3029a01f328c873a9287e9fc13b831c536f23560 /src/drm | |
parent | 1a7ba1a8061c373cd66d15b3a1c8dfada92745ef (diff) |
Warnings cleanup for CAIRO_FORMAT_INVALID.
A few more fixes required case statements to handle the addition of
CAIRO_FORMAT_INVALID.
Diffstat (limited to 'src/drm')
-rw-r--r-- | src/drm/cairo-drm-i915-surface.c | 2 | ||||
-rw-r--r-- | src/drm/cairo-drm-i965-shader.c | 2 | ||||
-rw-r--r-- | src/drm/cairo-drm-i965-surface.c | 1 | ||||
-rw-r--r-- | src/drm/cairo-drm-intel-surface.c | 1 | ||||
-rw-r--r-- | src/drm/cairo-drm-intel.c | 3 | ||||
-rw-r--r-- | src/drm/cairo-drm-radeon-surface.c | 1 |
6 files changed, 10 insertions, 0 deletions
diff --git a/src/drm/cairo-drm-i915-surface.c b/src/drm/cairo-drm-i915-surface.c index dabc02e9..039497af 100644 --- a/src/drm/cairo-drm-i915-surface.c +++ b/src/drm/cairo-drm-i915-surface.c @@ -1537,6 +1537,7 @@ i915_surface_create_for_name (cairo_drm_device_t *base_dev, switch (format) { default: + case CAIRO_FORMAT_INVALID: case CAIRO_FORMAT_A1: return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_FORMAT)); case CAIRO_FORMAT_ARGB32: @@ -1686,6 +1687,7 @@ i915_surface_create_from_cacheable_image_internal (i915_device_t *device, format = CAIRO_FORMAT_A8; bpp = 1; break; + case CAIRO_FORMAT_INVALID: default: ASSERT_NOT_REACHED; status = _cairo_error (CAIRO_STATUS_INVALID_FORMAT); diff --git a/src/drm/cairo-drm-i965-shader.c b/src/drm/cairo-drm-i965-shader.c index c448d888..39c89a99 100644 --- a/src/drm/cairo-drm-i965-shader.c +++ b/src/drm/cairo-drm-i965-shader.c @@ -2076,6 +2076,7 @@ i965_get_card_format (cairo_format_t format) case CAIRO_FORMAT_A8: return BRW_SURFACEFORMAT_A8_UNORM; case CAIRO_FORMAT_A1: + case CAIRO_FORMAT_INVALID: default: ASSERT_NOT_REACHED; return 0; @@ -2092,6 +2093,7 @@ i965_get_dest_format (cairo_format_t format) case CAIRO_FORMAT_A8: return BRW_SURFACEFORMAT_A8_UNORM; case CAIRO_FORMAT_A1: + case CAIRO_FORMAT_INVALID: default: ASSERT_NOT_REACHED; return 0; diff --git a/src/drm/cairo-drm-i965-surface.c b/src/drm/cairo-drm-i965-surface.c index 10331dd4..273273d0 100644 --- a/src/drm/cairo-drm-i965-surface.c +++ b/src/drm/cairo-drm-i965-surface.c @@ -1627,6 +1627,7 @@ i965_surface_create_for_name (cairo_drm_device_t *base_dev, case CAIRO_FORMAT_A8: content = CAIRO_CONTENT_ALPHA; break; + case CAIRO_FORMAT_INVALID: default: case CAIRO_FORMAT_A1: return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_FORMAT)); diff --git a/src/drm/cairo-drm-intel-surface.c b/src/drm/cairo-drm-intel-surface.c index 965772d0..7c075480 100644 --- a/src/drm/cairo-drm-intel-surface.c +++ b/src/drm/cairo-drm-intel-surface.c @@ -349,6 +349,7 @@ intel_surface_create_for_name (cairo_drm_device_t *device, cairo_status_t status; switch (format) { + default: case CAIRO_FORMAT_INVALID: case CAIRO_FORMAT_A1: return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_FORMAT)); diff --git a/src/drm/cairo-drm-intel.c b/src/drm/cairo-drm-intel.c index dd5883a0..c530a08d 100644 --- a/src/drm/cairo-drm-intel.c +++ b/src/drm/cairo-drm-intel.c @@ -726,6 +726,7 @@ intel_bo_put_image (intel_device_t *dev, width, height, dst_x, dst_y); default: + case CAIRO_FORMAT_INVALID: return _cairo_error (CAIRO_STATUS_INVALID_FORMAT); } @@ -1028,6 +1029,7 @@ intel_glyph_cache_add_glyph (intel_device_t *device, } break; default: + case CAIRO_FORMAT_INVALID: ASSERT_NOT_REACHED; return _cairo_error (CAIRO_STATUS_INVALID_FORMAT); } @@ -1114,6 +1116,7 @@ intel_get_glyph_cache (intel_device_t *device, format = CAIRO_FORMAT_A8; break; default: + case CAIRO_FORMAT_INVALID: ASSERT_NOT_REACHED; return _cairo_error (CAIRO_STATUS_INVALID_FORMAT); } diff --git a/src/drm/cairo-drm-radeon-surface.c b/src/drm/cairo-drm-radeon-surface.c index e43a9754..08db8f02 100644 --- a/src/drm/cairo-drm-radeon-surface.c +++ b/src/drm/cairo-drm-radeon-surface.c @@ -367,6 +367,7 @@ radeon_surface_create_for_name (cairo_drm_device_t *device, cairo_content_t content; switch (format) { + default: case CAIRO_FORMAT_INVALID: case CAIRO_FORMAT_A1: return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_FORMAT)); |