meta: Remove support for multisample blits

[mesa.git] / src / mesa / drivers / common / meta.h

diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h
index 6fefbeb78808f9dc6ad3c2f2615aaa4732e89170..799650bb24fe75b03d743b901eeda8a823594337 100644 (file)
--- a/src/mesa/drivers/common/meta.h
+++ b/src/mesa/drivers/common/meta.h
@@ -234,56 +234,6 @@ struct blit_shader_table {
    struct blit_shader sampler_cubemap_array;
 };
 
-/**
- * Indices in the blit_state->msaa_shaders[] array
- *
- * Note that setup_glsl_msaa_blit_shader() assumes that the _INT enums are five
- * more than the corresponding non-_INT versions and _UINT are five beyond that.
- */
-enum blit_msaa_shader {
-   BLIT_1X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE,
-   BLIT_2X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE,
-   BLIT_4X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE,
-   BLIT_8X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE,
-   BLIT_16X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE,
-   BLIT_1X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE_INT,
-   BLIT_2X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE_INT,
-   BLIT_4X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE_INT,
-   BLIT_8X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE_INT,
-   BLIT_16X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE_INT,
-   BLIT_1X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE_UINT,
-   BLIT_2X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE_UINT,
-   BLIT_4X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE_UINT,
-   BLIT_8X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE_UINT,
-   BLIT_16X_MSAA_SHADER_2D_MULTISAMPLE_RESOLVE_UINT,
-   BLIT_MSAA_SHADER_2D_MULTISAMPLE_COPY,
-   BLIT_MSAA_SHADER_2D_MULTISAMPLE_COPY_INT,
-   BLIT_MSAA_SHADER_2D_MULTISAMPLE_COPY_UINT,
-   BLIT_MSAA_SHADER_2D_MULTISAMPLE_DEPTH_RESOLVE,
-   BLIT_MSAA_SHADER_2D_MULTISAMPLE_DEPTH_COPY,
-   BLIT_1X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE,
-   BLIT_2X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE,
-   BLIT_4X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE,
-   BLIT_8X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE,
-   BLIT_16X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE,
-   BLIT_1X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE_INT,
-   BLIT_2X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE_INT,
-   BLIT_4X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE_INT,
-   BLIT_8X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE_INT,
-   BLIT_16X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE_INT,
-   BLIT_1X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE_UINT,
-   BLIT_2X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE_UINT,
-   BLIT_4X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE_UINT,
-   BLIT_8X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE_UINT,
-   BLIT_16X_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_RESOLVE_UINT,
-   BLIT_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_COPY,
-   BLIT_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_COPY_INT,
-   BLIT_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_COPY_UINT,
-   BLIT_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_DEPTH_RESOLVE,
-   BLIT_MSAA_SHADER_2D_MULTISAMPLE_ARRAY_DEPTH_COPY,
-   BLIT_MSAA_SHADER_COUNT,
-};
-
 /**
  * State for glBlitFramebufer()
  */
@@ -293,7 +243,6 @@ struct blit_state
    struct gl_buffer_object *buf_obj;
    struct blit_shader_table shaders_with_depth;
    struct blit_shader_table shaders_without_depth;
-   struct gl_shader_program *msaa_shaders[BLIT_MSAA_SHADER_COUNT];
    struct temp_texture depthTex;
    bool no_ctsi_fallback;
 };