Mesa-git.patch

   1 diff --git a/docs/news.html b/docs/news.html
   2 index 72d38ee..ce0cd0c 100644
   3 --- a/docs/news.html
   4 +++ b/docs/news.html
   5 @@ -11,6 +11,19 @@
   6  <H1>News</H1>
   7
   8
   9 +<h2>January 7, 2011</h2>
  10 +
  11 +<p>
  12 +<a href="relnotes-7.10.html">Mesa 7.10</a> (final) is released.  This is a new
  13 +development release.
  14 +</p>
  15 +
  16 +<p>
  17 +Also, <a href="relnotes-7.9.1.html">Mesa 7.9.1</a> (final) is released.
  18 +This is a bug fix release.
  19 +</p>
  20 +
  21 +
  22  <h2>October 4, 2010</h2>
  23
  24  <p>
  25 diff --git a/docs/relnotes-7.10.html b/docs/relnotes-7.10.html
  26 index 2abbc4a..3f4f229 100644
  27 --- a/docs/relnotes-7.10.html
  28 +++ b/docs/relnotes-7.10.html
  29 @@ -1,8 +1,10 @@
  30  <HTML>
  31
  32 +<head>
  33  <TITLE>Mesa Release Notes</TITLE>
  34 -
  35 -<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
  36 +<link rel="stylesheet" type="text/css" href="mesa.css">
  37 +<meta http-equiv="content-type" content="text/html; charset=utf-8" />
  38 +</head>
  39
  40  <BODY>
  41
  42 @@ -28,7 +30,12 @@ for DRI hardware acceleration.
  43
  44  <h2>MD5 checksums</h2>
  45  <pre>
  46 -tbd
  47 +0a70c15c135561824bdcae92bf232e43  MesaLib-7.10.tar.gz
  48 +33fb94eccc02cbb4d8d1365615e38e46  MesaLib-7.10.tar.bz2
  49 +5cafdc0eda0f9bf370b95c98df3338fa  MesaLib-7.10.zip
  50 +bc644be551ed585fc4f66c16b64a91c9  MesaGLUT-7.10.tar.gz
  51 +5c2677a155672352d62b177e4f0f92e8  MesaGLUT-7.10.tar.bz2
  52 +2ce5001f74496d1ba719ef74d910a5cf  MesaGLUT-7.10.zip
  53  </pre>
  54
  55
  56 diff --git a/docs/relnotes-7.9.1.html b/docs/relnotes-7.9.1.html
  57 index a46eb16..bef4ef1 100644
  58 --- a/docs/relnotes-7.9.1.html
  59 +++ b/docs/relnotes-7.9.1.html
  60 @@ -1,8 +1,10 @@
  61  <HTML>
  62
  63 +<head>
  64  <TITLE>Mesa Release Notes</TITLE>
  65 -
  66 -<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
  67 +<link rel="stylesheet" type="text/css" href="mesa.css">
  68 +<meta http-equiv="content-type" content="text/html; charset=utf-8" />
  69 +</head>
  70
  71  <BODY>
  72
  73 diff --git a/docs/relnotes.html b/docs/relnotes.html
  74 index 4487af9..036d3f8 100644
  75 --- a/docs/relnotes.html
  76 +++ b/docs/relnotes.html
  77 @@ -13,6 +13,8 @@ The release notes summarize what's new or changed in each Mesa release.
  78  </p>
  79
  80  <UL>
  81 +<LI><A HREF="relnotes-7.10.html">7.10 release notes</A>
  82 +<LI><A HREF="relnotes-7.9.1html">7.9.1 release notes</A>
  83  <LI><A HREF="relnotes-7.9.html">7.9 release notes</A>
  84  <LI><A HREF="relnotes-7.8.3.html">7.8.3 release notes</A>
  85  <LI><A HREF="relnotes-7.8.2.html">7.8.2 release notes</A>
  86 diff --git a/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h b/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h
  87 index 3f66f96..75dba8c 100644
  88 --- a/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h
  89 +++ b/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h
  90 @@ -258,9 +258,10 @@ vsplit_segment_fan_linear(struct vsplit_frontend *vsplit, unsigned flags,
  91     boolean use_spoken = ((flags & DRAW_SPLIT_BEFORE) != 0);
  92     unsigned nr = 0, i;
  93
  94 -   assert(icount + !!use_spoken <= vsplit->segment_size);
  95 +   assert(icount <= vsplit->segment_size);
  96
  97     if (use_spoken) {
  98 +      /* replace istart by i0 */
  99        vsplit->fetch_elts[nr++] = i0;
 100        for (i = 1 ; i < icount; i++)
 101           vsplit->fetch_elts[nr++] = istart + i;
 102 diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c
 103 index bee9c3b..024853c 100644
 104 --- a/src/mesa/drivers/dri/r600/r700_assembler.c
 105 +++ b/src/mesa/drivers/dri/r600/r700_assembler.c
 106 @@ -481,6 +481,8 @@ unsigned int EG_GetNumOperands(GLuint opcode, GLuint nIsOp3)
 107      case EG_OP2_INST_FLT_TO_INT:
 108      case EG_OP2_INST_SIN:
 109      case EG_OP2_INST_COS:
 110 +    case EG_OP2_INST_FLT_TO_INT_FLOOR:
 111 +    case EG_OP2_INST_MOVA_INT:
 112          return 1;
 113
 114      default: radeon_error(
 115 @@ -3297,23 +3299,76 @@ GLboolean assemble_ARL(r700_AssemblerBase *pAsm)
 116          return GL_FALSE;
 117      }
 118
 119 -    pAsm->D.dst.opcode = SQ_OP2_INST_MOVA_FLOOR;
 120 -    setaddrmode_PVSDST(&(pAsm->D.dst), ADDR_ABSOLUTE);
 121 -    pAsm->D.dst.rtype = DST_REG_TEMPORARY;
 122 -    pAsm->D.dst.reg = 0;
 123 -    pAsm->D.dst.writex = 0;
 124 -    pAsm->D.dst.writey = 0;
 125 -    pAsm->D.dst.writez = 0;
 126 -    pAsm->D.dst.writew = 0;
 127 -
 128 -    if( GL_FALSE == assemble_src(pAsm, 0, -1) )
 129 +    if(8 == pAsm->unAsic)
 130      {
 131 -        return GL_FALSE;
 132 -    }
 133 +        /* Evergreen */
 134
 135 -    if( GL_FALSE == next_ins(pAsm) )
 136 +        /* Float to Signed Integer Using FLOOR */
 137 +        pAsm->D.dst.opcode = EG_OP2_INST_FLT_TO_INT_FLOOR;
 138 +        setaddrmode_PVSDST(&(pAsm->D.dst), ADDR_ABSOLUTE);
 139 +        pAsm->D.dst.rtype = DST_REG_TEMPORARY;
 140 +        pAsm->D.dst.reg = 0;
 141 +        pAsm->D.dst.writex = 0;
 142 +        pAsm->D.dst.writey = 0;
 143 +        pAsm->D.dst.writez = 0;
 144 +        pAsm->D.dst.writew = 0;
 145 +
 146 +        if( GL_FALSE == assemble_src(pAsm, 0, -1) )
 147 +        {
 148 +            return GL_FALSE;
 149 +        }
 150 +
 151 +        if( GL_FALSE == next_ins(pAsm) )
 152 +        {
 153 +            return GL_FALSE;
 154 +        }
 155 +
 156 +        /* Copy Signed Integer To Integer in AR and GPR */
 157 +        pAsm->D.dst.opcode = EG_OP2_INST_MOVA_INT;
 158 +        setaddrmode_PVSDST(&(pAsm->D.dst), ADDR_ABSOLUTE);
 159 +        pAsm->D.dst.rtype = DST_REG_TEMPORARY;
 160 +        pAsm->D.dst.reg = 0;
 161 +        pAsm->D.dst.writex = 0;
 162 +        pAsm->D.dst.writey = 0;
 163 +        pAsm->D.dst.writez = 0;
 164 +        pAsm->D.dst.writew = 0;
 165 +
 166 +        if( GL_FALSE == assemble_src(pAsm, 0, -1) )
 167 +        {
 168 +            return GL_FALSE;
 169 +        }
 170 +
 171 +        if( GL_FALSE == next_ins(pAsm) )
 172 +        {
 173 +            return GL_FALSE;
 174 +        }
 175 +    }
 176 +    else
 177      {
 178 -        return GL_FALSE;
 179 +        /* r6xx/r7xx */
 180 +
 181 +        /* Truncate floating-point to the nearest integer
 182 +           in the range [-256, +255], and copy to AR and
 183 +           to a GPR.
 184 +        */
 185 +        pAsm->D.dst.opcode = SQ_OP2_INST_MOVA_FLOOR;
 186 +        setaddrmode_PVSDST(&(pAsm->D.dst), ADDR_ABSOLUTE);
 187 +        pAsm->D.dst.rtype = DST_REG_TEMPORARY;
 188 +        pAsm->D.dst.reg = 0;
 189 +        pAsm->D.dst.writex = 0;
 190 +        pAsm->D.dst.writey = 0;
 191 +        pAsm->D.dst.writez = 0;
 192 +        pAsm->D.dst.writew = 0;
 193 +
 194 +        if( GL_FALSE == assemble_src(pAsm, 0, -1) )
 195 +        {
 196 +            return GL_FALSE;
 197 +        }
 198 +
 199 +        if( GL_FALSE == next_ins(pAsm) )
 200 +        {
 201 +            return GL_FALSE;
 202 +        }
 203      }
 204
 205      return GL_TRUE;