summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver McFadden <[email protected]>2012-09-11 11:09:35 +0300
committerOliver McFadden <[email protected]>2012-09-15 12:57:45 +0300
commitd05d5d9a919f429b9d03c76d779b5b9a102cc11d (patch)
treeca502d4187fefde0b417a0e1cb8590aec04a83b5
parent02a19684f928c4c5277913499302fb4511b15cad (diff)
mesa: remove FEATURE_ARB_sync define.
Signed-off-by: Oliver McFadden <[email protected]> Reviewed-by: Brian Paul <[email protected]>
-rw-r--r--src/mesa/main/extensions.c2
-rw-r--r--src/mesa/main/get.c4
-rw-r--r--src/mesa/main/mfeatures.h2
-rw-r--r--src/mesa/main/syncobj.c3
-rw-r--r--src/mesa/main/syncobj.h40
5 files changed, 0 insertions, 51 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 75437b32e1a..751c0f2d9cb 100644
--- 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 6800cc353ae..a3d46795e6a 100644
--- 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 e0116c687b2..8835f2366ad 100644
--- 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 9f5a27e6267..1d178950c08 100644
--- 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 50a5d11236f..40a1049ba65 100644
--- 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 */