projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NV30/NV40 CMP and SCS src == dst handling
[mesa.git]
/
src
/
gallium
/
drivers
/
i965
/
brw_clip.c
diff --git
a/src/gallium/drivers/i965/brw_clip.c
b/src/gallium/drivers/i965/brw_clip.c
index 4ec7b823e834c914236e4e0eda0478828f12c4aa..d67a1a62633e03fcc7d5935202b73a63b85f49bb 100644
(file)
--- a/
src/gallium/drivers/i965/brw_clip.c
+++ b/
src/gallium/drivers/i965/brw_clip.c
@@
-81,31
+81,27
@@
compile_clip_prog( struct brw_context *brw,
else
delta = REG_SIZE;
else
delta = REG_SIZE;
- /* XXX: c.nr_attrs is very redundant:
- */
- c.nr_attrs = c.key.nr_attrs;
-
c.offset_hpos = delta + c.key.output_hpos * ATTR_SIZE;
c.offset_hpos = delta + c.key.output_hpos * ATTR_SIZE;
- if (c.key.output_color0)
+ if (c.key.output_color0
!= BRW_OUTPUT_NOT_PRESENT
)
c.offset_color0 = delta + c.key.output_color0 * ATTR_SIZE;
c.offset_color0 = delta + c.key.output_color0 * ATTR_SIZE;
- if (c.key.output_color1)
+ if (c.key.output_color1
!= BRW_OUTPUT_NOT_PRESENT
)
c.offset_color1 = delta + c.key.output_color1 * ATTR_SIZE;
c.offset_color1 = delta + c.key.output_color1 * ATTR_SIZE;
- if (c.key.output_bfc0)
+ if (c.key.output_bfc0
!= BRW_OUTPUT_NOT_PRESENT
)
c.offset_bfc0 = delta + c.key.output_bfc0 * ATTR_SIZE;
c.offset_bfc0 = delta + c.key.output_bfc0 * ATTR_SIZE;
- if (c.key.output_bfc1)
+ if (c.key.output_bfc1
!= BRW_OUTPUT_NOT_PRESENT
)
c.offset_bfc1 = delta + c.key.output_bfc1 * ATTR_SIZE;
c.offset_bfc1 = delta + c.key.output_bfc1 * ATTR_SIZE;
- if (c.key.output_edgeflag)
+ if (c.key.output_edgeflag
!= BRW_OUTPUT_NOT_PRESENT
)
c.offset_edgeflag = delta + c.key.output_edgeflag * ATTR_SIZE;
if (BRW_IS_IGDNG(brw))
c.offset_edgeflag = delta + c.key.output_edgeflag * ATTR_SIZE;
if (BRW_IS_IGDNG(brw))
- c.nr_regs = (c.nr_attrs + 1) / 2 + 3; /* are vertices packed, or reg-aligned? */
+ c.nr_regs = (c.
key.
nr_attrs + 1) / 2 + 3; /* are vertices packed, or reg-aligned? */
else
else
- c.nr_regs = (c.nr_attrs + 1) / 2 + 1; /* are vertices packed, or reg-aligned? */
+ c.nr_regs = (c.
key.
nr_attrs + 1) / 2 + 1; /* are vertices packed, or reg-aligned? */
c.nr_bytes = c.nr_regs * REG_SIZE;
c.nr_bytes = c.nr_regs * REG_SIZE;
@@
-186,7
+182,6
@@
upload_clip_prog(struct brw_context *brw)
*/
/* CACHE_NEW_VS_PROG */
key.nr_attrs = brw->vs.prog_data->nr_outputs;
*/
/* CACHE_NEW_VS_PROG */
key.nr_attrs = brw->vs.prog_data->nr_outputs;
- key.output_edgeflag = brw->vs.prog_data->output_edgeflag;
/* PIPE_NEW_VS */
key.output_hpos = vs->output_hpos;
/* PIPE_NEW_VS */
key.output_hpos = vs->output_hpos;
@@
-194,6
+189,7
@@
upload_clip_prog(struct brw_context *brw)
key.output_color1 = vs->output_color1;
key.output_bfc0 = vs->output_bfc0;
key.output_bfc1 = vs->output_bfc1;
key.output_color1 = vs->output_color1;
key.output_bfc0 = vs->output_bfc0;
key.output_bfc1 = vs->output_bfc1;
+ key.output_edgeflag = vs->output_edgeflag;
/* PIPE_NEW_CLIP */
key.nr_userclip = brw->curr.ucp.nr;
/* PIPE_NEW_CLIP */
key.nr_userclip = brw->curr.ucp.nr;