mesa: remove FEATURE_ARB_sync define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 75437b32e1aa0f24e52db3f1effaf3b40116ff85..751c0f2d9cbd043fd96f21b175262cf4838984a5 100644 (file)
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -425,9 +425,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
    ctx->Extensions.ARB_texture_storage = GL_TRUE;
    ctx->Extensions.ARB_vertex_program = GL_TRUE;
    ctx->Extensions.ARB_vertex_shader = GL_TRUE;
-#if FEATURE_ARB_sync
    ctx->Extensions.ARB_sync = GL_TRUE;
-#endif
 #if FEATURE_APPLE_object_purgeable
    ctx->Extensions.APPLE_object_purgeable = GL_TRUE;
 #endif

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 6800cc353ae4ba1f70f50b074509d8acd0ad28ae..a3d46795e6abe091aa8beaa5e11a0b131862e050 100644 (file)
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -2316,7 +2316,6 @@ _mesa_GetIntegerv(GLenum pname, GLint *params)
    }
 }
 
-#if FEATURE_ARB_sync
 void GLAPIENTRY
 _mesa_GetInteger64v(GLenum pname, GLint64 *params)
 {
@@ -2411,7 +2410,6 @@ _mesa_GetInteger64v(GLenum pname, GLint64 *params)
       break;
    }
 }
-#endif /* FEATURE_ARB_sync */
 
 void GLAPIENTRY
 _mesa_GetDoublev(GLenum pname, GLdouble *params)
@@ -2684,7 +2682,6 @@ _mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params )
    }
 }
 
-#if FEATURE_ARB_sync
 void GLAPIENTRY
 _mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params )
 {
@@ -2709,7 +2706,6 @@ _mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params )
       ; /* nothing - GL error was recorded */
    }
 }
-#endif /* FEATURE_ARB_sync */
 
 #if FEATURE_ES1
 void GLAPIENTRY

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index e0116c687b252aec82c2419b9c78744dc951c0f7..8835f2366ad81fbb684741fc19df81bae48eba73 100644 (file)
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,8 +84,6 @@
 #define FEATURE_remap_table               0
 #endif
 
-#define FEATURE_ARB_sync                  FEATURE_GL
-
 #define FEATURE_EXT_framebuffer_blit      FEATURE_GL
 #define FEATURE_EXT_texture_sRGB          FEATURE_GL
 #define FEATURE_EXT_transform_feedback    FEATURE_GL

diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 9f5a27e6267b2cf34cec889aafb2eca75b28df38..1d178950c084b2e1fa200c44190b1b3c5d912817 100644 (file)
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -64,7 +64,6 @@
 #include "dispatch.h"
 #include "mtypes.h"
 
-#if FEATURE_ARB_sync
 #include "syncobj.h"
 
 static struct gl_sync_object *
@@ -426,5 +425,3 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
       *length = size;
    }
 }
-
-#endif /* FEATURE_ARB_sync */

diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h
index 50a5d11236fcc375dc21e7f7b91b0a2e2c09d620..40a1049ba657d865ae58e2c04f23ed0577c9c55d 100644 (file)
--- a/src/mesa/main/syncobj.h
+++ b/src/mesa/main/syncobj.h
@@ -39,8 +39,6 @@ struct dd_function_table;
 struct gl_context;
 struct gl_sync_object;
 
-#if FEATURE_ARB_sync
-
 extern void
 _mesa_init_sync_object_functions(struct dd_function_table *driver);
 
@@ -78,42 +76,4 @@ extern void GLAPIENTRY
 _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
                GLint *values);
 
-#else /* FEATURE_ARB_sync */
-
-#include "main/compiler.h"
-
-static inline void
-_mesa_init_sync_object_functions(struct dd_function_table *driver)
-{
-}
-
-static inline void
-_mesa_init_sync_dispatch(struct _glapi_table *disp)
-{
-}
-
-static inline void
-_mesa_init_sync(struct gl_context *ctx)
-{
-}
-
-static inline void
-_mesa_free_sync_data(struct gl_context *ctx)
-{
-}
-
-static inline void
-_mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
-{
-   ASSERT_NO_FEATURE();
-}
-
-static inline void
-_mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
-{
-   ASSERT_NO_FEATURE();
-}
-
-#endif /* FEATURE_ARB_sync */
-
 #endif /* SYNCOBJ_H */