diff options
| author | Brian Paul <[email protected]> | 2018-01-19 21:03:07 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2018-01-29 08:35:14 -0700 |
| commit | b080fc6199cd47ff2da632521b5baf52e747745f (patch) | |
| tree | 7b23aa219059b09b6a6b0ddf4c2920fd032de834 /src/mesa/vbo/vbo_exec_draw.c | |
| parent | 35e0ff5bd5cf4e8c5755b0f93cc739a4b68b91e1 (diff) | |
vbo: move, rename vp_mode enums, get_program_mode() function
Instead of NONE/ARB use FF/SHADER. Move the enum declaration to
vbo_private.h where it's used.
Reviewed-by: Mathias Fröhlich <[email protected]>
Diffstat (limited to 'src/mesa/vbo/vbo_exec_draw.c')
| -rw-r--r-- | src/mesa/vbo/vbo_exec_draw.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c index 653a05ad0f4..5cea7fe8793 100644 --- a/src/mesa/vbo/vbo_exec_draw.c +++ b/src/mesa/vbo/vbo_exec_draw.c @@ -185,8 +185,9 @@ vbo_exec_bind_arrays(struct gl_context *ctx) } /* Overlay other active attributes */ - switch (get_program_mode(exec->ctx)) { - case VP_NONE: + switch (get_vp_mode(exec->ctx)) { + case VP_FF: + /* Point the generic attributes at the legacy material values */ for (attr = 0; attr < MAT_ATTRIB_MAX; attr++) { assert(VERT_ATTRIB_GENERIC(attr) < ARRAY_SIZE(exec->vtx.inputs)); exec->vtx.inputs[VERT_ATTRIB_GENERIC(attr)] = @@ -194,7 +195,7 @@ vbo_exec_bind_arrays(struct gl_context *ctx) } map = vbo->map_vp_none; break; - case VP_ARB: + case VP_SHADER: for (attr = 0; attr < VERT_ATTRIB_GENERIC_MAX; attr++) { assert(VERT_ATTRIB_GENERIC(attr) < ARRAY_SIZE(exec->vtx.inputs)); exec->vtx.inputs[VERT_ATTRIB_GENERIC(attr)] = |