Module: Mesa Branch: main Commit: 14c6f716b411a4fcccc81e8a5f5aff9b0f51816a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=14c6f716b411a4fcccc81e8a5f5aff9b0f51816a
Author: Adam Jackson <[email protected]> Date: Sat Aug 6 00:00:09 2022 -0400 nouveau: const cleanup Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18586> --- src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h | 30 +++++++++++----------- src/gallium/drivers/nouveau/nvc0/mme/comc597.mme.h | 30 +++++++++++----------- src/nouveau/codegen/lib/gf100.asm.h | 4 +-- src/nouveau/codegen/lib/gk104.asm.h | 4 +-- src/nouveau/codegen/lib/gk110.asm.h | 4 +-- src/nouveau/codegen/lib/gm107.asm.h | 4 +-- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h b/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h index f068367c84e..79339b466b7 100644 --- a/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h +++ b/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h @@ -1,4 +1,4 @@ -uint32_t mme9097_per_instance_bf[] = { +const uint32_t mme9097_per_instance_bf[] = { /* 0x0003: loop */ 0x00000301, 0x00000211, @@ -9,7 +9,7 @@ uint32_t mme9097_per_instance_bf[] = { 0x00005211, }; -uint32_t mme9097_blend_enables[] = { +const uint32_t mme9097_blend_enables[] = { 0x05360021, 0x00404042, 0x00424042, @@ -21,7 +21,7 @@ uint32_t mme9097_blend_enables[] = { 0x004e4042, }; -uint32_t mme9097_vertex_array_select[] = { +const uint32_t mme9097_vertex_array_select[] = { 0x00000201, 0x00000301, 0x00000401, @@ -36,7 +36,7 @@ uint32_t mme9097_vertex_array_select[] = { 0x00001841, }; -uint32_t mme9097_poly_mode_front[] = { +const uint32_t mme9097_poly_mode_front[] = { 0x00db0215, 0x020c0315, /* 0x000a: locn_0a_pmf */ @@ -58,7 +58,7 @@ uint32_t mme9097_poly_mode_front[] = { 0x00003041, }; -uint32_t mme9097_poly_mode_back[] = { +const uint32_t mme9097_poly_mode_back[] = { 0x00dac215, 0x020c0315, /* 0x000a: locn_0a_pmb */ @@ -80,7 +80,7 @@ uint32_t mme9097_poly_mode_back[] = { 0x00003041, }; -uint32_t mme9097_gp_select[] = { +const uint32_t mme9097_gp_select[] = { 0x00dac215, 0x00db0315, /* 0x000a: locn_0a_gs */ @@ -102,7 +102,7 @@ uint32_t mme9097_gp_select[] = { 0x00003041, }; -uint32_t mme9097_tep_select[] = { +const uint32_t mme9097_tep_select[] = { 0x00dac215, 0x00db0315, /* 0x000a: locn_0a_ts */ @@ -124,7 +124,7 @@ uint32_t mme9097_tep_select[] = { 0x00003041, }; -uint32_t mme9097_draw_elts_indirect[] = { +const uint32_t mme9097_draw_elts_indirect[] = { 0x01434615, /* 0x0007: dei_draw_again */ 0x01438715, @@ -172,7 +172,7 @@ uint32_t mme9097_draw_elts_indirect[] = { 0x00003041, }; -uint32_t mme9097_draw_arrays_indirect[] = { +const uint32_t mme9097_draw_arrays_indirect[] = { /* 0x0003: dai_draw_again */ 0x01438515, 0x00000601, @@ -208,7 +208,7 @@ uint32_t mme9097_draw_arrays_indirect[] = { 0x00002841, }; -uint32_t mme9097_draw_elts_indirect_count[] = { +const uint32_t mme9097_draw_elts_indirect_count[] = { 0x01434615, 0x01438715, 0x07400021, @@ -278,7 +278,7 @@ uint32_t mme9097_draw_elts_indirect_count[] = { 0xfffc8027, }; -uint32_t mme9097_draw_arrays_indirect_count[] = { +const uint32_t mme9097_draw_arrays_indirect_count[] = { 0x01438515, 0x03400021, /* 0x0009: daic_draw_again */ @@ -333,7 +333,7 @@ uint32_t mme9097_draw_arrays_indirect_count[] = { 0xfffdc027, }; -uint32_t mme9097_query_buffer_write[] = { +const uint32_t mme9097_query_buffer_write[] = { 0x00000201, 0x00000301, /* 0x000b: qbw_ready */ @@ -374,7 +374,7 @@ uint32_t mme9097_query_buffer_write[] = { 0x00110071, }; -uint32_t mme9097_conservative_raster_state[] = { +const uint32_t mme9097_conservative_raster_state[] = { 0x07400021, 0x00000041, 0xb8d04042, @@ -395,7 +395,7 @@ uint32_t mme9097_conservative_raster_state[] = { 0x00004041, }; -uint32_t mme9097_compute_counter[] = { +const uint32_t mme9097_compute_counter[] = { /* 0x0003: iic_loop_start */ 0x00000f11, /* 0x0006: iic_mul_start */ @@ -427,7 +427,7 @@ uint32_t mme9097_compute_counter[] = { 0x0002a040, }; -uint32_t mme9097_compute_counter_to_query[] = { +const uint32_t mme9097_compute_counter_to_query[] = { 0x00000201, 0x03410315, 0x03414415, diff --git a/src/gallium/drivers/nouveau/nvc0/mme/comc597.mme.h b/src/gallium/drivers/nouveau/nvc0/mme/comc597.mme.h index 390741cbd04..cfcc650bffd 100644 --- a/src/gallium/drivers/nouveau/nvc0/mme/comc597.mme.h +++ b/src/gallium/drivers/nouveau/nvc0/mme/comc597.mme.h @@ -110,7 +110,7 @@ NV_MME_OUT_##m0, NV_MME_OUT_##e0, \ NV_MME_OUT_##m1, NV_MME_OUT_##e1) -uint32_t mmec597_per_instance_bf[] = { +const uint32_t mmec597_per_instance_bf[] = { // r1 = load(); // count // r3 = load(); // mask // mthd(0x1880, 1); // VERTEX_ARRAY_PER_INSTANCE[0] @@ -132,7 +132,7 @@ uint32_t mmec597_per_instance_bf[] = { ADD, ZERO, ZERO, ZERO, 0, NONE, NONE), }; -uint32_t mmec597_vertex_array_select[] = { +const uint32_t mmec597_vertex_array_select[] = { // r1 = load(); // array // r2 = load(); // limit hi // r3 = load(); // limit lo @@ -162,7 +162,7 @@ uint32_t mmec597_vertex_array_select[] = { ADD, ZERO, ZERO, ZERO, 0, NONE, NONE), }; -uint32_t mmec597_blend_enables[] = { +const uint32_t mmec597_blend_enables[] = { // r1 = load(); // enable mask // mthd(0x1360, 1); // NVC0_3D_BLEND_ENABLE[] // send((r1 >> 0) & 1); @@ -185,7 +185,7 @@ uint32_t mmec597_blend_enables[] = { MERGE, ZERO, ZERO, R1, (0<<10)|(1<<5)|7, NONE, ALU1), }; -uint32_t mmec597_poly_mode_front[] = { +const uint32_t mmec597_poly_mode_front[] = { // r1 = load(); // mthd(0x0dac,0); // POLYGON_MODE_FRONT // send(r1); @@ -229,7 +229,7 @@ uint32_t mmec597_poly_mode_front[] = { ADD, ZERO, ZERO, ZERO, 0, NONE, NONE), }; -uint32_t mmec597_poly_mode_back[] = { +const uint32_t mmec597_poly_mode_back[] = { // r1 = load(); // mthd(0x0db0,0); // POLYGON_MODE_BACK // send(r1); @@ -273,7 +273,7 @@ uint32_t mmec597_poly_mode_back[] = { ADD, ZERO, ZERO, ZERO, 0, NONE, NONE), }; -uint32_t mmec597_gp_select[] = { +const uint32_t mmec597_gp_select[] = { // r1 = load(); // mthd(0x2100,0); // SP_SELECT[4] // send(r1); @@ -317,7 +317,7 @@ uint32_t mmec597_gp_select[] = { ADD, ZERO, ZERO, ZERO, 0, NONE, NONE), }; -uint32_t mmec597_tep_select[] = { +const uint32_t mmec597_tep_select[] = { // r1 = load(); // mthd(0x20c0,0); // SP_SELECT[3] // send(r1); @@ -361,7 +361,7 @@ uint32_t mmec597_tep_select[] = { ADD, ZERO, ZERO, ZERO, 0, NONE, NONE), }; -uint32_t mmec597_draw_arrays_indirect[] = { +const uint32_t mmec597_draw_arrays_indirect[] = { // r1 = load(); // mode // r5 = read(0x1438); // VB_INSTANCE_BASE // r6 = load(); // start_drawid @@ -429,7 +429,7 @@ uint32_t mmec597_draw_arrays_indirect[] = { ADD, ZERO, ZERO, ZERO, 0, NONE, NONE), }; -uint32_t mmec597_draw_elts_indirect[] = { +const uint32_t mmec597_draw_elts_indirect[] = { // r1 = load(); // mode // r8 = read(0x1434); // VB_ELEMENT_BASE // r9 = read(0x1438); // VB_INSTANCE_BASE @@ -509,7 +509,7 @@ uint32_t mmec597_draw_elts_indirect[] = { ADD, ZERO, ZERO, ZERO, 0, NONE, NONE), }; -uint32_t mmec597_draw_arrays_indirect_count[] = { +const uint32_t mmec597_draw_arrays_indirect_count[] = { // r1 = load(); // mode // r6 = load(); // start_drawid // r7 = load(); // numparams @@ -606,7 +606,7 @@ uint32_t mmec597_draw_arrays_indirect_count[] = { ADD, ZERO, ZERO, ZERO, 0, NONE, NONE), }; -uint32_t mmec597_draw_elts_indirect_count[] = { +const uint32_t mmec597_draw_elts_indirect_count[] = { // r8 = read(0x1434); // r1 = load(); // r9 = read(0x1438); @@ -718,7 +718,7 @@ uint32_t mmec597_draw_elts_indirect_count[] = { ADD, ZERO, ZERO, ZERO, 0, NONE, NONE), }; -uint32_t mmec597_query_buffer_write[] = { +const uint32_t mmec597_query_buffer_write[] = { // r1 = load(); // clamp value // r2 = load(); // end value (lo) // r3 = load(); // end value (hi) @@ -794,7 +794,7 @@ uint32_t mmec597_query_buffer_write[] = { ADD, ZERO, ZERO, ZERO, 0, NONE, NONE), }; -uint32_t mmec597_conservative_raster_state[] = { +const uint32_t mmec597_conservative_raster_state[] = { // r1 = load(); // mthd(0x3400, 1); // send(0); @@ -834,7 +834,7 @@ uint32_t mmec597_conservative_raster_state[] = { ADD, ZERO, ZERO, ZERO, 0, NONE, NONE), }; -uint32_t mmec597_compute_counter[] = { +const uint32_t mmec597_compute_counter[] = { // r0 = load(); // r1 = 1; // r2 = 0; @@ -864,7 +864,7 @@ uint32_t mmec597_compute_counter[] = { ADDC, R4, R4, R2, 0, NONE, ALU1), }; -uint32_t mmec597_compute_counter_to_query[] = { +const uint32_t mmec597_compute_counter_to_query[] = { // r1 = load(); // r3 = read(0x3410); // r2 = load(); diff --git a/src/nouveau/codegen/lib/gf100.asm.h b/src/nouveau/codegen/lib/gf100.asm.h index 00fe5eab1c2..bc7ce4635a7 100644 --- a/src/nouveau/codegen/lib/gf100.asm.h +++ b/src/nouveau/codegen/lib/gf100.asm.h @@ -1,4 +1,4 @@ -uint64_t gf100_builtin_code[] = { +const uint64_t gf100_builtin_code[] = { /* 0x0000: gf100_div_u32 */ 0x7800000004009c03, 0x0010dd187c209cdd, @@ -55,7 +55,7 @@ uint64_t gf100_builtin_code[] = { 0x90001dff00001c08, }; -uint64_t gf100_builtin_offsets[] = { +const uint64_t gf100_builtin_offsets[] = { 0x0000000000000000, 0x00000000000000b0, 0x0000000000000180, diff --git a/src/nouveau/codegen/lib/gk104.asm.h b/src/nouveau/codegen/lib/gk104.asm.h index ed948dee471..a0662c06e25 100644 --- a/src/nouveau/codegen/lib/gk104.asm.h +++ b/src/nouveau/codegen/lib/gk104.asm.h @@ -1,4 +1,4 @@ -uint64_t gk104_builtin_code[] = { +const uint64_t gk104_builtin_code[] = { /* 0x0000: gk104_div_u32 */ 0x2282828042804287, 0x7800000004009c03, @@ -710,7 +710,7 @@ uint64_t gk104_builtin_code[] = { 0xa000000000000007, }; -uint64_t gk104_builtin_offsets[] = { +const uint64_t gk104_builtin_offsets[] = { 0x0000000000000000, 0x00000000000000f0, 0x0000000000000f18, diff --git a/src/nouveau/codegen/lib/gk110.asm.h b/src/nouveau/codegen/lib/gk110.asm.h index 3d1523f2fdd..98f70e8b8ef 100644 --- a/src/nouveau/codegen/lib/gk110.asm.h +++ b/src/nouveau/codegen/lib/gk110.asm.h @@ -1,4 +1,4 @@ -uint64_t gk110_builtin_code[] = { +const uint64_t gk110_builtin_code[] = { /* 0x0000: gk110_div_u32 */ 0x08a0a0a010a010a0, 0xe1800000009c000a, @@ -194,7 +194,7 @@ uint64_t gk110_builtin_code[] = { 0x19000000001c003c, }; -uint64_t gk110_builtin_offsets[] = { +const uint64_t gk110_builtin_offsets[] = { 0x0000000000000000, 0x00000000000000f0, 0x0000000000000218, diff --git a/src/nouveau/codegen/lib/gm107.asm.h b/src/nouveau/codegen/lib/gm107.asm.h index 8eb27bbac99..874d6cada3b 100644 --- a/src/nouveau/codegen/lib/gm107.asm.h +++ b/src/nouveau/codegen/lib/gm107.asm.h @@ -1,4 +1,4 @@ -uint64_t gm107_builtin_code[] = { +const uint64_t gm107_builtin_code[] = { /* 0x0000: gm107_div_u32 */ 0x001f9801fc21ff0d, 0x5c30000000170002, @@ -237,7 +237,7 @@ uint64_t gm107_builtin_code[] = { 0x50b0000000070f00, }; -uint64_t gm107_builtin_offsets[] = { +const uint64_t gm107_builtin_offsets[] = { 0x0000000000000000, 0x0000000000000120, 0x0000000000000280,
