Mesa (master): i915g: Add blitter_context argument.

Vinson Lee vlee at kemper.freedesktop.org
Thu Jun 8 20:49:49 UTC 2017


Module: Mesa
Branch: master
Commit: 142536a0e32455a485d979d11188fd861882f437
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=142536a0e32455a485d979d11188fd861882f437

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Thu Jun  8 00:15:59 2017 -0700

i915g: Add blitter_context argument.

Fix build error.

  CC       i915_surface.lo
i915_surface.c:108:63: error: too few arguments to function call, expected 4, have 3
   util_blitter_default_src_texture(&src_templ, src, src_level);
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                           ^
../../../../src/gallium/auxiliary/util/u_blitter.h:271:1: note: 'util_blitter_default_src_texture' declared here
void util_blitter_default_src_texture(struct blitter_context *blitter,
^

Fixes: a893c9169733 ("gallium/u_blitter: use 2D_ARRAY for cubemap blits if possible")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101340
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
Reviewed-by: Juan A. Suarez Romero <jasuarez at igalia.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/i915/i915_surface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/i915/i915_surface.c b/src/gallium/drivers/i915/i915_surface.c
index 27b0d9eae8..57e90c6ed2 100644
--- a/src/gallium/drivers/i915/i915_surface.c
+++ b/src/gallium/drivers/i915/i915_surface.c
@@ -105,7 +105,7 @@ i915_surface_copy_render(struct pipe_context *pipe,
       goto fallback;
 
    util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz);
-   util_blitter_default_src_texture(&src_templ, src, src_level);
+   util_blitter_default_src_texture(i915->blitter, &src_templ, src, src_level);
 
    if (!util_blitter_is_copy_supported(i915->blitter, dst, src))
       goto fallback;




More information about the mesa-commit mailing list