Module: Mesa Branch: master Commit: 64f3c9da87b701cd863315849f1beccee8f5fb3f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=64f3c9da87b701cd863315849f1beccee8f5fb3f
Author: Alyssa Rosenzweig <[email protected]> Date: Wed Aug 5 16:05:12 2020 -0400 panfrost: Inline panfrost-misc.h into panfrost-job.h We only need a small subset of the defines here. Signed-off-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6196> --- src/gallium/drivers/panfrost/pan_screen.h | 1 - src/panfrost/encoder/pan_bo.h | 1 - src/panfrost/encoder/pan_device.h | 2 +- src/panfrost/encoder/pan_pool.h | 2 +- src/panfrost/include/panfrost-job.h | 8 +++++++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_screen.h b/src/gallium/drivers/panfrost/pan_screen.h index 8f72185fb39..6730bae7a2b 100644 --- a/src/gallium/drivers/panfrost/pan_screen.h +++ b/src/gallium/drivers/panfrost/pan_screen.h @@ -37,7 +37,6 @@ #include "util/bitset.h" #include "util/set.h" -#include <panfrost-misc.h> #include "pan_device.h" #include "pan_pool.h" diff --git a/src/panfrost/encoder/pan_bo.h b/src/panfrost/encoder/pan_bo.h index 84d2a0aee98..360b102de34 100644 --- a/src/panfrost/encoder/pan_bo.h +++ b/src/panfrost/encoder/pan_bo.h @@ -26,7 +26,6 @@ #ifndef __PAN_BO_H__ #define __PAN_BO_H__ -#include <panfrost-misc.h> #include "util/list.h" #include "pan_device.h" #include <time.h> diff --git a/src/panfrost/encoder/pan_device.h b/src/panfrost/encoder/pan_device.h index 8638ca554fe..b84c8e7cdae 100644 --- a/src/panfrost/encoder/pan_device.h +++ b/src/panfrost/encoder/pan_device.h @@ -37,7 +37,7 @@ #include "util/list.h" #include "util/sparse_array.h" -#include <panfrost-misc.h> +#include <panfrost-job.h> /* Driver limits */ #define PAN_MAX_CONST_BUFFERS 16 diff --git a/src/panfrost/encoder/pan_pool.h b/src/panfrost/encoder/pan_pool.h index a619bd5e6cc..14593eabd43 100644 --- a/src/panfrost/encoder/pan_pool.h +++ b/src/panfrost/encoder/pan_pool.h @@ -26,7 +26,7 @@ #define __PAN_POOL_H__ #include <stddef.h> -#include <panfrost-misc.h> +#include <panfrost-job.h> /* Represents a pool of memory that can only grow, used to allocate objects * with the same lifetime as the pool itself. In OpenGL, a pool is owned by the diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h index ab0f8f7048f..a282c6e32e1 100644 --- a/src/panfrost/include/panfrost-job.h +++ b/src/panfrost/include/panfrost-job.h @@ -30,7 +30,13 @@ #include <stdint.h> #include <stdbool.h> -#include <panfrost-misc.h> +#include <inttypes.h> + +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; +typedef uint64_t u64; +typedef uint64_t mali_ptr; enum mali_job_type { JOB_NOT_STARTED = 0, _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
