[Mesa-dev] [PATCH] i965/fs: Remove unused count from vs urb setup

[Ben Widawsky]

This was originally removed here:
commit 031d3501322aee0a1474c7f2a9b79f9fa9947430
Author: Kenneth Graunke 
Date:   Tue Aug 25 16:59:12 2015 -0700

i965/vs: Unify URB entry size/read length calculations between backends.

Then added back:
commit bd198b9f0a292a9ff4ec3a29bad23d62caba
Author: Kenneth Graunke 
Date:   Fri Aug 14 16:01:33 2015 -0700

i965/vs: Simplify fs_visitor's ATTR file.

Note that the authorship dates are out of order, but the above reflects the
order of the commit dates.

Cc: Kenneth Graunke 
Signed-off-by: Ben Widawsky 
---
 src/mesa/drivers/dri/i965/brw_fs.cpp | 6 --
 1 file changed, 6 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp 
b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 05f335e..cbeab6f 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -1670,12 +1670,6 @@ fs_visitor::assign_vs_urb_setup()
brw_vs_prog_data *vs_prog_data = (brw_vs_prog_data *) prog_data;
 
assert(stage == MESA_SHADER_VERTEX);
-   int count = _mesa_bitcount_64(vs_prog_data->inputs_read);
-   if (vs_prog_data->uses_vertexid || vs_prog_data->uses_instanceid ||
-   vs_prog_data->uses_basevertex || vs_prog_data->uses_baseinstance)
-  count++;
-   if (vs_prog_data->uses_drawid)
-  count++;
 
/* Each attribute is 4 regs. */
this->first_non_payload_grf += 4 * vs_prog_data->nr_attributes;
-- 
2.7.0

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] i965/fs: Remove unused count from vs urb setup

[Kenneth Graunke]

On Thursday, January 21, 2016 11:05:55 AM PST Ben Widawsky wrote:
> This was originally removed here:
> commit 031d3501322aee0a1474c7f2a9b79f9fa9947430
> Author: Kenneth Graunke 
> Date:   Tue Aug 25 16:59:12 2015 -0700
> 
> i965/vs: Unify URB entry size/read length calculations between backends.
> 
> Then added back:
> commit bd198b9f0a292a9ff4ec3a29bad23d62caba
> Author: Kenneth Graunke 
> Date:   Fri Aug 14 16:01:33 2015 -0700
> 
> i965/vs: Simplify fs_visitor's ATTR file.
> 
> Note that the authorship dates are out of order, but the above reflects the
> order of the commit dates.
> 
> Cc: Kenneth Graunke 
> Signed-off-by: Ben Widawsky 
> ---
>  src/mesa/drivers/dri/i965/brw_fs.cpp | 6 --
>  1 file changed, 6 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/
i965/brw_fs.cpp
> index 05f335e..cbeab6f 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
> @@ -1670,12 +1670,6 @@ fs_visitor::assign_vs_urb_setup()
> brw_vs_prog_data *vs_prog_data = (brw_vs_prog_data *) prog_data;
>  
> assert(stage == MESA_SHADER_VERTEX);
> -   int count = _mesa_bitcount_64(vs_prog_data->inputs_read);
> -   if (vs_prog_data->uses_vertexid || vs_prog_data->uses_instanceid ||
> -   vs_prog_data->uses_basevertex || vs_prog_data->uses_baseinstance)
> -  count++;
> -   if (vs_prog_data->uses_drawid)
> -  count++;
>  
> /* Each attribute is 4 regs. */
> this->first_non_payload_grf += 4 * vs_prog_data->nr_attributes;
> 

Oops.  Sounds like rebase fail.  Thanks, Ben.

Reviewed-by: Kenneth Graunke 


signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev