diff options
| author | Chia-I Wu <[email protected]> | 2010-09-13 13:20:25 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-09-14 15:49:58 +0800 |
| commit | 9476efe77ff196993937c3aa2e5bca725ceb0b41 (patch) | |
| tree | b82aecc204a3726630bee176850968a3b7accd01 | |
| parent | 10ff2646a443ca3c54d66443b346eb7063973b5e (diff) | |
mesa: Remove unnecessary FEATURE tests.
Remove all FEATURE tests in mesa/drivers/common/. They are not needed
and the code looks better without them.
| -rw-r--r-- | src/mesa/drivers/common/driverfuncs.c | 16 | ||||
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 2 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index 227710fb025..f92cdc5a777 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -38,19 +38,11 @@ #include "main/teximage.h" #include "main/texobj.h" #include "main/texstore.h" -#if FEATURE_ARB_vertex_buffer_object #include "main/bufferobj.h" -#endif -#if FEATURE_EXT_framebuffer_object #include "main/fbobject.h" #include "main/texrender.h" -#endif -#if FEATURE_ARB_sync #include "main/syncobj.h" -#endif -#if FEATURE_EXT_transform_feedback #include "main/transformfeedback.h" -#endif #include "program/program.h" #include "tnl/tnl.h" @@ -187,21 +179,15 @@ _mesa_init_driver_functions(struct dd_function_table *driver) /* query objects */ _mesa_init_query_object_functions(driver); -#if FEATURE_ARB_sync _mesa_init_sync_object_functions(driver); -#endif -#if FEATURE_EXT_framebuffer_object driver->NewFramebuffer = _mesa_new_framebuffer; driver->NewRenderbuffer = _mesa_new_soft_renderbuffer; driver->RenderTexture = _mesa_render_texture; driver->FinishRenderTexture = _mesa_finish_render_texture; driver->FramebufferRenderbuffer = _mesa_framebuffer_renderbuffer; -#endif -#if FEATURE_EXT_framebuffer_blit driver->BlitFramebuffer = _swrast_BlitFramebuffer; -#endif /* APPLE_vertex_array_object */ driver->NewArrayObject = _mesa_new_array_object; @@ -210,9 +196,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver) _mesa_init_shader_object_functions(driver); -#if FEATURE_EXT_transform_feedback _mesa_init_transform_feedback_functions(driver); -#endif /* T&L stuff */ driver->NeedValidate = GL_FALSE; diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index dc6e7120c63..a03cb68ec8a 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -2583,12 +2583,10 @@ copy_tex_image(GLcontext *ctx, GLuint dims, GLenum target, GLint level, /* * Prepare for new texture image size/data */ -#if FEATURE_convolve if (_mesa_is_color_format(internalFormat)) { _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth, &postConvHeight); } -#endif if (texImage->Data) { ctx->Driver.FreeTexImageData(ctx, texImage); |