diff options
| author | Marek Olšák <[email protected]> | 2013-08-14 01:04:39 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-08-31 01:34:30 +0200 |
| commit | a81c3e00fee0626e63b1fb8ebb4c2cef3fb23367 (patch) | |
| tree | 663b943d05880c68b9d7f9d6d5ef26bdd7a5aed9 /src/gallium/drivers/radeon | |
| parent | d5b23dfc1c07f98afe749053b9cb4b69829fe3d4 (diff) | |
radeonsi: use r600_common_context, r600_common_screen, r600_resource
Also r600_hw_context_priv.h and si_state_streamout.c are removed, because
they are no longer needed.
Reviewed-by: Michel Dänzer <[email protected]>
Reviewed-by: Christian König <[email protected]>
Tested-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_cs.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeon/r600_cs.h b/src/gallium/drivers/radeon/r600_cs.h index c8bb2976f84..f56c92c1017 100644 --- a/src/gallium/drivers/radeon/r600_cs.h +++ b/src/gallium/drivers/radeon/r600_cs.h @@ -30,7 +30,7 @@ #ifndef R600_CS_H #define R600_CS_H -#include "../../winsys/radeon/drm/radeon_winsys.h" +#include "r600_pipe_common.h" #include "r600d_common.h" static INLINE uint64_t r600_resource_va(struct pipe_screen *screen, diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index 0bfdb47b62b..98c113f91e1 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -176,4 +176,11 @@ static INLINE struct r600_resource *r600_resource(struct pipe_resource *r) return (struct r600_resource*)r; } +static INLINE void +r600_resource_reference(struct r600_resource **ptr, struct r600_resource *res) +{ + pipe_resource_reference((struct pipe_resource **)ptr, + (struct pipe_resource *)res); +} + #endif |