Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com>
---
src/mesa/main/extensions.c | 2 +-
src/mesa/main/get.c | 8 ++++----
src/mesa/main/mfeatures.h | 2 --
src/mesa/main/syncobj.c | 4 ++--
src/mesa/main/syncobj.h | 6 +++---
5 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 028701e..2317001 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -431,7 +431,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
+#if FEATURE_GL
ctx->Extensions.ARB_sync = GL_TRUE;
#endif
#if FEATURE_APPLE_object_purgeable
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 24d2a18..1b40507 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -2313,7 +2313,7 @@ _mesa_GetIntegerv(GLenum pname, GLint *params)
}
}
-#if FEATURE_ARB_sync
+#if FEATURE_GL
void GLAPIENTRY
_mesa_GetInteger64v(GLenum pname, GLint64 *params)
{
@@ -2408,7 +2408,7 @@ _mesa_GetInteger64v(GLenum pname, GLint64 *params)
break;
}
}
-#endif /* FEATURE_ARB_sync */
+#endif /* FEATURE_GL */
void GLAPIENTRY
_mesa_GetDoublev(GLenum pname, GLdouble *params)
@@ -2681,7 +2681,7 @@ _mesa_GetIntegerIndexedv( GLenum pname, GLuint index,
GLint *params )
}
}
-#if FEATURE_ARB_sync
+#if FEATURE_GL
void GLAPIENTRY
_mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params )
{
@@ -2706,7 +2706,7 @@ _mesa_GetInteger64Indexedv( GLenum pname, GLuint index,
GLint64 *params )
; /* nothing - GL error was recorded */
}
}
-#endif /* FEATURE_ARB_sync */
+#endif /* FEATURE_GL */
#if FEATURE_ES1
void GLAPIENTRY
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index e0116c6..8835f23 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 9f5a27e..b4b7a7a 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -64,7 +64,7 @@
#include "dispatch.h"
#include "mtypes.h"
-#if FEATURE_ARB_sync
+#if FEATURE_GL
#include "syncobj.h"
static struct gl_sync_object *
@@ -427,4 +427,4 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize,
GLsizei *length,
}
}
-#endif /* FEATURE_ARB_sync */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h
index 50a5d11..d665a85 100644
--- a/src/mesa/main/syncobj.h
+++ b/src/mesa/main/syncobj.h
@@ -39,7 +39,7 @@ struct dd_function_table;
struct gl_context;
struct gl_sync_object;
-#if FEATURE_ARB_sync
+#if FEATURE_GL
extern void
_mesa_init_sync_object_functions(struct dd_function_table *driver);
@@ -78,7 +78,7 @@ extern void GLAPIENTRY
_mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
GLint *values);
-#else /* FEATURE_ARB_sync */
+#else /* FEATURE_GL */
#include "main/compiler.h"
@@ -114,6 +114,6 @@ _mesa_unref_sync_object(struct gl_context *ctx, struct
gl_sync_object *syncObj)
ASSERT_NO_FEATURE();
}
-#endif /* FEATURE_ARB_sync */
+#endif /* FEATURE_GL */
#endif /* SYNCOBJ_H */
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
