mirror of https://gitlab.freedesktop.org/mesa/mesa
nouveau/headers: Make nvk_cl**** turn to nv_push_cl****
Signed-off-by: Yusuf Khan <yusisamerican@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29028>
This commit is contained in:
parent
8a0afd1276
commit
a6036033f0
|
@ -1,4 +1,4 @@
|
|||
nvk_classes = [
|
||||
nv_push_classes = [
|
||||
'cl902d',
|
||||
'cl9039',
|
||||
'cl906f',
|
||||
|
@ -32,19 +32,19 @@ hwref_gens = [
|
|||
'turing/tu102',
|
||||
]
|
||||
|
||||
nvk_cl_header_depend_files = [
|
||||
nv_push_cl_header_depend_files = [
|
||||
files('class_parser.py')
|
||||
]
|
||||
|
||||
cl_generated = []
|
||||
foreach cl : nvk_classes
|
||||
foreach cl : nv_push_classes
|
||||
cl_generated += custom_target(
|
||||
cl + '.h',
|
||||
input : ['class_parser.py', 'nvidia/classes/'+cl+'.h'],
|
||||
output : ['nvk_'+cl+'.h', 'nvk_'+cl+'.c'],
|
||||
output : ['nv_push_'+cl+'.h', 'nv_push_'+cl+'.c'],
|
||||
command : [prog_python, '@INPUT0@', '--in-h', '@INPUT1@',
|
||||
'--out-h', '@OUTPUT0@', '--out-c', '@OUTPUT1@'],
|
||||
depend_files: nvk_cl_header_depend_files,
|
||||
depend_files: nv_push_cl_header_depend_files,
|
||||
)
|
||||
endforeach
|
||||
|
||||
|
@ -76,14 +76,14 @@ if with_nouveau_vk
|
|||
rust = import('rust')
|
||||
|
||||
cl_rs_generated = []
|
||||
foreach cl : nvk_classes
|
||||
foreach cl : nv_push_classes
|
||||
cl_rs_generated += custom_target(
|
||||
'nvh_classes_' + cl + '.rs',
|
||||
input : ['class_parser.py', 'nvidia/classes/'+cl+'.h'],
|
||||
output : ['nvh_classes_'+cl+'.rs'],
|
||||
command : [prog_python, '@INPUT0@', '--in-h', '@INPUT1@',
|
||||
'--out-rs', '@OUTPUT0@'],
|
||||
depend_files: nvk_cl_header_depend_files,
|
||||
depend_files: nv_push_cl_header_depend_files,
|
||||
)
|
||||
|
||||
fs = import('fs')
|
||||
|
|
|
@ -4,23 +4,23 @@
|
|||
|
||||
#include <inttypes.h>
|
||||
|
||||
#include "nvk_cl902d.h"
|
||||
#include "nvk_cl906f.h"
|
||||
#include "nvk_cl9097.h"
|
||||
#include "nvk_cl90b5.h"
|
||||
#include "nvk_cla097.h"
|
||||
#include "nvk_cla0b5.h"
|
||||
#include "nvk_cla0c0.h"
|
||||
#include "nvk_clb197.h"
|
||||
#include "nvk_clc0c0.h"
|
||||
#include "nvk_clc1b5.h"
|
||||
#include "nvk_clc397.h"
|
||||
#include "nvk_clc3c0.h"
|
||||
#include "nvk_clc597.h"
|
||||
#include "nvk_clc5c0.h"
|
||||
#include "nvk_clc697.h"
|
||||
#include "nvk_clc6c0.h"
|
||||
#include "nvk_clc7c0.h"
|
||||
#include "nv_push_cl902d.h"
|
||||
#include "nv_push_cl906f.h"
|
||||
#include "nv_push_cl9097.h"
|
||||
#include "nv_push_cl90b5.h"
|
||||
#include "nv_push_cla097.h"
|
||||
#include "nv_push_cla0b5.h"
|
||||
#include "nv_push_cla0c0.h"
|
||||
#include "nv_push_clb197.h"
|
||||
#include "nv_push_clc0c0.h"
|
||||
#include "nv_push_clc1b5.h"
|
||||
#include "nv_push_clc397.h"
|
||||
#include "nv_push_clc3c0.h"
|
||||
#include "nv_push_clc597.h"
|
||||
#include "nv_push_clc5c0.h"
|
||||
#include "nv_push_clc697.h"
|
||||
#include "nv_push_clc6c0.h"
|
||||
#include "nv_push_clc7c0.h"
|
||||
|
||||
#ifndef NDEBUG
|
||||
void
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
#include "mme_fermi.h"
|
||||
#include "util/u_math.h"
|
||||
|
||||
#include "nvk_cl9097.h"
|
||||
#include "nvk_cl902d.h"
|
||||
#include "nv_push_cl9097.h"
|
||||
#include "nv_push_cl902d.h"
|
||||
|
||||
struct mme_fermi_sim {
|
||||
uint32_t param_count;
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "nvk_clc597.h"
|
||||
#include "nv_push_clc597.h"
|
||||
|
||||
#define PRED_TO_STR(OP) [MME_TU104_PRED_##OP] = #OP
|
||||
const char *pred_to_str[] = {
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include "mme_tu104.h"
|
||||
#include "util/u_math.h"
|
||||
|
||||
#include "nvk_clc597.h"
|
||||
#include "nv_push_clc597.h"
|
||||
|
||||
struct mme_tu104_sim {
|
||||
uint32_t param_count;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include <vector>
|
||||
|
||||
#include "nvk_clc597.h"
|
||||
#include "nv_push_clc597.h"
|
||||
|
||||
class mme_builder_test : public ::testing::Test {
|
||||
public:
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#include "mme_fermi_sim.h"
|
||||
/* for VOLTA_A */
|
||||
#include "nvk_clc397.h"
|
||||
#include "nv_push_clc397.h"
|
||||
|
||||
class mme_fermi_sim_test : public ::testing::Test, public mme_hw_runner {
|
||||
public:
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include "mme_fermi_sim.h"
|
||||
#include "mme_tu104_sim.h"
|
||||
|
||||
#include "nvk_clc597.h"
|
||||
#include "nv_push_clc597.h"
|
||||
|
||||
#include "nouveau_bo.h"
|
||||
#include "nouveau_context.h"
|
||||
|
|
|
@ -12,7 +12,7 @@ struct nouveau_ws_contxt;
|
|||
struct nouveau_ws_device;
|
||||
|
||||
#include "nv_push.h"
|
||||
#include "nvk_cl9097.h"
|
||||
#include "nv_push_cl9097.h"
|
||||
|
||||
#define DATA_BO_SIZE 4096
|
||||
#define DATA_DWORDS 1024
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include "mme_runner.h"
|
||||
#include "mme_tu104_sim.h"
|
||||
|
||||
#include "nvk_clc597.h"
|
||||
#include "nv_push_clc597.h"
|
||||
|
||||
class mme_tu104_sim_test : public ::testing::Test, public mme_hw_runner {
|
||||
public:
|
||||
|
|
|
@ -22,11 +22,11 @@
|
|||
|
||||
#include "nouveau/nouveau.h"
|
||||
|
||||
#include "nvk_cl906f.h"
|
||||
#include "nvk_cl90b5.h"
|
||||
#include "nvk_cla097.h"
|
||||
#include "nvk_cla0c0.h"
|
||||
#include "nvk_clc597.h"
|
||||
#include "nv_push_cl906f.h"
|
||||
#include "nv_push_cl90b5.h"
|
||||
#include "nv_push_cla097.h"
|
||||
#include "nv_push_cla0c0.h"
|
||||
#include "nv_push_clc597.h"
|
||||
|
||||
static void
|
||||
nvk_descriptor_state_fini(struct nvk_cmd_buffer *cmd,
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
#include "vk_format.h"
|
||||
|
||||
#include "nvk_cl9097.h"
|
||||
#include "nv_push_cl9097.h"
|
||||
#include "drf.h"
|
||||
|
||||
void
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
#include "nouveau_context.h"
|
||||
|
||||
#include "nvtypes.h"
|
||||
#include "nvk_cl902d.h"
|
||||
#include "nvk_cl90b5.h"
|
||||
#include "nvk_clc1b5.h"
|
||||
#include "nv_push_cl902d.h"
|
||||
#include "nv_push_cl90b5.h"
|
||||
#include "nv_push_clc1b5.h"
|
||||
|
||||
static inline uint16_t
|
||||
nvk_cmd_buffer_copy_cls(struct nvk_cmd_buffer *cmd)
|
||||
|
|
|
@ -17,14 +17,14 @@
|
|||
#include "cla1c0.h"
|
||||
#include "clc0c0.h"
|
||||
#include "clc5c0.h"
|
||||
#include "nvk_cl90c0.h"
|
||||
#include "nvk_cl9097.h"
|
||||
#include "nvk_cla0c0.h"
|
||||
#include "nvk_clb0c0.h"
|
||||
#include "nvk_clb1c0.h"
|
||||
#include "nvk_clc3c0.h"
|
||||
#include "nvk_clc597.h"
|
||||
#include "nvk_clc6c0.h"
|
||||
#include "nv_push_cl90c0.h"
|
||||
#include "nv_push_cl9097.h"
|
||||
#include "nv_push_cla0c0.h"
|
||||
#include "nv_push_clb0c0.h"
|
||||
#include "nv_push_clb1c0.h"
|
||||
#include "nv_push_clc3c0.h"
|
||||
#include "nv_push_clc597.h"
|
||||
#include "nv_push_clc6c0.h"
|
||||
|
||||
VkResult
|
||||
nvk_push_dispatch_state_init(struct nvk_device *dev, struct nv_push *p)
|
||||
|
|
|
@ -20,15 +20,15 @@
|
|||
|
||||
#include "nouveau_context.h"
|
||||
|
||||
#include "nvk_cl902d.h"
|
||||
#include "nvk_cl9097.h"
|
||||
#include "nvk_cl90b5.h"
|
||||
#include "nvk_cl90c0.h"
|
||||
#include "nvk_cla097.h"
|
||||
#include "nvk_clb097.h"
|
||||
#include "nvk_clb197.h"
|
||||
#include "nvk_clc397.h"
|
||||
#include "nvk_clc597.h"
|
||||
#include "nv_push_cl902d.h"
|
||||
#include "nv_push_cl9097.h"
|
||||
#include "nv_push_cl90b5.h"
|
||||
#include "nv_push_cl90c0.h"
|
||||
#include "nv_push_cla097.h"
|
||||
#include "nv_push_clb097.h"
|
||||
#include "nv_push_clb197.h"
|
||||
#include "nv_push_clc397.h"
|
||||
#include "nv_push_clc597.h"
|
||||
#include "drf.h"
|
||||
|
||||
static inline uint16_t
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
#include "nvk_image.h"
|
||||
#include "nvk_physical_device.h"
|
||||
|
||||
#include "nvk_cl9097.h"
|
||||
#include "nvk_clb197.h"
|
||||
#include "nv_push_cl9097.h"
|
||||
#include "nv_push_clb197.h"
|
||||
|
||||
static VkResult
|
||||
nvk_cmd_bind_map_buffer(struct vk_command_buffer *vk_cmd,
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "pipe/p_defines.h"
|
||||
#include "pipe/p_shader_tokens.h"
|
||||
|
||||
#include "nvk_cl9097.h"
|
||||
#include "nv_push_cl9097.h"
|
||||
|
||||
uint64_t
|
||||
nvk_cg_get_prog_debug(void)
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include <sys/mman.h>
|
||||
|
||||
#include "nvtypes.h"
|
||||
#include "nvk_cl90b5.h"
|
||||
#include "nv_push_cl90b5.h"
|
||||
|
||||
/* Supports opaque fd only */
|
||||
const VkExternalMemoryProperties nvk_opaque_fd_mem_props = {
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
#include "nvk_entrypoints.h"
|
||||
#include "nvk_mme.h"
|
||||
|
||||
#include "nvk_cl906f.h"
|
||||
#include "nvk_cl9097.h"
|
||||
#include "nv_push_cl906f.h"
|
||||
#include "nv_push_cl9097.h"
|
||||
|
||||
#define NVK_EVENT_MEM_SIZE sizeof(VkResult)
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include "util/macros.h"
|
||||
|
||||
#include "nv_push.h"
|
||||
#include "nvk_cl90b5.h"
|
||||
#include "nv_push_cl90b5.h"
|
||||
|
||||
VkResult
|
||||
nvk_heap_init(struct nvk_device *dev, struct nvk_heap *heap,
|
||||
|
|
|
@ -24,10 +24,10 @@
|
|||
|
||||
#include "util/os_time.h"
|
||||
|
||||
#include "nvk_cl906f.h"
|
||||
#include "nvk_cl9097.h"
|
||||
#include "nvk_cla0c0.h"
|
||||
#include "nvk_clc597.h"
|
||||
#include "nv_push_cl906f.h"
|
||||
#include "nv_push_cl9097.h"
|
||||
#include "nv_push_cla0c0.h"
|
||||
#include "nv_push_clc597.h"
|
||||
|
||||
struct nvk_query_report {
|
||||
uint64_t value;
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
#include <xf86drm.h>
|
||||
|
||||
#include "nvk_cl9039.h"
|
||||
#include "nvk_cl9097.h"
|
||||
#include "nvk_cl90b5.h"
|
||||
#include "nvk_cla0c0.h"
|
||||
#include "nv_push_cl9039.h"
|
||||
#include "nv_push_cl9097.h"
|
||||
#include "nv_push_cl90b5.h"
|
||||
#include "nv_push_cla0c0.h"
|
||||
#include "cla1c0.h"
|
||||
#include "nvk_clc3c0.h"
|
||||
#include "nvk_clc397.h"
|
||||
#include "nv_push_clc3c0.h"
|
||||
#include "nv_push_clc397.h"
|
||||
|
||||
static void
|
||||
nvk_queue_state_init(struct nvk_queue_state *qs)
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include "drm-uapi/nouveau_drm.h"
|
||||
|
||||
#include "nv_push.h"
|
||||
#include "nvk_cl90b5.h"
|
||||
#include "nv_push_cl90b5.h"
|
||||
|
||||
#define NVK_UPLOAD_BO_SIZE 64*1024
|
||||
|
||||
|
|
|
@ -4,12 +4,12 @@
|
|||
*/
|
||||
#include "nvk_mme.h"
|
||||
|
||||
#include "nvk_cla097.h"
|
||||
#include "nvk_cla0c0.h"
|
||||
#include "nvk_clc397.h"
|
||||
#include "nvk_clc3c0.h"
|
||||
#include "nvk_clc597.h"
|
||||
#include "nvk_clc5c0.h"
|
||||
#include "nv_push_cla097.h"
|
||||
#include "nv_push_cla0c0.h"
|
||||
#include "nv_push_clc397.h"
|
||||
#include "nv_push_clc3c0.h"
|
||||
#include "nv_push_clc597.h"
|
||||
#include "nv_push_clc5c0.h"
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue