summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker/st_program.h
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-10-19 11:59:12 +1100
committerTimothy Arceri <[email protected]>2016-10-26 14:29:36 +1100
commit92f77e9c01085c6babe6ce80dfe4e0e7abab61a1 (patch)
treeecea28bd6506ea75c1e980ea688f684a97822226 /src/mesa/state_tracker/st_program.h
parent9045ddcfe4ed2ecc6220db69dc33d6049956b99b (diff)
i965/mesa/st: eliminate gl_geometry_program
We now get all the gs metadata from shader_info. Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_program.h')
-rw-r--r--src/mesa/state_tracker/st_program.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index daea78128ef..ab01d7ba8d0 100644
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -246,11 +246,11 @@ struct st_basic_variant
/**
- * Derived from Mesa gl_geometry_program:
+ * Derived from Mesa gl_program:
*/
struct st_geometry_program
{
- struct gl_geometry_program Base; /**< The Mesa geometry program */
+ struct gl_program Base; /**< The Mesa geometry program */
struct pipe_shader_state tgsi;
struct glsl_to_tgsi_visitor* glsl_to_tgsi;
uint64_t affected_states; /**< ST_NEW_* flags to mark dirty when binding */
@@ -315,7 +315,7 @@ st_vertex_program( struct gl_vertex_program *vp )
}
static inline struct st_geometry_program *
-st_geometry_program( struct gl_geometry_program *gp )
+st_geometry_program( struct gl_program *gp )
{
return (struct st_geometry_program *)gp;
}