diff options
| author | Marek Olšák <[email protected]> | 2019-10-16 16:46:19 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-10-17 20:31:34 -0400 |
| commit | 48b4843c30594876f03044a518159f449802959c (patch) | |
| tree | eae1aa539810552ece903e4c778360413fe9c6d5 /src/mesa/state_tracker/st_context.h | |
| parent | e94da4ab80c189eee6adc833b6fe9bc20ada1e64 (diff) | |
st/mesa: merge st_fragment_program into st_common_program
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_context.h')
| -rw-r--r-- | src/mesa/state_tracker/st_context.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index e29e1ed713f..4a265c49e5f 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -50,7 +50,7 @@ struct draw_context; struct draw_stage; struct gen_mipmap_state; struct st_context; -struct st_fragment_program; +struct st_common_program; struct st_perf_monitor_group; struct u_upload_mgr; @@ -234,7 +234,7 @@ struct st_context unsigned active_queries; struct st_vertex_program *vp; /**< Currently bound vertex program */ - struct st_fragment_program *fp; /**< Currently bound fragment program */ + struct st_common_program *fp; /**< Currently bound fragment program */ struct st_common_program *gp; /**< Currently bound geometry program */ struct st_common_program *tcp; /**< Currently bound tess control program */ struct st_common_program *tep; /**< Currently bound tess eval program */ |