Mesa (master): lima/ppir: change offset type to int

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jun 13 05:59:41 UTC 2019


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

Author: Mateusz Krzak <kszaquitto at gmail.com>
Date:   Sat Jun  8 00:33:30 2019 +0200

lima/ppir: change offset type to int

Offset doesn't need to be 64-bit. This fixes compilation error
with 64-bit off_t.

Fixes: af0de6b9 lima/ppir: implement discard and discard_if

Suggested-by: Qiang Yu <yuq825 at gmail.com>
Signed-off-by: Mateusz Krzak <kszaquitto at gmail.com>
Reviewed-by: Qiang Yu <yuq825 at gmail.com>
Tested-by: Andreas Baierl <ichgeh at imkreisrum.de>

---

 src/gallium/drivers/lima/ir/pp/codegen.c | 2 +-
 src/gallium/drivers/lima/ir/pp/ppir.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/lima/ir/pp/codegen.c b/src/gallium/drivers/lima/ir/pp/codegen.c
index 2501ddccc6f..d568e1dda36 100644
--- a/src/gallium/drivers/lima/ir/pp/codegen.c
+++ b/src/gallium/drivers/lima/ir/pp/codegen.c
@@ -677,7 +677,7 @@ static void ppir_codegen_print_prog(ppir_compiler *comp)
    printf("========ppir codegen========\n");
    list_for_each_entry(ppir_block, block, &comp->block_list, list) {
       list_for_each_entry(ppir_instr, instr, &block->instr_list, list) {
-         printf("%03d (@%6ld): ", instr->index, instr->offset);
+         printf("%03d (@%6d): ", instr->index, instr->offset);
          int n = prog[0] & 0x1f;
          for (int i = 0; i < n; i++) {
             if (i && i % 6 == 0)
diff --git a/src/gallium/drivers/lima/ir/pp/ppir.h b/src/gallium/drivers/lima/ir/pp/ppir.h
index 233e5cdc3d8..4b15804952f 100644
--- a/src/gallium/drivers/lima/ir/pp/ppir.h
+++ b/src/gallium/drivers/lima/ir/pp/ppir.h
@@ -297,7 +297,7 @@ typedef struct ppir_instr {
    int est; /* earliest start time */
    int parent_index;
    bool scheduled;
-   off_t offset;
+   int offset;
 } ppir_instr;
 
 typedef struct ppir_block {




More information about the mesa-commit mailing list