fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 17:58:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

vbo: move vp_mode enum to vbo_exec.h, use enum instead of GLuint

Browse source
This commit is contained in:
Brian Paul 2009-05-21 09:50:55 -06:00
parent bd0861e274
commit a1f6f82e82
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/vbo/vbo_context.h
View file

@ -92,13 +92,13 @@ static INLINE struct vbo_context *vbo_context(GLcontext *ctx)
return (struct vbo_context *)(ctx->swtnl_im);
}
enum {
VP_NONE = 1,
VP_NV,
VP_ARB
};
static INLINE GLuint get_program_mode( GLcontext *ctx )
/**
* Return VP_x token to indicate whether we're running fixed-function
* vertex transformation, an NV vertex program or ARB vertex program/shader.
*/
static INLINE enum vp_mode
get_program_mode( GLcontext *ctx )
{
if (!ctx->VertexProgram._Current)
return VP_NONE;

10
src/mesa/vbo/vbo_exec.h
View file

@ -48,6 +48,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#define ERROR_ATTRIB 16
/** Current vertex program mode */
enum vp_mode {
VP_NONE, /**< fixed function */
VP_NV, /**< NV vertex program */
VP_ARB /**< ARB vertex program or GLSL vertex shader */
};
struct vbo_exec_eval1_map {
@ -103,7 +109,7 @@ struct vbo_exec_context
* values are squashed down to the 32 attributes passed to the
* vertex program below:
*/
GLuint program_mode;
enum vp_mode program_mode;
GLuint enabled_flags;
const struct gl_client_array *inputs[VERT_ATTRIB_MAX];
} vtx;
@ -116,7 +122,7 @@ struct vbo_exec_context
} eval;
struct {
GLuint program_mode;
enum vp_mode program_mode;
GLuint enabled_flags;
GLuint array_obj;