[Mesa-dev] i965: Drop special case for edgeflag thanks to Marek's change to core.

Submitted by Eric Anholt on March 17, 2014, 9:54 p.m.

Details

Message ID 1395093242-6445-1-git-send-email-eric@anholt.net
State New
Headers show

Not browsing as part of any series.

Commit Message

Eric Anholt March 17, 2014, 9:54 p.m.
---
 src/mesa/drivers/dri/i965/brw_draw_upload.c | 9 ---------
 1 file changed, 9 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index d42c074..d08e56a 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -717,12 +717,6 @@  static void brw_emit_vertices(struct brw_context *brw)
       uint32_t comp2 = BRW_VE1_COMPONENT_STORE_SRC;
       uint32_t comp3 = BRW_VE1_COMPONENT_STORE_SRC;
 
-      /* The gen4 driver expects edgeflag to come in as a float, and passes
-       * that float on to the tests in the clipper.  Mesa's current vertex
-       * attribute value for EdgeFlag is stored as a float, which works out.
-       * glEdgeFlagPointer, on the other hand, gives us an unnormalized
-       * integer ubyte.  Just rewrite that to convert to a float.
-       */
       if (input->attrib == VERT_ATTRIB_EDGEFLAG) {
          /* Gen6+ passes edgeflag as sideband along with the vertex, instead
           * of in the VUE.  We have to upload it sideband as the last vertex
@@ -732,9 +726,6 @@  static void brw_emit_vertices(struct brw_context *brw)
             gen6_edgeflag_input = input;
             continue;
          }
-
-         if (format == BRW_SURFACEFORMAT_R8_UINT)
-            format = BRW_SURFACEFORMAT_R8_SSCALED;
       }
 
       switch (input->glarray->Size) {

Comments

On 17 March 2014 14:54, Eric Anholt <eric@anholt.net> wrote:

> ---
>  src/mesa/drivers/dri/i965/brw_draw_upload.c | 9 ---------
>  1 file changed, 9 deletions(-)
>

For future cross-referencing it would be nice to mention the SHA of Marek's
change in the commit message.


>
> diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c
> b/src/mesa/drivers/dri/i965/brw_draw_upload.c
> index d42c074..d08e56a 100644
> --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
> +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
> @@ -717,12 +717,6 @@ static void brw_emit_vertices(struct brw_context *brw)
>        uint32_t comp2 = BRW_VE1_COMPONENT_STORE_SRC;
>        uint32_t comp3 = BRW_VE1_COMPONENT_STORE_SRC;
>
> -      /* The gen4 driver expects edgeflag to come in as a float, and
> passes
> -       * that float on to the tests in the clipper.  Mesa's current vertex
> -       * attribute value for EdgeFlag is stored as a float, which works
> out.
> -       * glEdgeFlagPointer, on the other hand, gives us an unnormalized
> -       * integer ubyte.  Just rewrite that to convert to a float.
> -       */
>        if (input->attrib == VERT_ATTRIB_EDGEFLAG) {
>           /* Gen6+ passes edgeflag as sideband along with the vertex,
> instead
>            * of in the VUE.  We have to upload it sideband as the last
> vertex
> @@ -732,9 +726,6 @@ static void brw_emit_vertices(struct brw_context *brw)
>              gen6_edgeflag_input = input;
>              continue;
>           }
> -
> -         if (format == BRW_SURFACEFORMAT_R8_UINT)
> -            format = BRW_SURFACEFORMAT_R8_SSCALED;
>        }
>
>        switch (input->glarray->Size) {
> --
> 1.9.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
On 03/17/2014 03:03 PM, Paul Berry wrote:
> On 17 March 2014 14:54, Eric Anholt <eric@anholt.net
> <mailto:eric@anholt.net>> wrote:
> 
>     ---
>      src/mesa/drivers/dri/i965/brw_draw_upload.c | 9 ---------
>      1 file changed, 9 deletions(-)
> 
> 
> For future cross-referencing it would be nice to mention the SHA of
> Marek's change in the commit message.

Agreed.  I'm guessing that's 780ce576bb1781f027797039693b98253ee4813e.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>