From: Marek Olšák <marek.ol...@amd.com>
This fixes piglit/gl-2.0-edgeflag.
Cc: mesa-sta...@lists.freedesktop.org
---
src/mesa/state_tracker/st_atom.c | 3 +--
src/mesa/state_tracker/st_program.c | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c
index 32ce1ea..0df1cd5 100644
--- a/src/mesa/state_tracker/st_atom.c
+++ b/src/mesa/state_tracker/st_atom.c
@@ -137,8 +137,7 @@ static void check_attrib_edgeflag(struct st_context *st)
if (!arrays)
return;
- vertDataEdgeFlags = arrays[VERT_ATTRIB_EDGEFLAG]->BufferObj &&
- arrays[VERT_ATTRIB_EDGEFLAG]->BufferObj->Name;
+ vertDataEdgeFlags = arrays[VERT_ATTRIB_EDGEFLAG]->Enabled;
if (vertDataEdgeFlags != st->vertdata_edgeflags) {
st->vertdata_edgeflags = vertDataEdgeFlags;
st->dirty.st |= ST_NEW_EDGEFLAGS_DATA;
diff --git a/src/mesa/state_tracker/st_program.c
b/src/mesa/state_tracker/st_program.c
index e9074ac..692a570 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -342,14 +342,14 @@ st_translate_vertex_program(struct st_context *st,
stvp->glsl_to_tgsi,
&stvp->Base.Base,
/* inputs */
- stvp->num_inputs,
+ vpv->num_inputs,
stvp->input_to_index,
NULL, /* input semantic name */
NULL, /* input semantic index */
NULL, /* interp mode */
NULL, /* is centroid */
/* outputs */
- stvp->num_outputs,
+ num_outputs,
stvp->result_to_output,
stvp->output_semantic_name,
stvp->output_semantic_index,
--
1.8.3.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
