projects / platform / upstream / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b288ec8)
pvr: Fix typo in PDS function name
authorKarmjit Mahil <Karmjit.Mahil@imgtec.com>
Mon, 27 Feb 2023 11:50:09 +0000 (11:50 +0000)
committerMarge Bot <emma+marge@anholt.net>
Wed, 19 Apr 2023 13:22:20 +0000 (13:22 +0000)
Signed-off-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21589>

src/imagination/vulkan/pds/pvr_pds.c patch | blob | history
src/imagination/vulkan/pds/pvr_pipeline_pds.c patch | blob | history
src/imagination/vulkan/pds/pvr_rogue_pds_encode.h patch | blob | history

diff --git a/src/imagination/vulkan/pds/pvr_pds.c b/src/imagination/vulkan/pds/pvr_pds.c
index 5baad53..7d0a128 100644 (file)
--- a/src/imagination/vulkan/pds/pvr_pds.c
+++ b/src/imagination/vulkan/pds/pvr_pds.c
@@ -1119,7 +1119,7 @@ pvr_pds_vertex_shader(struct pvr_pds_vertex_shader_program *restrict program,
                if (shift < -31) {
                   /* >> (31) */
                   shift_2s_comp = 0xFFFE1;
-                  *buffer++ = pvr_pds_inst_encode_stflp64(
+                  *buffer++ = pvr_pds_inst_encode_sftlp64(
                      /* cc */ 0,
                      /* LOP */ PVR_ROGUE_PDSINST_LOP_NONE,
                      /* IM */ 1, /*  enable immediate */
@@ -1136,7 +1136,7 @@ pvr_pds_vertex_shader(struct pvr_pds_vertex_shader_program *restrict program,
                 * new: >> (shift + 31)
                 */
                shift_2s_comp = *((uint32_t *)&shift);
-               *buffer++ = pvr_pds_inst_encode_stflp64(
+               *buffer++ = pvr_pds_inst_encode_sftlp64(
                   /* cc */ 0,
                   /* LOP */ PVR_ROGUE_PDSINST_LOP_NONE,
                   /* IM */ 1, /*enable immediate */
@@ -1168,7 +1168,7 @@ pvr_pds_vertex_shader(struct pvr_pds_vertex_shader_program *restrict program,
                /* 2's complement of shift as this will be a right shift. */
                shift_2s_comp = ~(vertex_stream->shift) + 1;
 
-               *buffer++ = pvr_pds_inst_encode_stflp32(
+               *buffer++ = pvr_pds_inst_encode_sftlp32(
                   /* IM */ 1, /*  enable immediate. */
                   /* cc */ 0,
                   /* LOP */ PVR_ROGUE_PDSINST_LOP_NONE,
@@ -1257,7 +1257,7 @@ pvr_pds_vertex_shader(struct pvr_pds_vertex_shader_program *restrict program,
                }
 
                if (temp != pre_index_temp) {
-                  *buffer++ = pvr_pds_inst_encode_stflp32(
+                  *buffer++ = pvr_pds_inst_encode_sftlp32(
                      /* IM */ 1, /*  enable immediate. */
                      /* cc */ 0,
                      /* LOP */ PVR_ROGUE_PDSINST_LOP_NONE,
@@ -1267,7 +1267,7 @@ pvr_pds_vertex_shader(struct pvr_pds_vertex_shader_program *restrict program,
                      /* DST */ index_temp64);
                }
 
-               *buffer++ = pvr_pds_inst_encode_stflp32(
+               *buffer++ = pvr_pds_inst_encode_sftlp32(
                   /* IM */ 1, /*  enable immediate. */
                   /* cc */ 0,
                   /* LOP */ PVR_ROGUE_PDSINST_LOP_OR,
@@ -2276,7 +2276,7 @@ pvr_pds_compute_shader(struct pvr_pds_compute_shader_program *restrict program,
             APPEND(pvr_pds_inst_encode_wdf(0));
 
             for (uint32_t i = 0; i < 4; i++) {
-               APPEND(pvr_pds_inst_encode_stflp32(
+               APPEND(pvr_pds_inst_encode_sftlp32(
                   1, /* enable immediate */
                   0, /* cc */
                   PVR_ROGUE_PDSINST_LOP_AND, /* LOP */
@@ -2286,7 +2286,7 @@ pvr_pds_compute_shader(struct pvr_pds_compute_shader_program *restrict program,
                   cond_render_pred_temp + i)); /* DST */
 
                APPEND(
-                  pvr_pds_inst_encode_stflp32(1, /* enable immediate */
+                  pvr_pds_inst_encode_sftlp32(1, /* enable immediate */
                                               0, /* cc */
                                               PVR_ROGUE_PDSINST_LOP_OR, /* LOP
                                                                          */
@@ -2303,7 +2303,7 @@ pvr_pds_compute_shader(struct pvr_pds_compute_shader_program *restrict program,
                                             0, /* SRC0 */
                                             0)); /* GLOBALREG */
 
-            APPEND(pvr_pds_inst_encode_stflp32(1, /* enable immediate */
+            APPEND(pvr_pds_inst_encode_sftlp32(1, /* enable immediate */
                                                0, /* cc */
                                                PVR_ROGUE_PDSINST_LOP_XOR, /* LOP
                                                                            */
diff --git a/src/imagination/vulkan/pds/pvr_pipeline_pds.c b/src/imagination/vulkan/pds/pvr_pipeline_pds.c
index 465a740..f3ecb5a 100644 (file)
--- a/src/imagination/vulkan/pds/pvr_pipeline_pds.c
+++ b/src/imagination/vulkan/pds/pvr_pipeline_pds.c
@@ -686,7 +686,7 @@ void pvr_pds_generate_vertex_primary_program(
 
          PVR_PDS_MODE_TOGGLE(code,
                              instruction,
-                             pvr_pds_inst_encode_stflp64(
+                             pvr_pds_inst_encode_sftlp64(
                                 0, /* cc */
                                 PVR_ROGUE_PDSINST_LOP_XOR, /* LOP */
                                 1, /* IM */
@@ -699,7 +699,7 @@ void pvr_pds_generate_vertex_primary_program(
                                 ));
          PVR_PDS_MODE_TOGGLE(code,
                              instruction,
-                             pvr_pds_inst_encode_stflp64(
+                             pvr_pds_inst_encode_sftlp64(
                                 0, /* cc */
                                 PVR_ROGUE_PDSINST_LOP_NONE, /* LOP */
                                 1, /* IM */
@@ -712,7 +712,7 @@ void pvr_pds_generate_vertex_primary_program(
                                 ));
          PVR_PDS_MODE_TOGGLE(code,
                              instruction,
-                             pvr_pds_inst_encode_stflp64(
+                             pvr_pds_inst_encode_sftlp64(
                                 0, /* cc */
                                 PVR_ROGUE_PDSINST_LOP_NONE, /* LOP */
                                 1, /* IM */
@@ -885,7 +885,7 @@ void pvr_pds_generate_vertex_primary_program(
                shift_2s_comp = 0xFFFE1;
                PVR_PDS_MODE_TOGGLE(code,
                                    instruction,
-                                   pvr_pds_inst_encode_stflp64(
+                                   pvr_pds_inst_encode_sftlp64(
                                       /* cc */ 0,
                                       /* LOP */ PVR_ROGUE_PDSINST_LOP_NONE,
                                       /* IM */ 1, /*  enable immediate */
@@ -902,7 +902,7 @@ void pvr_pds_generate_vertex_primary_program(
             shift_2s_comp = *((uint32_t *)&shift);
             PVR_PDS_MODE_TOGGLE(code,
                                 instruction,
-                                pvr_pds_inst_encode_stflp64(
+                                pvr_pds_inst_encode_sftlp64(
                                    /* cc */ 0,
                                    /* LOP */ PVR_ROGUE_PDSINST_LOP_NONE,
                                    /* IM */ 1, /*  enable immediate */
@@ -1235,7 +1235,7 @@ void pvr_pds_generate_vertex_primary_program(
 
             PVR_PDS_MODE_TOGGLE(code,
                                 instruction,
-                                pvr_pds_inst_encode_stflp32(
+                                pvr_pds_inst_encode_sftlp32(
                                    1, /* IM */
                                    0, /* cc */
                                    PVR_ROGUE_PDSINST_LOP_NONE, /* LOP */
@@ -1261,7 +1261,7 @@ void pvr_pds_generate_vertex_primary_program(
 
             PVR_PDS_MODE_TOGGLE(code,
                                 instruction,
-                                pvr_pds_inst_encode_stflp32(
+                                pvr_pds_inst_encode_sftlp32(
                                    1, /* IM */
                                    1, /* cc */
                                    PVR_ROGUE_PDSINST_LOP_NONE, /* LOP */
diff --git a/src/imagination/vulkan/pds/pvr_rogue_pds_encode.h b/src/imagination/vulkan/pds/pvr_rogue_pds_encode.h
index a7ba617..04b20ea 100644 (file)
--- a/src/imagination/vulkan/pds/pvr_rogue_pds_encode.h
+++ b/src/imagination/vulkan/pds/pvr_rogue_pds_encode.h
@@ -60,7 +60,7 @@ pvr_pds_inst_decode_field_range_regs32(uint32_t value)
    return 3;
 }
 
-static ALWAYS_INLINE uint32_t pvr_pds_inst_encode_stflp64(uint32_t cc,
+static ALWAYS_INLINE uint32_t pvr_pds_inst_encode_sftlp64(uint32_t cc,
                                                           uint32_t lop,
                                                           uint32_t im,
                                                           uint32_t src0,
@@ -112,7 +112,7 @@ pvr_pds_inst_decode_field_range_regs32tp(uint32_t value)
    return 2;
 }
 
-static ALWAYS_INLINE uint32_t pvr_pds_inst_encode_stflp32(uint32_t im,
+static ALWAYS_INLINE uint32_t pvr_pds_inst_encode_sftlp32(uint32_t im,
                                                           uint32_t cc,
                                                           uint32_t lop,
                                                           uint32_t src0,
Domain: Graphics System / GL;