Mesa (i965g-restart): i965g rename offset_edge to offset_edgeflag
Keith Whitwell
keithw at kemper.freedesktop.org
Wed Nov 18 04:22:34 UTC 2009
Module: Mesa
Branch: i965g-restart
Commit: d299ee771b577a8ce839861d1af336fc316e0a1d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d299ee771b577a8ce839861d1af336fc316e0a1d
Author: Keith Whitwell <keithw at vmware.com>
Date: Sun Nov 15 11:47:57 2009 -0800
i965g rename offset_edge to offset_edgeflag
---
src/gallium/drivers/i965/brw_clip.h | 2 +-
src/gallium/drivers/i965/brw_clip_unfilled.c | 10 +++++-----
src/gallium/drivers/i965/brw_clip_util.c | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/gallium/drivers/i965/brw_clip.h b/src/gallium/drivers/i965/brw_clip.h
index 772c34b..9bec964 100644
--- a/src/gallium/drivers/i965/brw_clip.h
+++ b/src/gallium/drivers/i965/brw_clip.h
@@ -132,7 +132,7 @@ struct brw_clip_compile {
GLuint offset_bfc0;
GLuint offset_bfc1;
- GLuint offset_edge;
+ GLuint offset_edgeflag;
};
#define ATTR_SIZE (4*4)
diff --git a/src/gallium/drivers/i965/brw_clip_unfilled.c b/src/gallium/drivers/i965/brw_clip_unfilled.c
index 1cb86dd..0fab3a5 100644
--- a/src/gallium/drivers/i965/brw_clip_unfilled.c
+++ b/src/gallium/drivers/i965/brw_clip_unfilled.c
@@ -214,12 +214,12 @@ static void merge_edgeflags( struct brw_clip_compile *c )
{
brw_set_conditionalmod(p, BRW_CONDITIONAL_EQ);
brw_AND(p, vec1(brw_null_reg()), get_element_ud(c->reg.R0, 2), brw_imm_ud(1<<8));
- brw_MOV(p, byte_offset(c->reg.vertex[0], c->offset_edge), brw_imm_f(0));
+ brw_MOV(p, byte_offset(c->reg.vertex[0], c->offset_edgeflag), brw_imm_f(0));
brw_set_predicate_control(p, BRW_PREDICATE_NONE);
brw_set_conditionalmod(p, BRW_CONDITIONAL_EQ);
brw_AND(p, vec1(brw_null_reg()), get_element_ud(c->reg.R0, 2), brw_imm_ud(1<<9));
- brw_MOV(p, byte_offset(c->reg.vertex[2], c->offset_edge), brw_imm_f(0));
+ brw_MOV(p, byte_offset(c->reg.vertex[2], c->offset_edgeflag), brw_imm_f(0));
brw_set_predicate_control(p, BRW_PREDICATE_NONE);
}
brw_ENDIF(p, is_poly);
@@ -290,7 +290,7 @@ static void emit_lines(struct brw_clip_compile *c,
/* draw edge if edgeflag != 0 */
brw_CMP(p,
vec1(brw_null_reg()), BRW_CONDITIONAL_NZ,
- deref_1f(v0, c->offset_edge),
+ deref_1f(v0, c->offset_edgeflag),
brw_imm_f(0));
draw_edge = brw_IF(p, BRW_EXECUTE_1);
{
@@ -329,7 +329,7 @@ static void emit_points(struct brw_clip_compile *c,
*/
brw_CMP(p,
vec1(brw_null_reg()), BRW_CONDITIONAL_NZ,
- deref_1f(v0, c->offset_edge),
+ deref_1f(v0, c->offset_edgeflag),
brw_imm_f(0));
draw_point = brw_IF(p, BRW_EXECUTE_1);
{
@@ -446,7 +446,7 @@ void brw_emit_unfilled_clip( struct brw_clip_compile *c )
brw_clip_tri_init_vertices(c);
brw_clip_init_ff_sync(c);
- assert(c->offset_edge);
+ assert(c->offset_edgeflag);
if (c->key.fill_ccw == CLIP_CULL &&
c->key.fill_cw == CLIP_CULL) {
diff --git a/src/gallium/drivers/i965/brw_clip_util.c b/src/gallium/drivers/i965/brw_clip_util.c
index f8f98c8..018511e 100644
--- a/src/gallium/drivers/i965/brw_clip_util.c
+++ b/src/gallium/drivers/i965/brw_clip_util.c
@@ -146,7 +146,7 @@ void brw_clip_interp_vertex( struct brw_clip_compile *c,
if (c->chipset.is_igdng)
delta = i * 16 + 32 * 3;
- if (delta == c->offset_edge) {
+ if (delta == c->offset_edgeflag) {
if (force_edgeflag)
brw_MOV(p, deref_4f(dest_ptr, delta), brw_imm_f(1));
else
More information about the mesa-commit
mailing list