api: Introduce CAIRO_FORMAT_INVALID formally in the API.

We were exposing the actual value of CAIRO_FORMAT_INVALID
through API functions already, so it makes sense to just
go ahead and put it in the cairo_format_t enum.

5 files changed, 12 insertions, 5 deletions

diff --git a/src/drm/cairo-drm-gallium-surface.c b/src/drm/cairo-drm-gallium-surface.c
index 73d75478..faea87bc 100644
--- a/src/drm/cairo-drm-gallium-surface.c
+++ b/src/drm/cairo-drm-gallium-surface.c
@@ -522,6 +522,7 @@ gallium_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_A8:
diff --git a/src/drm/cairo-drm-i915-surface.c b/src/drm/cairo-drm-i915-surface.c
index 851c3731..dabc02e9 100644
--- a/src/drm/cairo-drm-i915-surface.c
+++ b/src/drm/cairo-drm-i915-surface.c
@@ -1594,6 +1594,7 @@ i915_buffer_cache_init (intel_buffer_cache_t *cache,
     cache->buffer.height = height;
 
     switch (format) {
+    case CAIRO_FORMAT_INVALID:
     case CAIRO_FORMAT_A1:
     case CAIRO_FORMAT_RGB24:
 	ASSERT_NOT_REACHED;
diff --git a/src/drm/cairo-drm-intel-surface.c b/src/drm/cairo-drm-intel-surface.c
index 5b7c60be..965772d0 100644
--- a/src/drm/cairo-drm-intel-surface.c
+++ b/src/drm/cairo-drm-intel-surface.c
@@ -349,7 +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));
     case CAIRO_FORMAT_ARGB32:
diff --git a/src/drm/cairo-drm-intel.c b/src/drm/cairo-drm-intel.c
index 748aceef..dd5883a0 100644
--- a/src/drm/cairo-drm-intel.c
+++ b/src/drm/cairo-drm-intel.c
@@ -708,7 +708,6 @@ intel_bo_put_image (intel_device_t *dev,
     offset = dst_y * stride;
     data = src->data + src_y * src->stride;
     switch (src->format) {
-    default:
     case CAIRO_FORMAT_ARGB32:
     case CAIRO_FORMAT_RGB24:
 	offset += 4 * dst_x;
@@ -726,6 +725,8 @@ intel_bo_put_image (intel_device_t *dev,
 				       src_x, src_y,
 				       width, height,
 				       dst_x, dst_y);
+    default:
+	return _cairo_error (CAIRO_STATUS_INVALID_FORMAT);
     }
 
     if (bo->tiling == I915_TILING_NONE) {
@@ -1016,8 +1017,6 @@ intel_glyph_cache_add_glyph (intel_device_t *device,
 	}
 	break;
 
-    default:
-	ASSERT_NOT_REACHED;
     case CAIRO_FORMAT_RGB24:
     case CAIRO_FORMAT_ARGB32:
 	dst  += 4*node->x;
@@ -1028,6 +1027,9 @@ intel_glyph_cache_add_glyph (intel_device_t *device,
 	    src += glyph_surface->stride;
 	}
 	break;
+    default:
+	ASSERT_NOT_REACHED;
+	return _cairo_error (CAIRO_STATUS_INVALID_FORMAT);
     }
 
     /* leave mapped! */
@@ -1113,6 +1115,7 @@ intel_get_glyph_cache (intel_device_t *device,
 	break;
     default:
 	ASSERT_NOT_REACHED;
+	return _cairo_error (CAIRO_STATUS_INVALID_FORMAT);
     }
 
     if (unlikely (cache->buffer.bo == NULL)) {
@@ -1227,7 +1230,9 @@ intel_buffer_cache_init (intel_buffer_cache_t *cache,
     switch (format) {
     case CAIRO_FORMAT_A1:
     case CAIRO_FORMAT_RGB24:
+    case CAIRO_FORMAT_INVALID:
 	ASSERT_NOT_REACHED;
+	return _cairo_error (CAIRO_STATUS_INVALID_FORMAT);
     case CAIRO_FORMAT_ARGB32:
 	cache->buffer.map0 = MAPSURF_32BIT | MT_32BIT_ARGB8888;
 	cache->buffer.stride = width * 4;
diff --git a/src/drm/cairo-drm-radeon-surface.c b/src/drm/cairo-drm-radeon-surface.c
index 7521199a..e43a9754 100644
--- a/src/drm/cairo-drm-radeon-surface.c
+++ b/src/drm/cairo-drm-radeon-surface.c
@@ -367,7 +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));
     case CAIRO_FORMAT_ARGB32: