5 files changed, 24 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 7e21b94acc..a38ecce65b 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -27,7 +27,9 @@
 
 
 #include "main/glheader.h"
+#include "main/colortab.h"
 #include "main/context.h"
+#include "main/convolve.h"
 #include "main/arrayobj.h"
 #include "main/extensions.h"
 #include "main/framebuffer.h"
@@ -587,10 +589,8 @@ intelInitDriverFunctions(struct dd_function_table *functions)
    functions->GetString = intelGetString;
    functions->UpdateState = intelInvalidateState;
 
-   functions->CopyColorTable = _swrast_CopyColorTable;
-   functions->CopyColorSubTable = _swrast_CopyColorSubTable;
-   functions->CopyConvolutionFilter1D = _swrast_CopyConvolutionFilter1D;
-   functions->CopyConvolutionFilter2D = _swrast_CopyConvolutionFilter2D;
+   _MESA_INIT_COLORTABLE_FUNCTIONS(functions, _swrast_);
+   _MESA_INIT_CONVOLVE_FUNCTIONS(functions, _swrast_);
 
    intelInitTextureFuncs(functions);
    intelInitTextureImageFuncs(functions);
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index 804c034840..084095fc96 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -715,5 +715,7 @@ intel_fbo_init(struct intel_context *intel)
    intel->ctx.Driver.FinishRenderTexture = intel_finish_render_texture;
    intel->ctx.Driver.ResizeBuffers = intel_resize_buffers;
    intel->ctx.Driver.ValidateFramebuffer = intel_validate_framebuffer;
+#if FEATURE_EXT_framebuffer_blit
    intel->ctx.Driver.BlitFramebuffer = _mesa_meta_blit_framebuffer;
+#endif
 }
diff --git a/src/mesa/drivers/dri/intel/intel_generatemipmap.c b/src/mesa/drivers/dri/intel/intel_generatemipmap.c
index fe986092db..0052abb42d 100644
--- a/src/mesa/drivers/dri/intel/intel_generatemipmap.c
+++ b/src/mesa/drivers/dri/intel/intel_generatemipmap.c
@@ -48,7 +48,6 @@
 #include "main/hash.h"
 #include "main/mipmap.h"
 #include "main/blend.h"
-#include "glapi/dispatch.h"
 #include "swrast/swrast.h"
 
 #include "intel_screen.h"
@@ -58,6 +57,7 @@
 #include "intel_tex.h"
 #include "intel_mipmap_tree.h"
 
+#if FEATURE_attrib_stack
 static const char *intel_fp_tex2d =
       "!!ARBfp1.0\n"
       "TEX result.color, fragment.texcoord[0], texture[0], 2D;\n"
@@ -215,6 +215,7 @@ fail:
 
    return success;
 }
+#endif /* FEATURE_attrib_stack */
 
 
 /**
@@ -238,6 +239,7 @@ intel_generate_mipmap(GLcontext *ctx, GLenum target,
    GLuint nr_faces = (intelObj->base.Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;
    int face, i;
 
+#if FEATURE_attrib_stack
    /* HW path */
    if (target == GL_TEXTURE_2D &&
        ctx->Extensions.EXT_framebuffer_object &&
@@ -255,6 +257,7 @@ intel_generate_mipmap(GLcontext *ctx, GLenum target,
       if (success)
 	 return;
    }
+#endif /* FEATURE_attrib_stack */
 
    /* SW path */
    intel_tex_map_level_images(intel, intelObj, texObj->BaseLevel);
diff --git a/src/mesa/drivers/dri/intel/intel_pixel.c b/src/mesa/drivers/dri/intel/intel_pixel.c
index a300141655..b5850df9ff 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel.c
@@ -25,6 +25,8 @@
  * 
  **************************************************************************/
 
+#include "main/accum.h"
+#include "main/drawpix.h"
 #include "main/enums.h"
 #include "main/state.h"
 #include "main/bufferobj.h"
@@ -179,11 +181,9 @@ intel_check_blit_format(struct intel_region * region,
 void
 intelInitPixelFuncs(struct dd_function_table *functions)
 {
-   functions->Accum = _swrast_Accum;
+   _MESA_INIT_ACCUM_FUNCTIONS(functions, _swrast_);
    if (!getenv("INTEL_NO_BLIT")) {
-      functions->Bitmap = intelBitmap;
-      functions->CopyPixels = intelCopyPixels;
-      functions->DrawPixels = intelDrawPixels;
+      _MESA_INIT_DRAWPIX_FUNCTIONS(functions, intel);
    }
    functions->ReadPixels = intelReadPixels;
 }
diff --git a/src/mesa/drivers/dri/intel/intel_syncobj.c b/src/mesa/drivers/dri/intel/intel_syncobj.c
index 1286fe929b..b6ea56d547 100644
--- a/src/mesa/drivers/dri/intel/intel_syncobj.c
+++ b/src/mesa/drivers/dri/intel/intel_syncobj.c
@@ -45,6 +45,8 @@
 #include "intel_batchbuffer.h"
 #include "intel_reg.h"
 
+#if FEATURE_ARB_sync
+
 static struct gl_sync_object *
 intel_new_sync_object(GLcontext *ctx, GLuint id)
 {
@@ -130,3 +132,11 @@ void intel_init_syncobj_functions(struct dd_function_table *functions)
    functions->ClientWaitSync = intel_client_wait_sync;
    functions->ServerWaitSync = intel_server_wait_sync;
 }
+
+#else /* FEATURE_ARB_sync */
+
+void intel_init_syncobj_functions(struct dd_function_table *functions)
+{
+}
+
+#endif