projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/st-shader-varients'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_sf.c
diff --git
a/src/mesa/drivers/dri/i965/brw_sf.c
b/src/mesa/drivers/dri/i965/brw_sf.c
index f350cbd74e6b6c3bd59c7178f0250b43f78211bd..968890f7fb19978ec727c5e10b65dc16c71a0a83 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_sf.c
+++ b/
src/mesa/drivers/dri/i965/brw_sf.c
@@
-61,7
+61,7
@@
static void compile_sf_prog( struct brw_context *brw,
c.key = *key;
c.nr_attrs = brw_count_bits(c.key.attrs);
c.nr_attr_regs = (c.nr_attrs+1)/2;
c.key = *key;
c.nr_attrs = brw_count_bits(c.key.attrs);
c.nr_attr_regs = (c.nr_attrs+1)/2;
- c.nr_setup_attrs = brw_count_bits(c.key.attrs
& DO_SETUP_BITS
);
+ c.nr_setup_attrs = brw_count_bits(c.key.attrs);
c.nr_setup_regs = (c.nr_setup_attrs+1)/2;
c.prog_data.urb_read_length = c.nr_attr_regs;
c.nr_setup_regs = (c.nr_setup_attrs+1)/2;
c.prog_data.urb_read_length = c.nr_attr_regs;
@@
-70,7
+70,7
@@
static void compile_sf_prog( struct brw_context *brw,
/* Construct map from attribute number to position in the vertex.
*/
for (i = idx = 0; i < VERT_RESULT_MAX; i++)
/* Construct map from attribute number to position in the vertex.
*/
for (i = idx = 0; i < VERT_RESULT_MAX; i++)
- if (c.key.attrs &
(1<<
i)) {
+ if (c.key.attrs &
BITFIELD64_BIT(
i)) {
c.attr_to_idx[i] = idx;
c.idx_to_attr[idx] = i;
if (i >= VERT_RESULT_TEX0 && i <= VERT_RESULT_TEX7) {
c.attr_to_idx[i] = idx;
c.idx_to_attr[idx] = i;
if (i >= VERT_RESULT_TEX0 && i <= VERT_RESULT_TEX7) {
@@
-147,7
+147,7
@@
static void upload_sf_prog(struct brw_context *brw)
* edgeflag testing here, it is already done in the clip
* program.
*/
* edgeflag testing here, it is already done in the clip
* program.
*/
- if (key.attrs &
(1<<
VERT_RESULT_EDGE))
+ if (key.attrs &
BITFIELD64_BIT(
VERT_RESULT_EDGE))
key.primitive = SF_UNFILLED_TRIS;
else
key.primitive = SF_TRIANGLES;
key.primitive = SF_UNFILLED_TRIS;
else
key.primitive = SF_TRIANGLES;