From: Eric Anholt Date: Wed, 5 Mar 2014 01:26:54 +0000 (-0800) Subject: i965: Drop special case for edgeflag thanks to Marek's change to core. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=512c88f826f597daeb8bac82eea793b4c2f90dfe;p=mesa.git i965: Drop special case for edgeflag thanks to Marek's change to core. As of 780ce576bb1781f027797039693b98253ee4813e, we end up with R8_SSCALED anyway. Reviewed-by: Kenneth Graunke --- diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index f2945c124e1..e261163e765 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) {