Module: Mesa Branch: main Commit: dcf2f251694774918f1801a13b16f96e24b5ca0a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dcf2f251694774918f1801a13b16f96e24b5ca0a
Author: Faith Ekstrand <[email protected]> Date: Mon Dec 4 11:56:17 2023 -0600 nouveau: Move headers/classes to headers/nvidia/classes Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26507> --- src/nouveau/headers/meson.build | 6 +++--- src/nouveau/headers/{ => nvidia}/classes/cl0039.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl0042.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl004a.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl0065.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl0066.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl006b.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl006c.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl006e.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl0077.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl007b.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl206e.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl366e.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl406e.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl446e.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl502d.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl5039.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl506f.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl50c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl826f.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl85b5.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl85c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl866f.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl902d.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl9039.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl906f.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl9097.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl9097tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl90b5.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl90c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl9197.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl91c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl9297.h | 0 src/nouveau/headers/{ => nvidia}/classes/cl9297tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla06f.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla097.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla097tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla0b5.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla0c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla0c0qmd.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla16f.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla197.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla197tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla1c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla1c0qmd.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla26f.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla297.h | 0 src/nouveau/headers/{ => nvidia}/classes/cla297tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/clb06f.h | 0 src/nouveau/headers/{ => nvidia}/classes/clb097.h | 0 src/nouveau/headers/{ => nvidia}/classes/clb097tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/clb0b5.h | 0 src/nouveau/headers/{ => nvidia}/classes/clb0c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/clb0c0qmd.h | 0 src/nouveau/headers/{ => nvidia}/classes/clb197.h | 0 src/nouveau/headers/{ => nvidia}/classes/clb197tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/clb1c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/clb1c0qmd.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc06f.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc097.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc097tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc0b5.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc0c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc0c0qmd.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc197.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc197tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc1b5.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc1c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc1c0qmd.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc36f.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc397.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc397tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc3b5.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc3c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc3c0qmd.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc46f.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc4c0qmd.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc56f.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc597.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc597tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc5b5.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc5c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc5c0qmd.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc697.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc697tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc6b5.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc6c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc6c0qmd.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc76f.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc797.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc797tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc7b5.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc7c0.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc7c0qmd.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc997.h | 0 src/nouveau/headers/{ => nvidia}/classes/clc997tex.h | 0 src/nouveau/headers/{ => nvidia}/classes/clcb97.h | 0 src/nouveau/headers/{ => nvidia}/classes/clcb97tex.h | 0 src/nouveau/vulkan/nvk_cmd_dispatch.c | 3 +-- src/nouveau/vulkan/nvk_format.c | 6 +++--- 100 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/nouveau/headers/meson.build b/src/nouveau/headers/meson.build index 2ae6dde1960..e93e7f235b2 100644 --- a/src/nouveau/headers/meson.build +++ b/src/nouveau/headers/meson.build @@ -30,7 +30,7 @@ cl_generated = [] foreach cl : nvk_classes cl_generated += custom_target( cl + '.h', - input : ['class_parser.py', 'classes/'+cl+'.h'], + input : ['class_parser.py', 'nvidia/classes/'+cl+'.h'], output : ['nvk_'+cl+'.h', 'nvk_'+cl+'.c'], command : [prog_python, '@INPUT0@', '--in_h', '@INPUT1@', '--out_h', '@OUTPUT0@', '--out_c', '@OUTPUT1@'], @@ -41,13 +41,13 @@ endforeach _libnvidia_headers = static_library( 'nvidia_headers', ['nv_push.c', cl_generated], - include_directories : ['.', 'classes', inc_include, inc_src], + include_directories : ['.', 'nvidia/classes', inc_include, inc_src], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', ) idep_nvidia_headers = declare_dependency( - include_directories : include_directories('.', 'classes'), + include_directories : include_directories('.', 'nvidia/classes'), sources : cl_generated, link_with : _libnvidia_headers, ) diff --git a/src/nouveau/headers/classes/cl0039.h b/src/nouveau/headers/nvidia/classes/cl0039.h similarity index 100% rename from src/nouveau/headers/classes/cl0039.h rename to src/nouveau/headers/nvidia/classes/cl0039.h diff --git a/src/nouveau/headers/classes/cl0042.h b/src/nouveau/headers/nvidia/classes/cl0042.h similarity index 100% rename from src/nouveau/headers/classes/cl0042.h rename to src/nouveau/headers/nvidia/classes/cl0042.h diff --git a/src/nouveau/headers/classes/cl004a.h b/src/nouveau/headers/nvidia/classes/cl004a.h similarity index 100% rename from src/nouveau/headers/classes/cl004a.h rename to src/nouveau/headers/nvidia/classes/cl004a.h diff --git a/src/nouveau/headers/classes/cl0065.h b/src/nouveau/headers/nvidia/classes/cl0065.h similarity index 100% rename from src/nouveau/headers/classes/cl0065.h rename to src/nouveau/headers/nvidia/classes/cl0065.h diff --git a/src/nouveau/headers/classes/cl0066.h b/src/nouveau/headers/nvidia/classes/cl0066.h similarity index 100% rename from src/nouveau/headers/classes/cl0066.h rename to src/nouveau/headers/nvidia/classes/cl0066.h diff --git a/src/nouveau/headers/classes/cl006b.h b/src/nouveau/headers/nvidia/classes/cl006b.h similarity index 100% rename from src/nouveau/headers/classes/cl006b.h rename to src/nouveau/headers/nvidia/classes/cl006b.h diff --git a/src/nouveau/headers/classes/cl006c.h b/src/nouveau/headers/nvidia/classes/cl006c.h similarity index 100% rename from src/nouveau/headers/classes/cl006c.h rename to src/nouveau/headers/nvidia/classes/cl006c.h diff --git a/src/nouveau/headers/classes/cl006e.h b/src/nouveau/headers/nvidia/classes/cl006e.h similarity index 100% rename from src/nouveau/headers/classes/cl006e.h rename to src/nouveau/headers/nvidia/classes/cl006e.h diff --git a/src/nouveau/headers/classes/cl0077.h b/src/nouveau/headers/nvidia/classes/cl0077.h similarity index 100% rename from src/nouveau/headers/classes/cl0077.h rename to src/nouveau/headers/nvidia/classes/cl0077.h diff --git a/src/nouveau/headers/classes/cl007b.h b/src/nouveau/headers/nvidia/classes/cl007b.h similarity index 100% rename from src/nouveau/headers/classes/cl007b.h rename to src/nouveau/headers/nvidia/classes/cl007b.h diff --git a/src/nouveau/headers/classes/cl206e.h b/src/nouveau/headers/nvidia/classes/cl206e.h similarity index 100% rename from src/nouveau/headers/classes/cl206e.h rename to src/nouveau/headers/nvidia/classes/cl206e.h diff --git a/src/nouveau/headers/classes/cl366e.h b/src/nouveau/headers/nvidia/classes/cl366e.h similarity index 100% rename from src/nouveau/headers/classes/cl366e.h rename to src/nouveau/headers/nvidia/classes/cl366e.h diff --git a/src/nouveau/headers/classes/cl406e.h b/src/nouveau/headers/nvidia/classes/cl406e.h similarity index 100% rename from src/nouveau/headers/classes/cl406e.h rename to src/nouveau/headers/nvidia/classes/cl406e.h diff --git a/src/nouveau/headers/classes/cl446e.h b/src/nouveau/headers/nvidia/classes/cl446e.h similarity index 100% rename from src/nouveau/headers/classes/cl446e.h rename to src/nouveau/headers/nvidia/classes/cl446e.h diff --git a/src/nouveau/headers/classes/cl502d.h b/src/nouveau/headers/nvidia/classes/cl502d.h similarity index 100% rename from src/nouveau/headers/classes/cl502d.h rename to src/nouveau/headers/nvidia/classes/cl502d.h diff --git a/src/nouveau/headers/classes/cl5039.h b/src/nouveau/headers/nvidia/classes/cl5039.h similarity index 100% rename from src/nouveau/headers/classes/cl5039.h rename to src/nouveau/headers/nvidia/classes/cl5039.h diff --git a/src/nouveau/headers/classes/cl506f.h b/src/nouveau/headers/nvidia/classes/cl506f.h similarity index 100% rename from src/nouveau/headers/classes/cl506f.h rename to src/nouveau/headers/nvidia/classes/cl506f.h diff --git a/src/nouveau/headers/classes/cl50c0.h b/src/nouveau/headers/nvidia/classes/cl50c0.h similarity index 100% rename from src/nouveau/headers/classes/cl50c0.h rename to src/nouveau/headers/nvidia/classes/cl50c0.h diff --git a/src/nouveau/headers/classes/cl826f.h b/src/nouveau/headers/nvidia/classes/cl826f.h similarity index 100% rename from src/nouveau/headers/classes/cl826f.h rename to src/nouveau/headers/nvidia/classes/cl826f.h diff --git a/src/nouveau/headers/classes/cl85b5.h b/src/nouveau/headers/nvidia/classes/cl85b5.h similarity index 100% rename from src/nouveau/headers/classes/cl85b5.h rename to src/nouveau/headers/nvidia/classes/cl85b5.h diff --git a/src/nouveau/headers/classes/cl85c0.h b/src/nouveau/headers/nvidia/classes/cl85c0.h similarity index 100% rename from src/nouveau/headers/classes/cl85c0.h rename to src/nouveau/headers/nvidia/classes/cl85c0.h diff --git a/src/nouveau/headers/classes/cl866f.h b/src/nouveau/headers/nvidia/classes/cl866f.h similarity index 100% rename from src/nouveau/headers/classes/cl866f.h rename to src/nouveau/headers/nvidia/classes/cl866f.h diff --git a/src/nouveau/headers/classes/cl902d.h b/src/nouveau/headers/nvidia/classes/cl902d.h similarity index 100% rename from src/nouveau/headers/classes/cl902d.h rename to src/nouveau/headers/nvidia/classes/cl902d.h diff --git a/src/nouveau/headers/classes/cl9039.h b/src/nouveau/headers/nvidia/classes/cl9039.h similarity index 100% rename from src/nouveau/headers/classes/cl9039.h rename to src/nouveau/headers/nvidia/classes/cl9039.h diff --git a/src/nouveau/headers/classes/cl906f.h b/src/nouveau/headers/nvidia/classes/cl906f.h similarity index 100% rename from src/nouveau/headers/classes/cl906f.h rename to src/nouveau/headers/nvidia/classes/cl906f.h diff --git a/src/nouveau/headers/classes/cl9097.h b/src/nouveau/headers/nvidia/classes/cl9097.h similarity index 100% rename from src/nouveau/headers/classes/cl9097.h rename to src/nouveau/headers/nvidia/classes/cl9097.h diff --git a/src/nouveau/headers/classes/cl9097tex.h b/src/nouveau/headers/nvidia/classes/cl9097tex.h similarity index 100% rename from src/nouveau/headers/classes/cl9097tex.h rename to src/nouveau/headers/nvidia/classes/cl9097tex.h diff --git a/src/nouveau/headers/classes/cl90b5.h b/src/nouveau/headers/nvidia/classes/cl90b5.h similarity index 100% rename from src/nouveau/headers/classes/cl90b5.h rename to src/nouveau/headers/nvidia/classes/cl90b5.h diff --git a/src/nouveau/headers/classes/cl90c0.h b/src/nouveau/headers/nvidia/classes/cl90c0.h similarity index 100% rename from src/nouveau/headers/classes/cl90c0.h rename to src/nouveau/headers/nvidia/classes/cl90c0.h diff --git a/src/nouveau/headers/classes/cl9197.h b/src/nouveau/headers/nvidia/classes/cl9197.h similarity index 100% rename from src/nouveau/headers/classes/cl9197.h rename to src/nouveau/headers/nvidia/classes/cl9197.h diff --git a/src/nouveau/headers/classes/cl91c0.h b/src/nouveau/headers/nvidia/classes/cl91c0.h similarity index 100% rename from src/nouveau/headers/classes/cl91c0.h rename to src/nouveau/headers/nvidia/classes/cl91c0.h diff --git a/src/nouveau/headers/classes/cl9297.h b/src/nouveau/headers/nvidia/classes/cl9297.h similarity index 100% rename from src/nouveau/headers/classes/cl9297.h rename to src/nouveau/headers/nvidia/classes/cl9297.h diff --git a/src/nouveau/headers/classes/cl9297tex.h b/src/nouveau/headers/nvidia/classes/cl9297tex.h similarity index 100% rename from src/nouveau/headers/classes/cl9297tex.h rename to src/nouveau/headers/nvidia/classes/cl9297tex.h diff --git a/src/nouveau/headers/classes/cla06f.h b/src/nouveau/headers/nvidia/classes/cla06f.h similarity index 100% rename from src/nouveau/headers/classes/cla06f.h rename to src/nouveau/headers/nvidia/classes/cla06f.h diff --git a/src/nouveau/headers/classes/cla097.h b/src/nouveau/headers/nvidia/classes/cla097.h similarity index 100% rename from src/nouveau/headers/classes/cla097.h rename to src/nouveau/headers/nvidia/classes/cla097.h diff --git a/src/nouveau/headers/classes/cla097tex.h b/src/nouveau/headers/nvidia/classes/cla097tex.h similarity index 100% rename from src/nouveau/headers/classes/cla097tex.h rename to src/nouveau/headers/nvidia/classes/cla097tex.h diff --git a/src/nouveau/headers/classes/cla0b5.h b/src/nouveau/headers/nvidia/classes/cla0b5.h similarity index 100% rename from src/nouveau/headers/classes/cla0b5.h rename to src/nouveau/headers/nvidia/classes/cla0b5.h diff --git a/src/nouveau/headers/classes/cla0c0.h b/src/nouveau/headers/nvidia/classes/cla0c0.h similarity index 100% rename from src/nouveau/headers/classes/cla0c0.h rename to src/nouveau/headers/nvidia/classes/cla0c0.h diff --git a/src/nouveau/headers/classes/cla0c0qmd.h b/src/nouveau/headers/nvidia/classes/cla0c0qmd.h similarity index 100% rename from src/nouveau/headers/classes/cla0c0qmd.h rename to src/nouveau/headers/nvidia/classes/cla0c0qmd.h diff --git a/src/nouveau/headers/classes/cla16f.h b/src/nouveau/headers/nvidia/classes/cla16f.h similarity index 100% rename from src/nouveau/headers/classes/cla16f.h rename to src/nouveau/headers/nvidia/classes/cla16f.h diff --git a/src/nouveau/headers/classes/cla197.h b/src/nouveau/headers/nvidia/classes/cla197.h similarity index 100% rename from src/nouveau/headers/classes/cla197.h rename to src/nouveau/headers/nvidia/classes/cla197.h diff --git a/src/nouveau/headers/classes/cla197tex.h b/src/nouveau/headers/nvidia/classes/cla197tex.h similarity index 100% rename from src/nouveau/headers/classes/cla197tex.h rename to src/nouveau/headers/nvidia/classes/cla197tex.h diff --git a/src/nouveau/headers/classes/cla1c0.h b/src/nouveau/headers/nvidia/classes/cla1c0.h similarity index 100% rename from src/nouveau/headers/classes/cla1c0.h rename to src/nouveau/headers/nvidia/classes/cla1c0.h diff --git a/src/nouveau/headers/classes/cla1c0qmd.h b/src/nouveau/headers/nvidia/classes/cla1c0qmd.h similarity index 100% rename from src/nouveau/headers/classes/cla1c0qmd.h rename to src/nouveau/headers/nvidia/classes/cla1c0qmd.h diff --git a/src/nouveau/headers/classes/cla26f.h b/src/nouveau/headers/nvidia/classes/cla26f.h similarity index 100% rename from src/nouveau/headers/classes/cla26f.h rename to src/nouveau/headers/nvidia/classes/cla26f.h diff --git a/src/nouveau/headers/classes/cla297.h b/src/nouveau/headers/nvidia/classes/cla297.h similarity index 100% rename from src/nouveau/headers/classes/cla297.h rename to src/nouveau/headers/nvidia/classes/cla297.h diff --git a/src/nouveau/headers/classes/cla297tex.h b/src/nouveau/headers/nvidia/classes/cla297tex.h similarity index 100% rename from src/nouveau/headers/classes/cla297tex.h rename to src/nouveau/headers/nvidia/classes/cla297tex.h diff --git a/src/nouveau/headers/classes/clb06f.h b/src/nouveau/headers/nvidia/classes/clb06f.h similarity index 100% rename from src/nouveau/headers/classes/clb06f.h rename to src/nouveau/headers/nvidia/classes/clb06f.h diff --git a/src/nouveau/headers/classes/clb097.h b/src/nouveau/headers/nvidia/classes/clb097.h similarity index 100% rename from src/nouveau/headers/classes/clb097.h rename to src/nouveau/headers/nvidia/classes/clb097.h diff --git a/src/nouveau/headers/classes/clb097tex.h b/src/nouveau/headers/nvidia/classes/clb097tex.h similarity index 100% rename from src/nouveau/headers/classes/clb097tex.h rename to src/nouveau/headers/nvidia/classes/clb097tex.h diff --git a/src/nouveau/headers/classes/clb0b5.h b/src/nouveau/headers/nvidia/classes/clb0b5.h similarity index 100% rename from src/nouveau/headers/classes/clb0b5.h rename to src/nouveau/headers/nvidia/classes/clb0b5.h diff --git a/src/nouveau/headers/classes/clb0c0.h b/src/nouveau/headers/nvidia/classes/clb0c0.h similarity index 100% rename from src/nouveau/headers/classes/clb0c0.h rename to src/nouveau/headers/nvidia/classes/clb0c0.h diff --git a/src/nouveau/headers/classes/clb0c0qmd.h b/src/nouveau/headers/nvidia/classes/clb0c0qmd.h similarity index 100% rename from src/nouveau/headers/classes/clb0c0qmd.h rename to src/nouveau/headers/nvidia/classes/clb0c0qmd.h diff --git a/src/nouveau/headers/classes/clb197.h b/src/nouveau/headers/nvidia/classes/clb197.h similarity index 100% rename from src/nouveau/headers/classes/clb197.h rename to src/nouveau/headers/nvidia/classes/clb197.h diff --git a/src/nouveau/headers/classes/clb197tex.h b/src/nouveau/headers/nvidia/classes/clb197tex.h similarity index 100% rename from src/nouveau/headers/classes/clb197tex.h rename to src/nouveau/headers/nvidia/classes/clb197tex.h diff --git a/src/nouveau/headers/classes/clb1c0.h b/src/nouveau/headers/nvidia/classes/clb1c0.h similarity index 100% rename from src/nouveau/headers/classes/clb1c0.h rename to src/nouveau/headers/nvidia/classes/clb1c0.h diff --git a/src/nouveau/headers/classes/clb1c0qmd.h b/src/nouveau/headers/nvidia/classes/clb1c0qmd.h similarity index 100% rename from src/nouveau/headers/classes/clb1c0qmd.h rename to src/nouveau/headers/nvidia/classes/clb1c0qmd.h diff --git a/src/nouveau/headers/classes/clc06f.h b/src/nouveau/headers/nvidia/classes/clc06f.h similarity index 100% rename from src/nouveau/headers/classes/clc06f.h rename to src/nouveau/headers/nvidia/classes/clc06f.h diff --git a/src/nouveau/headers/classes/clc097.h b/src/nouveau/headers/nvidia/classes/clc097.h similarity index 100% rename from src/nouveau/headers/classes/clc097.h rename to src/nouveau/headers/nvidia/classes/clc097.h diff --git a/src/nouveau/headers/classes/clc097tex.h b/src/nouveau/headers/nvidia/classes/clc097tex.h similarity index 100% rename from src/nouveau/headers/classes/clc097tex.h rename to src/nouveau/headers/nvidia/classes/clc097tex.h diff --git a/src/nouveau/headers/classes/clc0b5.h b/src/nouveau/headers/nvidia/classes/clc0b5.h similarity index 100% rename from src/nouveau/headers/classes/clc0b5.h rename to src/nouveau/headers/nvidia/classes/clc0b5.h diff --git a/src/nouveau/headers/classes/clc0c0.h b/src/nouveau/headers/nvidia/classes/clc0c0.h similarity index 100% rename from src/nouveau/headers/classes/clc0c0.h rename to src/nouveau/headers/nvidia/classes/clc0c0.h diff --git a/src/nouveau/headers/classes/clc0c0qmd.h b/src/nouveau/headers/nvidia/classes/clc0c0qmd.h similarity index 100% rename from src/nouveau/headers/classes/clc0c0qmd.h rename to src/nouveau/headers/nvidia/classes/clc0c0qmd.h diff --git a/src/nouveau/headers/classes/clc197.h b/src/nouveau/headers/nvidia/classes/clc197.h similarity index 100% rename from src/nouveau/headers/classes/clc197.h rename to src/nouveau/headers/nvidia/classes/clc197.h diff --git a/src/nouveau/headers/classes/clc197tex.h b/src/nouveau/headers/nvidia/classes/clc197tex.h similarity index 100% rename from src/nouveau/headers/classes/clc197tex.h rename to src/nouveau/headers/nvidia/classes/clc197tex.h diff --git a/src/nouveau/headers/classes/clc1b5.h b/src/nouveau/headers/nvidia/classes/clc1b5.h similarity index 100% rename from src/nouveau/headers/classes/clc1b5.h rename to src/nouveau/headers/nvidia/classes/clc1b5.h diff --git a/src/nouveau/headers/classes/clc1c0.h b/src/nouveau/headers/nvidia/classes/clc1c0.h similarity index 100% rename from src/nouveau/headers/classes/clc1c0.h rename to src/nouveau/headers/nvidia/classes/clc1c0.h diff --git a/src/nouveau/headers/classes/clc1c0qmd.h b/src/nouveau/headers/nvidia/classes/clc1c0qmd.h similarity index 100% rename from src/nouveau/headers/classes/clc1c0qmd.h rename to src/nouveau/headers/nvidia/classes/clc1c0qmd.h diff --git a/src/nouveau/headers/classes/clc36f.h b/src/nouveau/headers/nvidia/classes/clc36f.h similarity index 100% rename from src/nouveau/headers/classes/clc36f.h rename to src/nouveau/headers/nvidia/classes/clc36f.h diff --git a/src/nouveau/headers/classes/clc397.h b/src/nouveau/headers/nvidia/classes/clc397.h similarity index 100% rename from src/nouveau/headers/classes/clc397.h rename to src/nouveau/headers/nvidia/classes/clc397.h diff --git a/src/nouveau/headers/classes/clc397tex.h b/src/nouveau/headers/nvidia/classes/clc397tex.h similarity index 100% rename from src/nouveau/headers/classes/clc397tex.h rename to src/nouveau/headers/nvidia/classes/clc397tex.h diff --git a/src/nouveau/headers/classes/clc3b5.h b/src/nouveau/headers/nvidia/classes/clc3b5.h similarity index 100% rename from src/nouveau/headers/classes/clc3b5.h rename to src/nouveau/headers/nvidia/classes/clc3b5.h diff --git a/src/nouveau/headers/classes/clc3c0.h b/src/nouveau/headers/nvidia/classes/clc3c0.h similarity index 100% rename from src/nouveau/headers/classes/clc3c0.h rename to src/nouveau/headers/nvidia/classes/clc3c0.h diff --git a/src/nouveau/headers/classes/clc3c0qmd.h b/src/nouveau/headers/nvidia/classes/clc3c0qmd.h similarity index 100% rename from src/nouveau/headers/classes/clc3c0qmd.h rename to src/nouveau/headers/nvidia/classes/clc3c0qmd.h diff --git a/src/nouveau/headers/classes/clc46f.h b/src/nouveau/headers/nvidia/classes/clc46f.h similarity index 100% rename from src/nouveau/headers/classes/clc46f.h rename to src/nouveau/headers/nvidia/classes/clc46f.h diff --git a/src/nouveau/headers/classes/clc4c0qmd.h b/src/nouveau/headers/nvidia/classes/clc4c0qmd.h similarity index 100% rename from src/nouveau/headers/classes/clc4c0qmd.h rename to src/nouveau/headers/nvidia/classes/clc4c0qmd.h diff --git a/src/nouveau/headers/classes/clc56f.h b/src/nouveau/headers/nvidia/classes/clc56f.h similarity index 100% rename from src/nouveau/headers/classes/clc56f.h rename to src/nouveau/headers/nvidia/classes/clc56f.h diff --git a/src/nouveau/headers/classes/clc597.h b/src/nouveau/headers/nvidia/classes/clc597.h similarity index 100% rename from src/nouveau/headers/classes/clc597.h rename to src/nouveau/headers/nvidia/classes/clc597.h diff --git a/src/nouveau/headers/classes/clc597tex.h b/src/nouveau/headers/nvidia/classes/clc597tex.h similarity index 100% rename from src/nouveau/headers/classes/clc597tex.h rename to src/nouveau/headers/nvidia/classes/clc597tex.h diff --git a/src/nouveau/headers/classes/clc5b5.h b/src/nouveau/headers/nvidia/classes/clc5b5.h similarity index 100% rename from src/nouveau/headers/classes/clc5b5.h rename to src/nouveau/headers/nvidia/classes/clc5b5.h diff --git a/src/nouveau/headers/classes/clc5c0.h b/src/nouveau/headers/nvidia/classes/clc5c0.h similarity index 100% rename from src/nouveau/headers/classes/clc5c0.h rename to src/nouveau/headers/nvidia/classes/clc5c0.h diff --git a/src/nouveau/headers/classes/clc5c0qmd.h b/src/nouveau/headers/nvidia/classes/clc5c0qmd.h similarity index 100% rename from src/nouveau/headers/classes/clc5c0qmd.h rename to src/nouveau/headers/nvidia/classes/clc5c0qmd.h diff --git a/src/nouveau/headers/classes/clc697.h b/src/nouveau/headers/nvidia/classes/clc697.h similarity index 100% rename from src/nouveau/headers/classes/clc697.h rename to src/nouveau/headers/nvidia/classes/clc697.h diff --git a/src/nouveau/headers/classes/clc697tex.h b/src/nouveau/headers/nvidia/classes/clc697tex.h similarity index 100% rename from src/nouveau/headers/classes/clc697tex.h rename to src/nouveau/headers/nvidia/classes/clc697tex.h diff --git a/src/nouveau/headers/classes/clc6b5.h b/src/nouveau/headers/nvidia/classes/clc6b5.h similarity index 100% rename from src/nouveau/headers/classes/clc6b5.h rename to src/nouveau/headers/nvidia/classes/clc6b5.h diff --git a/src/nouveau/headers/classes/clc6c0.h b/src/nouveau/headers/nvidia/classes/clc6c0.h similarity index 100% rename from src/nouveau/headers/classes/clc6c0.h rename to src/nouveau/headers/nvidia/classes/clc6c0.h diff --git a/src/nouveau/headers/classes/clc6c0qmd.h b/src/nouveau/headers/nvidia/classes/clc6c0qmd.h similarity index 100% rename from src/nouveau/headers/classes/clc6c0qmd.h rename to src/nouveau/headers/nvidia/classes/clc6c0qmd.h diff --git a/src/nouveau/headers/classes/clc76f.h b/src/nouveau/headers/nvidia/classes/clc76f.h similarity index 100% rename from src/nouveau/headers/classes/clc76f.h rename to src/nouveau/headers/nvidia/classes/clc76f.h diff --git a/src/nouveau/headers/classes/clc797.h b/src/nouveau/headers/nvidia/classes/clc797.h similarity index 100% rename from src/nouveau/headers/classes/clc797.h rename to src/nouveau/headers/nvidia/classes/clc797.h diff --git a/src/nouveau/headers/classes/clc797tex.h b/src/nouveau/headers/nvidia/classes/clc797tex.h similarity index 100% rename from src/nouveau/headers/classes/clc797tex.h rename to src/nouveau/headers/nvidia/classes/clc797tex.h diff --git a/src/nouveau/headers/classes/clc7b5.h b/src/nouveau/headers/nvidia/classes/clc7b5.h similarity index 100% rename from src/nouveau/headers/classes/clc7b5.h rename to src/nouveau/headers/nvidia/classes/clc7b5.h diff --git a/src/nouveau/headers/classes/clc7c0.h b/src/nouveau/headers/nvidia/classes/clc7c0.h similarity index 100% rename from src/nouveau/headers/classes/clc7c0.h rename to src/nouveau/headers/nvidia/classes/clc7c0.h diff --git a/src/nouveau/headers/classes/clc7c0qmd.h b/src/nouveau/headers/nvidia/classes/clc7c0qmd.h similarity index 100% rename from src/nouveau/headers/classes/clc7c0qmd.h rename to src/nouveau/headers/nvidia/classes/clc7c0qmd.h diff --git a/src/nouveau/headers/classes/clc997.h b/src/nouveau/headers/nvidia/classes/clc997.h similarity index 100% rename from src/nouveau/headers/classes/clc997.h rename to src/nouveau/headers/nvidia/classes/clc997.h diff --git a/src/nouveau/headers/classes/clc997tex.h b/src/nouveau/headers/nvidia/classes/clc997tex.h similarity index 100% rename from src/nouveau/headers/classes/clc997tex.h rename to src/nouveau/headers/nvidia/classes/clc997tex.h diff --git a/src/nouveau/headers/classes/clcb97.h b/src/nouveau/headers/nvidia/classes/clcb97.h similarity index 100% rename from src/nouveau/headers/classes/clcb97.h rename to src/nouveau/headers/nvidia/classes/clcb97.h diff --git a/src/nouveau/headers/classes/clcb97tex.h b/src/nouveau/headers/nvidia/classes/clcb97tex.h similarity index 100% rename from src/nouveau/headers/classes/clcb97tex.h rename to src/nouveau/headers/nvidia/classes/clcb97tex.h diff --git a/src/nouveau/vulkan/nvk_cmd_dispatch.c b/src/nouveau/vulkan/nvk_cmd_dispatch.c index 8ae616d4eeb..9697c61babc 100644 --- a/src/nouveau/vulkan/nvk_cmd_dispatch.c +++ b/src/nouveau/vulkan/nvk_cmd_dispatch.c @@ -13,8 +13,7 @@ #include "nouveau_context.h" -#include "classes/cla0b5.h" - +#include "cla0b5.h" #include "cla1c0.h" #include "clc0c0.h" #include "clc5c0.h" diff --git a/src/nouveau/vulkan/nvk_format.c b/src/nouveau/vulkan/nvk_format.c index 6dbfd810c7e..6b7a93719b5 100644 --- a/src/nouveau/vulkan/nvk_format.c +++ b/src/nouveau/vulkan/nvk_format.c @@ -13,9 +13,9 @@ #include "vk_format.h" #include "nvtypes.h" -#include "classes/cl902d.h" -#include "classes/cl9097.h" -#include "classes/cl90c0.h" +#include "cl902d.h" +#include "cl9097.h" +#include "cl90c0.h" #define VA_FMT(vk_fmt, widths, swap_rb, type) \ [VK_FORMAT_##vk_fmt] = \
