diff options
author | marha <marha@users.sourceforge.net> | 2012-09-17 16:16:11 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-09-17 16:16:11 +0200 |
commit | c72f683c50e774b21967f0121245a286539fa555 (patch) | |
tree | fa5e86f04a33b8bcebf937d1966052ccf1fefbeb /mesalib/src/mesa/vbo/vbo_noop.c | |
parent | 86fb7e4a298199b30bd16565569a9b3dfe7a1f11 (diff) | |
parent | e3c4aa34268f99562e66b43a7d9efcd16ca072e6 (diff) | |
download | vcxsrv-c72f683c50e774b21967f0121245a286539fa555.tar.gz vcxsrv-c72f683c50e774b21967f0121245a286539fa555.tar.bz2 vcxsrv-c72f683c50e774b21967f0121245a286539fa555.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/syncobj.h
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/mesa/vbo/vbo_noop.c')
-rw-r--r-- | mesalib/src/mesa/vbo/vbo_noop.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_noop.c b/mesalib/src/mesa/vbo/vbo_noop.c index 2f472c21c..2f2200219 100644 --- a/mesalib/src/mesa/vbo/vbo_noop.c +++ b/mesalib/src/mesa/vbo/vbo_noop.c @@ -37,9 +37,6 @@ #include "main/mfeatures.h" #include "vbo/vbo_noop.h" -#if FEATURE_beginend - - static void GLAPIENTRY _mesa_noop_EdgeFlag(GLboolean b) { @@ -304,8 +301,6 @@ _mesa_noop_Vertex4f(GLfloat a, GLfloat b, GLfloat c, GLfloat d) { } - -#if FEATURE_evaluators static void GLAPIENTRY _mesa_noop_EvalCoord1f(GLfloat a) { @@ -335,8 +330,6 @@ static void GLAPIENTRY _mesa_noop_EvalPoint2(GLint a, GLint b) { } -#endif /* FEATURE_evaluators */ - static void GLAPIENTRY _mesa_noop_Begin(GLenum mode) @@ -514,6 +507,3 @@ _mesa_using_noop_vtxfmt(const struct _glapi_table *dispatch) { return GET_Begin((struct _glapi_table *) dispatch) == _mesa_noop_Begin; } - - -#endif /* FEATURE_beginend */ |