Module: Mesa Branch: master Commit: 3a3a0d2d6cf37ff9d6e7f8ec9a6a78b24a353e08 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a3a0d2d6cf37ff9d6e7f8ec9a6a78b24a353e08
Author: Eric Anholt <[email protected]> Date: Thu Jan 5 15:23:32 2017 -0800 vc4: Move the utile_width/height functions to header inlines. I want these inlined in the callers, particularly with the tiling changes coming up, but we're not building with lto so some caller would suffer. --- src/gallium/drivers/vc4/vc4_tiling.c | 35 --------------------------------- src/gallium/drivers/vc4/vc4_tiling.h | 38 ++++++++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/src/gallium/drivers/vc4/vc4_tiling.c b/src/gallium/drivers/vc4/vc4_tiling.c index 81d9ec4..dab9275 100644 --- a/src/gallium/drivers/vc4/vc4_tiling.c +++ b/src/gallium/drivers/vc4/vc4_tiling.c @@ -52,41 +52,6 @@ #include "vc4_context.h" #include "vc4_tiling.h" -/** Return the width in pixels of a 64-byte microtile. */ -uint32_t -vc4_utile_width(int cpp) -{ - switch (cpp) { - case 1: - case 2: - return 8; - case 4: - return 4; - case 8: - return 2; - default: - fprintf(stderr, "unknown cpp: %d\n", cpp); - abort(); - } -} - -/** Return the height in pixels of a 64-byte microtile. */ -uint32_t -vc4_utile_height(int cpp) -{ - switch (cpp) { - case 1: - return 8; - case 2: - case 4: - case 8: - return 4; - default: - fprintf(stderr, "unknown cpp: %d\n", cpp); - abort(); - } -} - /** Returns the stride in bytes of a 64-byte microtile. */ static uint32_t vc4_utile_stride(int cpp) diff --git a/src/gallium/drivers/vc4/vc4_tiling.h b/src/gallium/drivers/vc4/vc4_tiling.h index 7c98c02..1da6ca6 100644 --- a/src/gallium/drivers/vc4/vc4_tiling.h +++ b/src/gallium/drivers/vc4/vc4_tiling.h @@ -24,8 +24,42 @@ #ifndef VC4_TILING_H #define VC4_TILING_H -uint32_t vc4_utile_width(int cpp) ATTRIBUTE_CONST; -uint32_t vc4_utile_height(int cpp) ATTRIBUTE_CONST; + +/** Return the width in pixels of a 64-byte microtile. */ +static inline uint32_t +vc4_utile_width(int cpp) +{ + switch (cpp) { + case 1: + case 2: + return 8; + case 4: + return 4; + case 8: + return 2; + default: + fprintf(stderr, "unknown cpp: %d\n", cpp); + abort(); + } +} + +/** Return the height in pixels of a 64-byte microtile. */ +static inline uint32_t +vc4_utile_height(int cpp) +{ + switch (cpp) { + case 1: + return 8; + case 2: + case 4: + case 8: + return 4; + default: + fprintf(stderr, "unknown cpp: %d\n", cpp); + abort(); + } +} + bool vc4_size_is_lt(uint32_t width, uint32_t height, int cpp) ATTRIBUTE_CONST; void vc4_load_tiled_image(void *dst, uint32_t dst_stride, void *src, uint32_t src_stride, _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
