diff options
| author | Marek Olšák <[email protected]> | 2019-11-01 22:34:31 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-11-19 18:02:06 -0500 |
| commit | 2e39e8b9723cdc09a447eb0f1e9151f557c75cde (patch) | |
| tree | b7ea30a783efc3bf608199efa9133fcc6ddf1c96 /src/mesa/state_tracker/st_context.h | |
| parent | c97df7b4c75797e508e76e7f5c83526edfd3e037 (diff) | |
st/mesa: trivially merge st_vertex_program into st_common_program
a later commit will add back st_vertex_program as a subclass of
st_common_program
Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_context.h')
| -rw-r--r-- | src/mesa/state_tracker/st_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index cf2f636df6e..69f99323e34 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -246,7 +246,7 @@ struct st_context union { struct { - struct st_vertex_program *vp; /**< Currently bound vertex program */ + struct st_common_program *vp; /**< Currently bound vertex program */ struct st_common_program *tcp; /**< Currently bound tess control program */ struct st_common_program *tep; /**< Currently bound tess eval program */ struct st_common_program *gp; /**< Currently bound geometry program */ |