diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-03-02 13:27:46 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-03-02 13:27:46 +0000 |
| commit | 97a1fd158c9acfaa3a8deda7eb5bf0b253e85c15 (patch) | |
| tree | 37e6c11507c1ef044aa8f0ee009136bb1d8b5bbc /src/mesa/main/feedback.h | |
| parent | 60e5fe65067da76dea816535bec1e9073adc0ba7 (diff) | |
| parent | b70f344e223fc10df8df08a6d82a813505225712 (diff) | |
Merge commit 'origin/master' into gallium-map-range
Diffstat (limited to 'src/mesa/main/feedback.h')
| -rw-r--r-- | src/mesa/main/feedback.h | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h index 6c448ad631..72c2acd5ed 100644 --- a/src/mesa/main/feedback.h +++ b/src/mesa/main/feedback.h @@ -1,13 +1,9 @@ -/** - * \file feedback.h - * Selection and feedback modes functions. - */ - /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 7.5 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. + * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -27,7 +23,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - #ifndef FEEDBACK_H #define FEEDBACK_H @@ -35,23 +30,29 @@ #include "mtypes.h" -#define FEEDBACK_TOKEN( CTX, T ) \ - if (CTX->Feedback.Count < CTX->Feedback.BufferSize) { \ - CTX->Feedback.Buffer[CTX->Feedback.Count] = (GLfloat) (T); \ - } \ - CTX->Feedback.Count++; +extern void +_mesa_init_feedback( GLcontext *ctx ); +extern void +_mesa_feedback_vertex( GLcontext *ctx, + const GLfloat win[4], + const GLfloat color[4], + GLfloat index, + const GLfloat texcoord[4] ); -extern void _mesa_init_feedback( GLcontext * ctx ); -extern void _mesa_feedback_vertex( GLcontext *ctx, - const GLfloat win[4], - const GLfloat color[4], - GLfloat index, - const GLfloat texcoord[4] ); +static INLINE void +_mesa_feedback_token( GLcontext *ctx, GLfloat token ) +{ + if (ctx->Feedback.Count < ctx->Feedback.BufferSize) { + ctx->Feedback.Buffer[ctx->Feedback.Count] = token; + } + ctx->Feedback.Count++; +} -extern void _mesa_update_hitflag( GLcontext *ctx, GLfloat z ); +extern void +_mesa_update_hitflag( GLcontext *ctx, GLfloat z ); extern void GLAPIENTRY |