diff options
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_copy.c | 19 | 
1 files changed, 10 insertions, 9 deletions
| diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c b/src/mesa/drivers/dri/intel/intel_tex_copy.c index 148e8c048c..ac557a9200 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_copy.c +++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c @@ -30,7 +30,8 @@  #include "main/image.h"  #include "main/teximage.h"  #include "main/mipmap.h" -#include "swrast/swrast.h" + +#include "drivers/common/meta.h"  #include "intel_screen.h"  #include "intel_context.h" @@ -215,8 +216,8 @@ intelCopyTexImage1D(GLcontext * ctx, GLenum target, GLint level,     return;   fail: -   _swrast_copy_teximage1d(ctx, target, level, internalFormat, x, y, -                           width, border); +   _mesa_meta_CopyTexImage1D(ctx, target, level, internalFormat, x, y, +                             width, border);  } @@ -263,8 +264,8 @@ intelCopyTexImage2D(GLcontext * ctx, GLenum target, GLint level,     return;   fail: -   _swrast_copy_teximage2d(ctx, target, level, internalFormat, x, y, -                           width, height, border); +   _mesa_meta_CopyTexImage2D(ctx, target, level, internalFormat, x, y, +                             width, height, border);  } @@ -288,7 +289,7 @@ intelCopyTexSubImage1D(GLcontext * ctx, GLenum target, GLint level,     if (!do_copy_texsubimage(intel_context(ctx), target,                              intel_texture_image(texImage),                              internalFormat, xoffset, 0, x, y, width, 1)) { -      _swrast_copy_texsubimage1d(ctx, target, level, xoffset, x, y, width); +      _mesa_meta_CopyTexSubImage1D(ctx, target, level, xoffset, x, y, width);     }  } @@ -314,10 +315,10 @@ intelCopyTexSubImage2D(GLcontext * ctx, GLenum target, GLint level,                              internalFormat,                              xoffset, yoffset, x, y, width, height)) { -      DBG("%s - fallback to swrast\n", __FUNCTION__); +      DBG("%s - fallback to _mesa_meta_CopyTexSubImage2D\n", __FUNCTION__); -      _swrast_copy_texsubimage2d(ctx, target, level, -                                 xoffset, yoffset, x, y, width, height); +      _mesa_meta_CopyTexSubImage2D(ctx, target, level, +                                   xoffset, yoffset, x, y, width, height);     }  } | 
