Revert to Mesa 13.0.6 to hopefully address rendering issues a handful of

people have reported with xpdf/fvwm on ivy bridge with modesetting driver.

1 files changed, 0 insertions, 131 deletions

diff --git a/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_blend.c b/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_blend.c
deleted file mode 100644
index 8ea09a37a..000000000
--- a/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_blend.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2012-2015 Etnaviv Project
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Wladimir J. van der Laan <laanwj@gmail.com>
- */
-
-#include "etnaviv_blend.h"
-
-#include "etnaviv_context.h"
-#include "etnaviv_translate.h"
-#include "pipe/p_defines.h"
-#include "util/u_memory.h"
-
-void *
-etna_blend_state_create(struct pipe_context *pctx,
-                        const struct pipe_blend_state *so)
-{
-   const struct pipe_rt_blend_state *rt0 = &so->rt[0];
-   struct etna_blend_state *co = CALLOC_STRUCT(etna_blend_state);
-
-   if (!co)
-      return NULL;
-
-   co->base = *so;
-
-   /* Enable blending if
-    * - blend enabled in blend state
-    * - NOT source factor is ONE and destination factor ZERO for both rgb and
-    *   alpha (which would mean that blending is effectively disabled)
-    */
-   co->enable = rt0->blend_enable &&
-                 !(rt0->rgb_src_factor == PIPE_BLENDFACTOR_ONE &&
-                   rt0->rgb_dst_factor == PIPE_BLENDFACTOR_ZERO &&
-                   rt0->alpha_src_factor == PIPE_BLENDFACTOR_ONE &&
-                   rt0->alpha_dst_factor == PIPE_BLENDFACTOR_ZERO);
-
-   /* Enable separate alpha if
-    * - Blending enabled (see above)
-    * - NOT source factor is equal to destination factor for both rgb abd
-    *   alpha (which would effectively that mean alpha is not separate)
-    */
-   bool separate_alpha = co->enable &&
-                         !(rt0->rgb_src_factor == rt0->alpha_src_factor &&
-                           rt0->rgb_dst_factor == rt0->alpha_dst_factor);
-
-   if (co->enable) {
-      co->PE_ALPHA_CONFIG =
-         VIVS_PE_ALPHA_CONFIG_BLEND_ENABLE_COLOR |
-         COND(separate_alpha, VIVS_PE_ALPHA_CONFIG_BLEND_SEPARATE_ALPHA) |
-         VIVS_PE_ALPHA_CONFIG_SRC_FUNC_COLOR(translate_blend_factor(rt0->rgb_src_factor)) |
-         VIVS_PE_ALPHA_CONFIG_SRC_FUNC_ALPHA(translate_blend_factor(rt0->alpha_src_factor)) |
-         VIVS_PE_ALPHA_CONFIG_DST_FUNC_COLOR(translate_blend_factor(rt0->rgb_dst_factor)) |
-         VIVS_PE_ALPHA_CONFIG_DST_FUNC_ALPHA(translate_blend_factor(rt0->alpha_dst_factor)) |
-         VIVS_PE_ALPHA_CONFIG_EQ_COLOR(translate_blend(rt0->rgb_func)) |
-         VIVS_PE_ALPHA_CONFIG_EQ_ALPHA(translate_blend(rt0->alpha_func));
-   } else {
-      co->PE_ALPHA_CONFIG = 0;
-   }
-
-   co->PE_LOGIC_OP =
-         VIVS_PE_LOGIC_OP_OP(so->logicop_enable ? so->logicop_func : LOGIC_OP_COPY) |
-         0x000E4000 /* ??? */;
-
-   /* independent_blend_enable not needed: only one rt supported */
-   /* XXX alpha_to_coverage / alpha_to_one? */
-   /* Set dither registers based on dither status. These registers set the
-    * dither pattern,
-    * for now, set the same values as the blob.
-    */
-   if (so->dither) {
-      co->PE_DITHER[0] = 0x6e4ca280;
-      co->PE_DITHER[1] = 0x5d7f91b3;
-   } else {
-      co->PE_DITHER[0] = 0xffffffff;
-      co->PE_DITHER[1] = 0xffffffff;
-   }
-
-   return co;
-}
-
-bool
-etna_update_blend(struct etna_context *ctx)
-{
-   struct pipe_framebuffer_state *pfb = &ctx->framebuffer_s;
-   struct pipe_blend_state *pblend = ctx->blend;
-   struct etna_blend_state *blend = etna_blend_state(pblend);
-   const struct pipe_rt_blend_state *rt0 = &pblend->rt[0];
-   uint32_t colormask;
-
-   if (pfb->cbufs[0] &&
-       translate_rs_format_rb_swap(pfb->cbufs[0]->texture->format)) {
-      colormask = rt0->colormask & (PIPE_MASK_A | PIPE_MASK_G);
-      if (rt0->colormask & PIPE_MASK_R)
-         colormask |= PIPE_MASK_B;
-      if (rt0->colormask & PIPE_MASK_B)
-         colormask |= PIPE_MASK_R;
-   } else {
-      colormask = rt0->colormask;
-   }
-
-   /* If the complete render target is written, set full_overwrite:
-    * - The color mask is 1111
-    * - No blending is used
-    */
-   bool full_overwrite = (rt0->colormask == 0xf) && !blend->enable;
-   blend->PE_COLOR_FORMAT =
-            VIVS_PE_COLOR_FORMAT_COMPONENTS(colormask) |
-            COND(full_overwrite, VIVS_PE_COLOR_FORMAT_OVERWRITE);
-
-   return true;
-}