Mesa (master): i965g: fix for edgeflag changes (untested)
Roland Scheidegger
sroland at kemper.freedesktop.org
Tue Dec 22 20:48:49 UTC 2009
Module: Mesa
Branch: master
Commit: d186079520234a776c3fa88c81da935d65981fec
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d186079520234a776c3fa88c81da935d65981fec
Author: Roland Scheidegger <sroland at vmware.com>
Date: Tue Dec 22 21:26:51 2009 +0100
i965g: fix for edgeflag changes (untested)
---
src/gallium/drivers/i965/brw_pipe_shader.c | 3 ---
src/gallium/drivers/i965/brw_pipe_vertex.c | 7 -------
src/gallium/drivers/i965/brw_vs.c | 14 --------------
src/gallium/drivers/i965/brw_vs.h | 3 ---
src/gallium/drivers/i965/brw_vs_emit.c | 6 ------
5 files changed, 0 insertions(+), 33 deletions(-)
diff --git a/src/gallium/drivers/i965/brw_pipe_shader.c b/src/gallium/drivers/i965/brw_pipe_shader.c
index 31a715a..20f2057 100644
--- a/src/gallium/drivers/i965/brw_pipe_shader.c
+++ b/src/gallium/drivers/i965/brw_pipe_shader.c
@@ -215,15 +215,12 @@ static void *brw_create_vs_state( struct pipe_context *pipe,
else
vs->output_bfc1 = i;
break;
-#if 0
case TGSI_SEMANTIC_EDGEFLAG:
vs->output_edgeflag = i;
break;
-#endif
}
}
-
/* Done:
*/
diff --git a/src/gallium/drivers/i965/brw_pipe_vertex.c b/src/gallium/drivers/i965/brw_pipe_vertex.c
index 3d87a28..e3c48e3 100644
--- a/src/gallium/drivers/i965/brw_pipe_vertex.c
+++ b/src/gallium/drivers/i965/brw_pipe_vertex.c
@@ -44,19 +44,12 @@ static void brw_set_vertex_buffers(struct pipe_context *pipe,
brw->state.dirty.mesa |= PIPE_NEW_VERTEX_BUFFER;
}
-static void brw_set_edgeflags( struct pipe_context *pipe,
- const unsigned *bitfield )
-{
- /* XXX */
-}
-
void
brw_pipe_vertex_init( struct brw_context *brw )
{
brw->base.set_vertex_buffers = brw_set_vertex_buffers;
brw->base.set_vertex_elements = brw_set_vertex_elements;
- brw->base.set_edgeflags = brw_set_edgeflags;
}
diff --git a/src/gallium/drivers/i965/brw_vs.c b/src/gallium/drivers/i965/brw_vs.c
index 14a1c3b..e3ea5a3 100644
--- a/src/gallium/drivers/i965/brw_vs.c
+++ b/src/gallium/drivers/i965/brw_vs.c
@@ -58,18 +58,6 @@ static enum pipe_error do_vs_prog( struct brw_context *brw,
c.prog_data.nr_outputs = vp->info.num_outputs;
c.prog_data.nr_inputs = vp->info.num_inputs;
- /* XXX: we want edgeflag handling to be integrated to the vertex
- * shader, but are currently faking the edgeflag output:
- */
- if (c.key.copy_edgeflag) {
- c.prog_data.output_edgeflag = c.prog_data.nr_outputs;
- c.prog_data.nr_outputs++;
- }
- else {
- c.prog_data.output_edgeflag = ~0;
- }
-
-
if (1)
tgsi_dump(c.vp->tokens, 0);
@@ -108,8 +96,6 @@ static enum pipe_error brw_upload_vs_prog(struct brw_context *brw)
key.program_string_id = vp->id;
key.nr_userclip = brw->curr.ucp.nr;
- key.copy_edgeflag = (brw->curr.rast->templ.fill_ccw != PIPE_POLYGON_MODE_FILL ||
- brw->curr.rast->templ.fill_cw != PIPE_POLYGON_MODE_FILL);
memcpy(&key.fs_signature, sig, brw_fs_signature_size(sig));
diff --git a/src/gallium/drivers/i965/brw_vs.h b/src/gallium/drivers/i965/brw_vs.h
index 3d1598d..944d88c 100644
--- a/src/gallium/drivers/i965/brw_vs.h
+++ b/src/gallium/drivers/i965/brw_vs.h
@@ -41,7 +41,6 @@
struct brw_vs_prog_key {
GLuint program_string_id;
GLuint nr_userclip:4;
- GLuint copy_edgeflag:1;
GLuint pad:26;
struct brw_fs_signature fs_signature;
};
@@ -66,8 +65,6 @@ struct brw_vs_compile {
GLuint nr_immediates;
GLfloat immediate[128][4];
- GLboolean copy_edgeflag;
-
GLuint overflow_grf_start;
GLuint overflow_count;
diff --git a/src/gallium/drivers/i965/brw_vs_emit.c b/src/gallium/drivers/i965/brw_vs_emit.c
index 1d0fff0..714def5 100644
--- a/src/gallium/drivers/i965/brw_vs_emit.c
+++ b/src/gallium/drivers/i965/brw_vs_emit.c
@@ -1141,12 +1141,6 @@ static void emit_vertex_write( struct brw_vs_compile *c)
int i;
GLuint len_vertext_header = 2;
- if (c->key.copy_edgeflag) {
- brw_MOV(p,
- get_reg(c, TGSI_FILE_OUTPUT, c->prog_data.output_edgeflag),
- brw_imm_f(1));
- }
-
/* Build ndc coords */
ndc = get_tmp(c);
/* ndc = 1.0 / pos.w */
More information about the mesa-commit
mailing list