Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com>
---
src/mesa/drivers/dri/intel/intel_buffer_objects.c | 4 ++--
src/mesa/main/api_exec.c | 2 +-
src/mesa/main/bufferobj.c | 4 ++--
src/mesa/main/bufferobj.h | 2 +-
src/mesa/main/dlist.c | 2 +-
src/mesa/main/extensions.c | 2 +-
src/mesa/main/mfeatures.h | 1 -
7 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
index e1173fe..94c3361 100644
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -694,7 +694,7 @@ intel_bufferobj_copy_subdata(struct gl_context *ctx,
intel_batchbuffer_emit_mi_flush(intel);
}
-#if FEATURE_APPLE_object_purgeable
+#if FEATURE_GL
static GLenum
intel_buffer_purgeable(drm_intel_bo *buffer)
{
@@ -835,7 +835,7 @@ intelInitBufferObjectFuncs(struct dd_function_table
*functions)
functions->UnmapBuffer = intel_bufferobj_unmap;
functions->CopyBufferSubData = intel_bufferobj_copy_subdata;
-#if FEATURE_APPLE_object_purgeable
+#if FEATURE_GL
functions->BufferObjectPurgeable = intel_buffer_object_purgeable;
functions->TextureObjectPurgeable = intel_texture_object_purgeable;
functions->RenderObjectPurgeable = intel_render_object_purgeable;
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 618815a..c74c06c 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -814,7 +814,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
SET_EGLImageTargetTexture2DOES(exec, _mesa_EGLImageTargetTexture2DOES);
SET_EGLImageTargetRenderbufferStorageOES(exec,
_mesa_EGLImageTargetRenderbufferStorageOES);
-#if FEATURE_APPLE_object_purgeable
+#if FEATURE_GL
if (ctx->API != API_OPENGLES2) {
SET_ObjectPurgeableAPPLE(exec, _mesa_ObjectPurgeableAPPLE);
SET_ObjectUnpurgeableAPPLE(exec, _mesa_ObjectUnpurgeableAPPLE);
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 9e08d84..b76d1da 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1670,7 +1670,7 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr
offset, GLsizeiptr length)
}
-#if FEATURE_APPLE_object_purgeable
+#if FEATURE_GL
static GLenum
buffer_object_purgeable(struct gl_context *ctx, GLuint name, GLenum option)
{
@@ -2045,7 +2045,7 @@ _mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint
name, GLenum pname,
}
}
-#endif /* FEATURE_APPLE_object_purgeable */
+#endif /* FEATURE_GL */
static void
set_ubo_binding(struct gl_context *ctx,
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 15fdb9c..ab76356 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -148,7 +148,7 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset,
GLsizeiptr length,
extern void GLAPIENTRY
_mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr
length);
-#if FEATURE_APPLE_object_purgeable
+#if FEATURE_GL
extern GLenum GLAPIENTRY
_mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option);
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 2bacf7d..7366722 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -10517,7 +10517,7 @@ _mesa_create_save_table(void)
SET_ProvokingVertexEXT(table, save_ProvokingVertexEXT);
/* 371. GL_APPLE_object_purgeable */
-#if FEATURE_APPLE_object_purgeable
+#if FEATURE_GL
SET_ObjectPurgeableAPPLE(table, _mesa_ObjectPurgeableAPPLE);
SET_ObjectUnpurgeableAPPLE(table, _mesa_ObjectUnpurgeableAPPLE);
SET_GetObjectParameterivAPPLE(table, _mesa_GetObjectParameterivAPPLE);
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 04cce49..6b37358 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -434,7 +434,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
#if FEATURE_GL
ctx->Extensions.ARB_sync = GL_TRUE;
#endif
-#if FEATURE_APPLE_object_purgeable
+#if FEATURE_GL
ctx->Extensions.APPLE_object_purgeable = GL_TRUE;
#endif
ctx->Extensions.ATI_envmap_bumpmap = GL_TRUE;
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index bc825e8..a315d9b 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,7 +84,6 @@
#define FEATURE_remap_table 0
#endif
-#define FEATURE_APPLE_object_purgeable FEATURE_GL
#define FEATURE_ATI_fragment_shader FEATURE_GL
#endif /* FEATURES_H */
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
