diff options
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_buffer_objects.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/api_exec.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/bufferobj.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/bufferobj.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/dlist.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/extensions.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/mfeatures.h | 1 |
7 files changed, 0 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c index e1173fe79a2..f94c6f570ff 100644 --- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c +++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c @@ -694,7 +694,6 @@ intel_bufferobj_copy_subdata(struct gl_context *ctx, intel_batchbuffer_emit_mi_flush(intel); } -#if FEATURE_APPLE_object_purgeable static GLenum intel_buffer_purgeable(drm_intel_bo *buffer) { @@ -820,7 +819,6 @@ intel_render_object_unpurgeable(struct gl_context * ctx, return intel_buffer_unpurgeable(intel->mt->region->bo); } -#endif void intelInitBufferObjectFuncs(struct dd_function_table *functions) @@ -835,7 +833,6 @@ intelInitBufferObjectFuncs(struct dd_function_table *functions) functions->UnmapBuffer = intel_bufferobj_unmap; functions->CopyBufferSubData = intel_bufferobj_copy_subdata; -#if FEATURE_APPLE_object_purgeable functions->BufferObjectPurgeable = intel_buffer_object_purgeable; functions->TextureObjectPurgeable = intel_texture_object_purgeable; functions->RenderObjectPurgeable = intel_render_object_purgeable; @@ -843,5 +840,4 @@ intelInitBufferObjectFuncs(struct dd_function_table *functions) functions->BufferObjectUnpurgeable = intel_buffer_object_unpurgeable; functions->TextureObjectUnpurgeable = intel_texture_object_unpurgeable; functions->RenderObjectUnpurgeable = intel_render_object_unpurgeable; -#endif } diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index 2f3d1d1b2f1..1da041545ed 100644 --- a/src/mesa/main/api_exec.c +++ b/src/mesa/main/api_exec.c @@ -790,13 +790,11 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_EGLImageTargetTexture2DOES(exec, _mesa_EGLImageTargetTexture2DOES); SET_EGLImageTargetRenderbufferStorageOES(exec, _mesa_EGLImageTargetRenderbufferStorageOES); -#if FEATURE_APPLE_object_purgeable if (ctx->API != API_OPENGLES2) { SET_ObjectPurgeableAPPLE(exec, _mesa_ObjectPurgeableAPPLE); SET_ObjectUnpurgeableAPPLE(exec, _mesa_ObjectUnpurgeableAPPLE); SET_GetObjectParameterivAPPLE(exec, _mesa_GetObjectParameterivAPPLE); } -#endif if (ctx->API != API_OPENGLES2) { SET_FramebufferTextureARB(exec, _mesa_FramebufferTextureARB); diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index f8355a48b8c..0fc27e4ba87 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -1668,7 +1668,6 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length) } -#if FEATURE_APPLE_object_purgeable static GLenum buffer_object_purgeable(struct gl_context *ctx, GLuint name, GLenum option) { @@ -2043,8 +2042,6 @@ _mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, } } -#endif /* FEATURE_APPLE_object_purgeable */ - static void set_ubo_binding(struct gl_context *ctx, int index, diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h index 15fdb9c305b..4f1e61b63b1 100644 --- a/src/mesa/main/bufferobj.h +++ b/src/mesa/main/bufferobj.h @@ -148,7 +148,6 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, extern void GLAPIENTRY _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length); -#if FEATURE_APPLE_object_purgeable extern GLenum GLAPIENTRY _mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option); @@ -157,7 +156,6 @@ _mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option); extern void GLAPIENTRY _mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, GLint* params); -#endif void GLAPIENTRY _mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer); diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index bec8ff1553b..7ed966556e3 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -10473,11 +10473,9 @@ _mesa_create_save_table(void) SET_ProvokingVertexEXT(table, save_ProvokingVertexEXT); /* 371. GL_APPLE_object_purgeable */ -#if FEATURE_APPLE_object_purgeable SET_ObjectPurgeableAPPLE(table, _mesa_ObjectPurgeableAPPLE); SET_ObjectUnpurgeableAPPLE(table, _mesa_ObjectUnpurgeableAPPLE); SET_GetObjectParameterivAPPLE(table, _mesa_GetObjectParameterivAPPLE); -#endif /* GL_EXT_texture_integer */ SET_ClearColorIiEXT(table, save_ClearColorIi); diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 08061ca6b86..c7ab086b0aa 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -426,9 +426,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx) ctx->Extensions.ARB_vertex_program = GL_TRUE; ctx->Extensions.ARB_vertex_shader = GL_TRUE; ctx->Extensions.ARB_sync = GL_TRUE; -#if FEATURE_APPLE_object_purgeable ctx->Extensions.APPLE_object_purgeable = GL_TRUE; -#endif ctx->Extensions.ATI_envmap_bumpmap = GL_TRUE; #if FEATURE_ATI_fragment_shader ctx->Extensions.ATI_fragment_shader = GL_TRUE; diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index bc825e8e547..a315d9b419e 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 */ |