PIPE_SCREEN_SURFACE no longer needed

5 files changed, 6 insertions, 17 deletions

diff --git a/src/mesa/pipe/cell/ppu/cell_context.c b/src/mesa/pipe/cell/ppu/cell_context.c
index 966f355bb3..eff33da969 100644
--- a/src/mesa/pipe/cell/ppu/cell_context.c
+++ b/src/mesa/pipe/cell/ppu/cell_context.c
@@ -60,8 +60,6 @@ cell_is_format_supported( struct pipe_context *pipe,
    case PIPE_SURFACE:
       /* cell supports all (off-screen) surface formats, XXX for now */
       return TRUE;
-   case PIPE_SCREEN_SURFACE:
-      return format == cell->winsys->preferredFormat;
    default:
       assert(0);
       return FALSE;
diff --git a/src/mesa/pipe/i915simple/i915_context.c b/src/mesa/pipe/i915simple/i915_context.c
index 0e3d6d64e4..1c6b8cbb05 100644
--- a/src/mesa/pipe/i915simple/i915_context.c
+++ b/src/mesa/pipe/i915simple/i915_context.c
@@ -41,7 +41,7 @@
 /**
  * Query format support for creating a texture, drawing surface, etc.
  * \param format  the format to test
- * \param type  one of PIPE_TEXTURE, PIPE_SURFACE, PIPE_SCREEN_SURFACE
+ * \param type  one of PIPE_TEXTURE, PIPE_SURFACE
  */
 static boolean
 i915_is_format_supported( struct pipe_context *pipe,
@@ -64,12 +64,7 @@ i915_is_format_supported( struct pipe_context *pipe,
       PIPE_FORMAT_A8R8G8B8_UNORM,
       PIPE_FORMAT_R5G6B5_UNORM,
       PIPE_FORMAT_S8Z24_UNORM,
-      PIPE_FORMAT_R16G16B16A16_SNORM,
-      PIPE_FORMAT_NONE  /* list terminator */
-   };
-   static const enum pipe_format screen_surface_supported[] = {
-      PIPE_FORMAT_A8R8G8B8_UNORM,
-      PIPE_FORMAT_R5G6B5_UNORM,
+      /*PIPE_FORMAT_R16G16B16A16_SNORM,*/
       PIPE_FORMAT_NONE  /* list terminator */
    };
    const enum pipe_format *list;
@@ -82,9 +77,6 @@ i915_is_format_supported( struct pipe_context *pipe,
    case PIPE_SURFACE:
       list = surface_supported;
       break;
-   case PIPE_SCREEN_SURFACE:
-      list = screen_surface_supported;
-      break;
    default:
       assert(0);
    }
diff --git a/src/mesa/pipe/i965simple/brw_context.c b/src/mesa/pipe/i965simple/brw_context.c
index 13bed97ff2..e69ba6938e 100644
--- a/src/mesa/pipe/i965simple/brw_context.c
+++ b/src/mesa/pipe/i965simple/brw_context.c
@@ -134,7 +134,7 @@ brw_get_paramf(struct pipe_context *pipe, int param)
 
 static boolean
 brw_is_format_supported( struct pipe_context *pipe,
-                          uint format )
+                          enum pipe_format format, uint type )
 {
 #if 0
    /* XXX: This is broken -- rewrite if still needed. */
@@ -190,6 +190,8 @@ brw_is_format_supported( struct pipe_context *pipe,
    case PIPE_FORMAT_R5G6B5_UNORM:
    case PIPE_FORMAT_S8Z24_UNORM:
       return TRUE;
+   default:
+      return FALSE;
    };
    return FALSE;
 #endif
diff --git a/src/mesa/pipe/p_defines.h b/src/mesa/pipe/p_defines.h
index d3afef95b4..a67ed60547 100644
--- a/src/mesa/pipe/p_defines.h
+++ b/src/mesa/pipe/p_defines.h
@@ -165,7 +165,6 @@
  */
 #define PIPE_TEXTURE        1
 #define PIPE_SURFACE        2  /**< user-created surfaces */
-#define PIPE_SCREEN_SURFACE 3  /**< On-screen front/back colorbuffer */
 
 
 /**
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 107c8f8597..dcf0444f6e 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -49,7 +49,7 @@
 /**
  * Query format support for creating a texture, drawing surface, etc.
  * \param format  the format to test
- * \param type  one of PIPE_TEXTURE, PIPE_SURFACE, PIPE_SCREEN_SURFACE
+ * \param type  one of PIPE_TEXTURE, PIPE_SURFACE
  */
 static boolean
 softpipe_is_format_supported( struct pipe_context *pipe,
@@ -64,8 +64,6 @@ softpipe_is_format_supported( struct pipe_context *pipe,
    case PIPE_SURFACE:
       /* softpipe supports all (off-screen) surface formats */
       return TRUE;
-   case PIPE_SCREEN_SURFACE:
-      return softpipe->winsys->is_format_supported( softpipe->winsys, format );
    default:
       assert(0);
       return FALSE;