Mesa (master): st/mesa: remove st_context::vertex_result_to_slot
Marek Olšák
mareko at kemper.freedesktop.org
Mon May 8 16:37:08 UTC 2017
Module: Mesa
Branch: master
Commit: 7c44810cc08e4809c5d6985c76335c3b7ebc104b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c44810cc08e4809c5d6985c76335c3b7ebc104b
Author: Marek Olšák <marek.olsak at amd.com>
Date: Sun Apr 30 15:45:18 2017 +0200
st/mesa: remove st_context::vertex_result_to_slot
Tested-by: Edmondo Tommasina <edmondo.tommasina at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
---
src/mesa/state_tracker/st_atom_shader.c | 2 --
src/mesa/state_tracker/st_cb_feedback.c | 4 ++--
src/mesa/state_tracker/st_cb_rasterpos.c | 3 ++-
src/mesa/state_tracker/st_context.h | 3 ---
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index 0a72d14817..091cbe01a0 100644
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/src/mesa/state_tracker/st_atom_shader.c
@@ -179,8 +179,6 @@ st_update_vp( struct st_context *st )
cso_set_vertex_shader_handle(st->cso_context,
st->vp_variant->driver_shader);
-
- st->vertex_result_to_slot = stvp->result_to_output;
}
diff --git a/src/mesa/state_tracker/st_cb_feedback.c b/src/mesa/state_tracker/st_cb_feedback.c
index 7f383ebce7..2ca2defc0f 100644
--- a/src/mesa/state_tracker/st_cb_feedback.c
+++ b/src/mesa/state_tracker/st_cb_feedback.c
@@ -99,13 +99,13 @@ feedback_vertex(struct gl_context *ctx, const struct draw_context *draw,
* color and texcoord attribs to use here.
*/
- slot = st->vertex_result_to_slot[VARYING_SLOT_COL0];
+ slot = st->vp->result_to_output[VARYING_SLOT_COL0];
if (slot != ~0U)
color = v->data[slot];
else
color = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
- slot = st->vertex_result_to_slot[VARYING_SLOT_TEX0];
+ slot = st->vp->result_to_output[VARYING_SLOT_TEX0];
if (slot != ~0U)
texcoord = v->data[slot];
else
diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c
index c55b62437a..e266296a77 100644
--- a/src/mesa/state_tracker/st_cb_rasterpos.c
+++ b/src/mesa/state_tracker/st_cb_rasterpos.c
@@ -44,6 +44,7 @@
#include "st_context.h"
#include "st_atom.h"
#include "st_draw.h"
+#include "st_program.h"
#include "st_cb_rasterpos.h"
#include "draw/draw_context.h"
#include "draw/draw_pipe.h"
@@ -134,7 +135,7 @@ rastpos_point(struct draw_stage *stage, struct prim_header *prim)
struct gl_context *ctx = rs->ctx;
struct st_context *st = st_context(ctx);
const GLfloat height = (GLfloat) ctx->DrawBuffer->Height;
- const ubyte *outputMapping = st->vertex_result_to_slot;
+ const ubyte *outputMapping = st->vp->result_to_output;
const GLfloat *pos;
GLuint i;
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index d02c6f805f..f1b38fc36e 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -170,9 +170,6 @@ struct st_context
GLboolean vertdata_edgeflags;
GLboolean edgeflag_culls_prims;
- /** Mapping from VARYING_SLOT_x to post-transformed vertex slot */
- const ubyte *vertex_result_to_slot;
-
struct st_vertex_program *vp; /**< Currently bound vertex program */
struct st_fragment_program *fp; /**< Currently bound fragment program */
struct st_geometry_program *gp; /**< Currently bound geometry program */
More information about the mesa-commit
mailing list