Merge commit 'eee/mesa-es' into android

1 files changed, 9 insertions, 3 deletions

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 37d5fcd0d3..8e923b6eb4 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -102,9 +102,15 @@ static rawImageRec *RawImageOpen(const char *fileName)
       fprintf(stderr, "Out of memory!\n");
       return NULL;
    }
-   if ((raw->file = fopen(fileName, "rb")) == NULL) {
-      perror(fileName);
-      return NULL;
+   raw->file = fopen(fileName, "rb");
+   if (raw->file == NULL) {
+      const char *baseName = strrchr(fileName, '/');
+      if(baseName)
+         raw->file = fopen(baseName + 1, "rb");
+      if(raw->file == NULL) {
+         perror(fileName);
+         return NULL;
+      }
    }
 
    fread(raw, 1, 12, raw->file);