Import Mesa 17.3.9

2 files changed, 1 insertions, 14 deletions

diff --git a/lib/mesa/src/compiler/blob.c b/lib/mesa/src/compiler/blob.c
index c89092e1c..8dd254fef 100644
--- a/lib/mesa/src/compiler/blob.c
+++ b/lib/mesa/src/compiler/blob.c
@@ -256,7 +256,7 @@ ensure_can_read(struct blob_reader *blob, size_t size)
    if (blob->overrun)
       return false;
 
-   if (blob->current <= blob->end && blob->end - blob->current >= size)
+   if (blob->current < blob->end && blob->end - blob->current >= size)
       return true;
 
    blob->overrun = true;
@@ -291,13 +291,6 @@ blob_copy_bytes(struct blob_reader *blob, void *dest, size_t size)
    memcpy(dest, bytes, size);
 }
 
-void
-blob_skip_bytes(struct blob_reader *blob, size_t size)
-{
-   if (ensure_can_read (blob, size))
-      blob->current += size;
-}
-
 /* These next three read functions have identical form. If we add any beyond
  * these first three we should probably switch to generating these with a
  * preprocessor macro.
diff --git a/lib/mesa/src/compiler/blob.h b/lib/mesa/src/compiler/blob.h
index b56fa4b2f..2b975d45d 100644
--- a/lib/mesa/src/compiler/blob.h
+++ b/lib/mesa/src/compiler/blob.h
@@ -295,12 +295,6 @@ void
 blob_copy_bytes(struct blob_reader *blob, void *dest, size_t size);
 
 /**
- * Skip \size bytes within the blob.
- */
-void
-blob_skip_bytes(struct blob_reader *blob, size_t size);
-
-/**
  * Read a uint32_t from the current location, (and update the current location
  * to just past this uint32_t).
  *