diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-28 14:51:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-28 14:51:23 +0200 |
| commit | d2a31932bb4eaa04572dcf646a2967c638a47144 (patch) | |
| tree | 1f3acb099235f6e4f4e500030a016730f30c57a0 /mesalib/src/mesa/main/dlist.c | |
| parent | e9348e5fb751ebeba77e622af6d4241be8f1d51e (diff) | |
| parent | 6f4feafd4d22beaabfb0202e66b0dea9047ee084 (diff) | |
| download | vcxsrv-d2a31932bb4eaa04572dcf646a2967c638a47144.tar.gz vcxsrv-d2a31932bb4eaa04572dcf646a2967c638a47144.tar.bz2 vcxsrv-d2a31932bb4eaa04572dcf646a2967c638a47144.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/dlist.c')
| -rw-r--r-- | mesalib/src/mesa/main/dlist.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c index d901bddf8..52548fdc1 100644 --- a/mesalib/src/mesa/main/dlist.c +++ b/mesalib/src/mesa/main/dlist.c @@ -69,6 +69,9 @@ #if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program #include "nvprogram.h" #endif +#if FEATURE_EXT_transform_feedback +#include "transformfeedback.h" +#endif #include "math/m_matrix.h" @@ -6272,15 +6275,6 @@ save_EndTransformFeedback(void) } static void GLAPIENTRY -save_TransformFeedbackVaryings(GLuint program, GLsizei count, - const GLchar **varyings, GLenum bufferMode) -{ - GET_CURRENT_CONTEXT(ctx); - _mesa_problem(ctx, - "glTransformFeedbackVarying() display list support not done"); -} - -static void GLAPIENTRY save_BindTransformFeedback(GLenum target, GLuint name) { GET_CURRENT_CONTEXT(ctx); @@ -10321,9 +10315,14 @@ _mesa_create_save_table(void) #endif #if FEATURE_EXT_transform_feedback + /* These are not compiled into display lists: */ + SET_BindBufferBaseEXT(table, _mesa_BindBufferBase); + SET_BindBufferOffsetEXT(table, _mesa_BindBufferOffsetEXT); + SET_BindBufferRangeEXT(table, _mesa_BindBufferRange); + SET_TransformFeedbackVaryingsEXT(table, _mesa_TransformFeedbackVaryings); + /* These are: */ SET_BeginTransformFeedbackEXT(table, save_BeginTransformFeedback); SET_EndTransformFeedbackEXT(table, save_EndTransformFeedback); - SET_TransformFeedbackVaryingsEXT(table, save_TransformFeedbackVaryings); SET_BindTransformFeedback(table, save_BindTransformFeedback); SET_PauseTransformFeedback(table, save_PauseTransformFeedback); SET_ResumeTransformFeedback(table, save_ResumeTransformFeedback); |