Skip to content

Commit

Permalink
mesa: Fix patch fuzz
Browse files Browse the repository at this point in the history
Fixes
ERROR: mesa-2_20.0.1-r0 do_patch: Fuzz detected:

Applying patch 0001-dri2-query-dma-buf-modifiers.patch
patching file src/gallium/state_trackers/dri/dri2.c
Hunk #1 succeeded at 1366 with fuzz 1 (offset -2 lines).

Signed-off-by: Khem Raj <raj.khem@gmail.com>
  • Loading branch information
kraj authored and agherzan committed Mar 12, 2020
1 parent 84cb853 commit ac5e346
Showing 1 changed file with 4 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ Upstream-Status: Pending

Signed-off-by: Balaji Velmurugan <balaji.velmurugan@ltts.com>

diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
index 6ce6f19..2f9d47d 100644
--- a/src/gallium/state_trackers/dri/dri2.c
+++ b/src/gallium/state_trackers/dri/dri2.c
@@ -1368,14 +1368,28 @@ dri2_from_planar(__DRIimage *image, int plane, void *loaderPrivate)
@@ -1366,14 +1366,28 @@ dri2_from_planar(__DRIimage *image, int
return img;
}

+static boolean
+dri2_query_dma_buf_modifiers(__DRIscreen *_screen, int fourcc, int max,
+ uint64_t *modifiers, unsigned int *external_only,
Expand All @@ -41,5 +39,5 @@ index 6ce6f19..2f9d47d 100644
strides, offsets, NULL, loaderPrivate);
+ #endif
}

static boolean
static boolean

0 comments on commit ac5e346

Please sign in to comment.