[Mesa-dev] [PATCH] r600: fork and import gallium/radeon

Marek Olšák maraeo at gmail.com
Thu Sep 14 13:06:28 UTC 2017


From: Marek Olšák <marek.olsak at amd.com>

This marks the end of code sharing between r600 and radeonsi.

A lot of functions had to be renamed to prevent linker conflicts.

There are also minor cleanups.
---

This one is huge. Please review here:
https://cgit.freedesktop.org/~mareko/mesa/commit/?h=master&id=858b2d1c8cec727fdf750192c8c210f72d38f853

Thanks,
Marek

 configure.ac                                       |    3 +-
 src/gallium/Makefile.am                            |    2 +-
 src/gallium/drivers/r600/Automake.inc              |    2 -
 src/gallium/drivers/r600/Makefile.am               |    3 +-
 src/gallium/drivers/r600/Makefile.sources          |   21 +-
 src/gallium/drivers/r600/cayman_msaa.c             |  269 +++
 src/gallium/drivers/r600/r600_buffer_common.c      |  687 ++++++
 src/gallium/drivers/r600/r600_cs.h                 |  209 ++
 src/gallium/drivers/r600/r600_gpu_load.c           |  283 +++
 src/gallium/drivers/r600/r600_perfcounter.c        |  649 ++++++
 src/gallium/drivers/r600/r600_pipe.c               |    4 +-
 src/gallium/drivers/r600/r600_pipe.h               |    4 +-
 src/gallium/drivers/r600/r600_pipe_common.c        | 1622 +++++++++++++
 src/gallium/drivers/r600/r600_pipe_common.h        | 1020 ++++++++
 src/gallium/drivers/r600/r600_query.c              | 2201 +++++++++++++++++
 src/gallium/drivers/r600/r600_query.h              |  327 +++
 src/gallium/drivers/r600/r600_streamout.c          |  381 +++
 src/gallium/drivers/r600/r600_test_dma.c           |  398 ++++
 src/gallium/drivers/r600/r600_texture.c            | 2464 ++++++++++++++++++++
 src/gallium/drivers/r600/r600_uvd.c                |    6 +-
 src/gallium/drivers/r600/r600_viewport.c           |  433 ++++
 src/gallium/drivers/r600/radeon_uvd.c              | 1618 +++++++++++++
 src/gallium/drivers/r600/radeon_uvd.h              |  447 ++++
 src/gallium/drivers/r600/radeon_vce.c              |  553 +++++
 src/gallium/drivers/r600/radeon_vce.h              |  462 ++++
 src/gallium/drivers/r600/radeon_video.c            |  372 +++
 src/gallium/drivers/r600/radeon_video.h            |   85 +
 src/gallium/drivers/radeon/cayman_msaa.c           |   30 +-
 src/gallium/drivers/radeon/r600_buffer_common.c    |   72 +-
 src/gallium/drivers/radeon/r600_gpu_load.c         |    8 +-
 src/gallium/drivers/radeon/r600_perfcounter.c      |   44 +-
 src/gallium/drivers/radeon/r600_pipe_common.c      |  172 +-
 src/gallium/drivers/radeon/r600_pipe_common.h      |  279 ++-
 src/gallium/drivers/radeon/r600_query.c            |  229 +-
 src/gallium/drivers/radeon/r600_query.h            |   60 +-
 src/gallium/drivers/radeon/r600_streamout.c        |   22 +-
 src/gallium/drivers/radeon/r600_test_dma.c         |    2 +-
 src/gallium/drivers/radeon/r600_texture.c          |  225 +-
 src/gallium/drivers/radeon/r600_viewport.c         |   16 +-
 src/gallium/drivers/radeon/radeon_uvd.c            |   58 +-
 src/gallium/drivers/radeon/radeon_uvd.h            |   10 +-
 src/gallium/drivers/radeon/radeon_vce.c            |   66 +-
 src/gallium/drivers/radeon/radeon_vce.h            |   52 +-
 src/gallium/drivers/radeon/radeon_vce_40_2_2.c     |   14 +-
 src/gallium/drivers/radeon/radeon_vce_50.c         |   16 +-
 src/gallium/drivers/radeon/radeon_vce_52.c         |   14 +-
 src/gallium/drivers/radeon/radeon_vcn_dec.c        |   56 +-
 src/gallium/drivers/radeon/radeon_video.c          |   44 +-
 src/gallium/drivers/radeon/radeon_video.h          |   36 +-
 src/gallium/drivers/radeonsi/cik_sdma.c            |   12 +-
 src/gallium/drivers/radeonsi/si_blit.c             |    8 +-
 src/gallium/drivers/radeonsi/si_compute.c          |    4 +-
 src/gallium/drivers/radeonsi/si_cp_dma.c           |    2 +-
 src/gallium/drivers/radeonsi/si_debug.c            |    4 +-
 src/gallium/drivers/radeonsi/si_descriptors.c      |   12 +-
 src/gallium/drivers/radeonsi/si_dma.c              |    8 +-
 src/gallium/drivers/radeonsi/si_hw_context.c       |   10 +-
 src/gallium/drivers/radeonsi/si_perfcounter.c      |   14 +-
 src/gallium/drivers/radeonsi/si_pipe.c             |   24 +-
 src/gallium/drivers/radeonsi/si_shader.c           |   16 +-
 .../drivers/radeonsi/si_shader_tgsi_setup.c        |    4 +-
 src/gallium/drivers/radeonsi/si_state.c            |   18 +-
 src/gallium/drivers/radeonsi/si_state_draw.c       |    6 +-
 src/gallium/drivers/radeonsi/si_state_shaders.c    |   18 +-
 src/gallium/drivers/radeonsi/si_uvd.c              |    8 +-
 src/gallium/targets/pipe-loader/Makefile.am        |    1 -
 66 files changed, 15240 insertions(+), 979 deletions(-)
 create mode 100644 src/gallium/drivers/r600/cayman_msaa.c
 create mode 100644 src/gallium/drivers/r600/r600_buffer_common.c
 create mode 100644 src/gallium/drivers/r600/r600_cs.h
 create mode 100644 src/gallium/drivers/r600/r600_gpu_load.c
 create mode 100644 src/gallium/drivers/r600/r600_perfcounter.c
 create mode 100644 src/gallium/drivers/r600/r600_pipe_common.c
 create mode 100644 src/gallium/drivers/r600/r600_pipe_common.h
 create mode 100644 src/gallium/drivers/r600/r600_query.c
 create mode 100644 src/gallium/drivers/r600/r600_query.h
 create mode 100644 src/gallium/drivers/r600/r600_streamout.c
 create mode 100644 src/gallium/drivers/r600/r600_test_dma.c
 create mode 100644 src/gallium/drivers/r600/r600_texture.c
 create mode 100644 src/gallium/drivers/r600/r600_viewport.c
 create mode 100644 src/gallium/drivers/r600/radeon_uvd.c
 create mode 100644 src/gallium/drivers/r600/radeon_uvd.h
 create mode 100644 src/gallium/drivers/r600/radeon_vce.c
 create mode 100644 src/gallium/drivers/r600/radeon_vce.h
 create mode 100644 src/gallium/drivers/r600/radeon_video.c
 create mode 100644 src/gallium/drivers/r600/radeon_video.h


More information about the mesa-dev mailing list