st/mesa: remove st_tracked_state::name
authorMarek Olšák <marek.olsak@amd.com>
Sun, 17 Jul 2016 13:49:56 +0000 (15:49 +0200)
committerMarek Olšák <marek.olsak@amd.com>
Sat, 30 Jul 2016 13:02:14 +0000 (15:02 +0200)
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
20 files changed:
src/mesa/state_tracker/st_atom_array.c
src/mesa/state_tracker/st_atom_atomicbuf.c
src/mesa/state_tracker/st_atom_blend.c
src/mesa/state_tracker/st_atom_clip.c
src/mesa/state_tracker/st_atom_constbuf.c
src/mesa/state_tracker/st_atom_depth.c
src/mesa/state_tracker/st_atom_framebuffer.c
src/mesa/state_tracker/st_atom_image.c
src/mesa/state_tracker/st_atom_msaa.c
src/mesa/state_tracker/st_atom_pixeltransfer.c
src/mesa/state_tracker/st_atom_rasterizer.c
src/mesa/state_tracker/st_atom_sampler.c
src/mesa/state_tracker/st_atom_scissor.c
src/mesa/state_tracker/st_atom_shader.c
src/mesa/state_tracker/st_atom_stipple.c
src/mesa/state_tracker/st_atom_storagebuf.c
src/mesa/state_tracker/st_atom_tess.c
src/mesa/state_tracker/st_atom_texture.c
src/mesa/state_tracker/st_atom_viewport.c
src/mesa/state_tracker/st_context.h

index 0847184..992d6a9 100644 (file)
@@ -690,7 +690,6 @@ static void update_array(struct st_context *st)
 
 
 const struct st_tracked_state st_update_array = {
-   "st_update_array",                                  /* name */
    {                                                   /* dirty */
       _NEW_CURRENT_ATTRIB,                              /* mesa */
       ST_NEW_VERTEX_ARRAYS | ST_NEW_VERTEX_PROGRAM,     /* st */
index a27dbe0..d438071 100644 (file)
@@ -79,7 +79,6 @@ bind_vs_atomics(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_vs_atomics = {
-   "st_bind_vs_atomics",
    {
       0,
       ST_NEW_VERTEX_PROGRAM | ST_NEW_ATOMIC_BUFFER,
@@ -97,7 +96,6 @@ bind_fs_atomics(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_fs_atomics = {
-   "st_bind_fs_atomics",
    {
       0,
       ST_NEW_FRAGMENT_PROGRAM | ST_NEW_ATOMIC_BUFFER,
@@ -115,7 +113,6 @@ bind_gs_atomics(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_gs_atomics = {
-   "st_bind_gs_atomics",
    {
       0,
       ST_NEW_GEOMETRY_PROGRAM | ST_NEW_ATOMIC_BUFFER,
@@ -133,7 +130,6 @@ bind_tcs_atomics(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_tcs_atomics = {
-   "st_bind_tcs_atomics",
    {
       0,
       ST_NEW_TESSCTRL_PROGRAM | ST_NEW_ATOMIC_BUFFER,
@@ -151,7 +147,6 @@ bind_tes_atomics(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_tes_atomics = {
-   "st_bind_tes_atomics",
    {
       0,
       ST_NEW_TESSEVAL_PROGRAM | ST_NEW_ATOMIC_BUFFER,
@@ -169,7 +164,6 @@ bind_cs_atomics(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_cs_atomics = {
-   "st_bind_cs_atomics",
    {
       0,
       ST_NEW_COMPUTE_PROGRAM | ST_NEW_ATOMIC_BUFFER,
index 6bb4077..8adda10 100644 (file)
@@ -283,7 +283,6 @@ update_blend( struct st_context *st )
 
 
 const struct st_tracked_state st_update_blend = {
-   "st_update_blend",                                  /* name */
    {                                                   /* dirty */
       (_NEW_COLOR | _NEW_MULTISAMPLE),  /* XXX _NEW_BLEND someday? */  /* mesa */
       0,                                               /* st */
index b820d84..657aa84 100644 (file)
@@ -71,7 +71,6 @@ static void update_clip( struct st_context *st )
 
 
 const struct st_tracked_state st_update_clip = {
-   "st_update_clip",                                   /* name */
    {                                                   /* dirty */
       _NEW_TRANSFORM | _NEW_PROJECTION,                 /* mesa */
       ST_NEW_VERTEX_PROGRAM,                           /* st */
index 594db1e..a9ec195 100644 (file)
@@ -145,7 +145,6 @@ static void update_vs_constants(struct st_context *st )
 
 
 const struct st_tracked_state st_update_vs_constants = {
-   "st_update_vs_constants",                           /* name */
    {                                                   /* dirty */
       _NEW_PROGRAM_CONSTANTS,                           /* mesa */
       ST_NEW_VERTEX_PROGRAM,                           /* st */
@@ -168,7 +167,6 @@ static void update_fs_constants(struct st_context *st )
 
 
 const struct st_tracked_state st_update_fs_constants = {
-   "st_update_fs_constants",                           /* name */
    {                                                   /* dirty */
       _NEW_PROGRAM_CONSTANTS,                           /* mesa */
       ST_NEW_FRAGMENT_PROGRAM,                         /* st */
@@ -190,7 +188,6 @@ static void update_gs_constants(struct st_context *st )
 }
 
 const struct st_tracked_state st_update_gs_constants = {
-   "st_update_gs_constants",                           /* name */
    {                                                   /* dirty */
       _NEW_PROGRAM_CONSTANTS,                           /* mesa */
       ST_NEW_GEOMETRY_PROGRAM,                         /* st */
@@ -212,7 +209,6 @@ static void update_tcs_constants(struct st_context *st )
 }
 
 const struct st_tracked_state st_update_tcs_constants = {
-   "st_update_tcs_constants",                          /* name */
    {                                                   /* dirty */
       _NEW_PROGRAM_CONSTANTS,                           /* mesa */
       ST_NEW_TESSCTRL_PROGRAM,                         /* st */
@@ -234,7 +230,6 @@ static void update_tes_constants(struct st_context *st )
 }
 
 const struct st_tracked_state st_update_tes_constants = {
-   "st_update_tes_constants",                          /* name */
    {                                                   /* dirty */
       _NEW_PROGRAM_CONSTANTS,                           /* mesa */
       ST_NEW_TESSEVAL_PROGRAM,                         /* st */
@@ -256,7 +251,6 @@ static void update_cs_constants(struct st_context *st )
 }
 
 const struct st_tracked_state st_update_cs_constants = {
-   "st_update_cs_constants",                           /* name */
    {                                                   /* dirty */
       _NEW_PROGRAM_CONSTANTS,                           /* mesa */
       ST_NEW_COMPUTE_PROGRAM,                          /* st */
@@ -314,7 +308,6 @@ static void bind_vs_ubos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_vs_ubos = {
-   "st_bind_vs_ubos",
    {
       0,
       ST_NEW_VERTEX_PROGRAM | ST_NEW_UNIFORM_BUFFER,
@@ -334,7 +327,6 @@ static void bind_fs_ubos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_fs_ubos = {
-   "st_bind_fs_ubos",
    {
       0,
       ST_NEW_FRAGMENT_PROGRAM | ST_NEW_UNIFORM_BUFFER,
@@ -354,7 +346,6 @@ static void bind_gs_ubos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_gs_ubos = {
-   "st_bind_gs_ubos",
    {
       0,
       ST_NEW_GEOMETRY_PROGRAM | ST_NEW_UNIFORM_BUFFER,
@@ -374,7 +365,6 @@ static void bind_tcs_ubos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_tcs_ubos = {
-   "st_bind_tcs_ubos",
    {
       0,
       ST_NEW_TESSCTRL_PROGRAM | ST_NEW_UNIFORM_BUFFER,
@@ -394,7 +384,6 @@ static void bind_tes_ubos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_tes_ubos = {
-   "st_bind_tes_ubos",
    {
       0,
       ST_NEW_TESSEVAL_PROGRAM | ST_NEW_UNIFORM_BUFFER,
@@ -415,7 +404,6 @@ static void bind_cs_ubos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_cs_ubos = {
-   "st_bind_cs_ubos",
    {
       0,
       ST_NEW_COMPUTE_PROGRAM | ST_NEW_UNIFORM_BUFFER,
index d9cc970..ec8480b 100644 (file)
@@ -161,7 +161,6 @@ update_depth_stencil_alpha(struct st_context *st)
 
 
 const struct st_tracked_state st_update_depth_stencil_alpha = {
-   "st_update_depth_stencil",                          /* name */
    {                                                   /* dirty */
       (_NEW_DEPTH|_NEW_STENCIL|_NEW_COLOR|_NEW_BUFFERS),/* mesa */
       0,                                               /* st */
index 7d769f2..5d91704 100644 (file)
@@ -215,7 +215,6 @@ update_framebuffer_state( struct st_context *st )
 
 
 const struct st_tracked_state st_update_framebuffer = {
-   "st_update_framebuffer",                            /* name */
    {                                                   /* dirty */
       _NEW_BUFFERS,                                    /* mesa */
       ST_NEW_FRAMEBUFFER,                              /* st */
index bc9344e..a170de0 100644 (file)
@@ -146,7 +146,6 @@ static void bind_vs_images(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_vs_images = {
-   "st_bind_vs_images",
    {
       _NEW_TEXTURE,
       ST_NEW_VERTEX_PROGRAM | ST_NEW_IMAGE_UNITS,
@@ -166,7 +165,6 @@ static void bind_fs_images(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_fs_images = {
-   "st_bind_fs_images",
    {
       _NEW_TEXTURE,
       ST_NEW_FRAGMENT_PROGRAM | ST_NEW_IMAGE_UNITS,
@@ -186,7 +184,6 @@ static void bind_gs_images(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_gs_images = {
-   "st_bind_gs_images",
    {
       _NEW_TEXTURE,
       ST_NEW_GEOMETRY_PROGRAM | ST_NEW_IMAGE_UNITS,
@@ -206,7 +203,6 @@ static void bind_tcs_images(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_tcs_images = {
-   "st_bind_tcs_images",
    {
       _NEW_TEXTURE,
       ST_NEW_TESSCTRL_PROGRAM | ST_NEW_IMAGE_UNITS,
@@ -226,7 +222,6 @@ static void bind_tes_images(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_tes_images = {
-   "st_bind_tes_images",
    {
       _NEW_TEXTURE,
       ST_NEW_TESSEVAL_PROGRAM | ST_NEW_IMAGE_UNITS,
@@ -246,7 +241,6 @@ static void bind_cs_images(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_cs_images = {
-   "st_bind_cs_images",
    {
       _NEW_TEXTURE,
       ST_NEW_COMPUTE_PROGRAM | ST_NEW_IMAGE_UNITS,
index 404f54d..3025534 100644 (file)
@@ -86,7 +86,6 @@ static void update_sample_shading( struct st_context *st )
 }
 
 const struct st_tracked_state st_update_msaa = {
-   "st_update_msaa",                                   /* name */
    {                                                   /* dirty */
       (_NEW_MULTISAMPLE | _NEW_BUFFERS),               /* mesa */
       ST_NEW_FRAMEBUFFER,                              /* st */
@@ -95,7 +94,6 @@ const struct st_tracked_state st_update_msaa = {
 };
 
 const struct st_tracked_state st_update_sample_shading = {
-   "st_update_sample_shading",                         /* name */
    {                                                   /* dirty */
       (_NEW_MULTISAMPLE | _NEW_PROGRAM | _NEW_BUFFERS),        /* mesa */
       ST_NEW_FRAGMENT_PROGRAM | ST_NEW_FRAMEBUFFER,    /* st */
index f94c358..a56ff10 100644 (file)
@@ -102,7 +102,6 @@ update_pixel_transfer(struct st_context *st)
 
 
 const struct st_tracked_state st_update_pixel_transfer = {
-   "st_update_pixel_transfer",                         /* name */
    {                                                   /* dirty */
       _NEW_PIXEL,                                      /* mesa */
       0,                                               /* st */
index d17ce30..463a210 100644 (file)
@@ -290,7 +290,6 @@ static void update_raster_state( struct st_context *st )
 }
 
 const struct st_tracked_state st_update_rasterizer = {
-   "st_update_rasterizer",    /* name */
    {
       (_NEW_BUFFERS |
        _NEW_LIGHT |
index a1cfa1c..a9e14f8 100644 (file)
@@ -334,7 +334,6 @@ update_samplers(struct st_context *st)
 
 
 const struct st_tracked_state st_update_sampler = {
-   "st_update_sampler",                                        /* name */
    {                                                   /* dirty */
       _NEW_TEXTURE,                                    /* mesa */
       0,                                               /* st */
index 72539df..fb13077 100644 (file)
@@ -141,7 +141,6 @@ update_window_rectangles(struct st_context *st)
 }
 
 const struct st_tracked_state st_update_scissor = {
-   "st_update_scissor",                                        /* name */
    {                                                   /* dirty */
       (_NEW_SCISSOR | _NEW_BUFFERS),                   /* mesa */
       0,                                               /* st */
@@ -150,7 +149,6 @@ const struct st_tracked_state st_update_scissor = {
 };
 
 const struct st_tracked_state st_update_window_rectangles = {
-   "st_update_window_rectangles",                      /* name */
    {                                                   /* dirty */
       (_NEW_SCISSOR | _NEW_BUFFERS),                   /* mesa */
       0,                                               /* st */
index d0c2429..0bb2295 100644 (file)
@@ -152,7 +152,6 @@ update_fp( struct st_context *st )
 
 
 const struct st_tracked_state st_update_fp = {
-   "st_update_fp",                                     /* name */
    {                                                   /* dirty */
       _NEW_BUFFERS | _NEW_MULTISAMPLE | _NEW_FOG,      /* mesa */
       ST_NEW_FRAGMENT_PROGRAM                           /* st */
@@ -210,7 +209,6 @@ update_vp( struct st_context *st )
 
 
 const struct st_tracked_state st_update_vp = {
-   "st_update_vp",                                     /* name */
    {                                                   /* dirty */
       0,                                                /* mesa */
       ST_NEW_VERTEX_PROGRAM                             /* st */
@@ -243,7 +241,6 @@ update_gp( struct st_context *st )
 }
 
 const struct st_tracked_state st_update_gp = {
-   "st_update_gp",                     /* name */
    {                                   /* dirty */
       0,                               /* mesa */
       ST_NEW_GEOMETRY_PROGRAM           /* st */
@@ -276,7 +273,6 @@ update_tcp( struct st_context *st )
 }
 
 const struct st_tracked_state st_update_tcp = {
-   "st_update_tcp",                    /* name */
    {                                   /* dirty */
       0,                               /* mesa */
       ST_NEW_TESSCTRL_PROGRAM           /* st */
@@ -309,7 +305,6 @@ update_tep( struct st_context *st )
 }
 
 const struct st_tracked_state st_update_tep = {
-   "st_update_tep",                    /* name */
    {                                   /* dirty */
       0,                               /* mesa */
       ST_NEW_TESSEVAL_PROGRAM           /* st */
@@ -341,7 +336,6 @@ update_cp( struct st_context *st )
 }
 
 const struct st_tracked_state st_update_cp = {
-   "st_update_cp",                     /* name */
    {                                   /* dirty */
       0,                               /* mesa */
       ST_NEW_COMPUTE_PROGRAM           /* st */
index 3918a1e..b059ca9 100644 (file)
@@ -84,7 +84,6 @@ update_stipple( struct st_context *st )
 
 /** Update the stipple when the pattern or window height changes */
 const struct st_tracked_state st_update_polygon_stipple = {
-   "st_update_polygon_stipple",                                /* name */
    {                                                   /* dirty */
       (_NEW_POLYGONSTIPPLE |
        _NEW_BUFFERS),                                  /* mesa */
index 0f96e6d..2ee5765 100644 (file)
@@ -103,7 +103,6 @@ static void bind_vs_ssbos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_vs_ssbos = {
-   "st_bind_vs_ssbos",
    {
       0,
       ST_NEW_VERTEX_PROGRAM | ST_NEW_STORAGE_BUFFER,
@@ -124,7 +123,6 @@ static void bind_fs_ssbos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_fs_ssbos = {
-   "st_bind_fs_ssbos",
    {
       0,
       ST_NEW_FRAGMENT_PROGRAM | ST_NEW_STORAGE_BUFFER,
@@ -145,7 +143,6 @@ static void bind_gs_ssbos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_gs_ssbos = {
-   "st_bind_gs_ssbos",
    {
       0,
       ST_NEW_GEOMETRY_PROGRAM | ST_NEW_STORAGE_BUFFER,
@@ -166,7 +163,6 @@ static void bind_tcs_ssbos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_tcs_ssbos = {
-   "st_bind_tcs_ssbos",
    {
       0,
       ST_NEW_TESSCTRL_PROGRAM | ST_NEW_STORAGE_BUFFER,
@@ -187,7 +183,6 @@ static void bind_tes_ssbos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_tes_ssbos = {
-   "st_bind_tes_ssbos",
    {
       0,
       ST_NEW_TESSEVAL_PROGRAM | ST_NEW_STORAGE_BUFFER,
@@ -208,7 +203,6 @@ static void bind_cs_ssbos(struct st_context *st)
 }
 
 const struct st_tracked_state st_bind_cs_ssbos = {
-   "st_bind_cs_ssbos",
    {
       0,
       ST_NEW_COMPUTE_PROGRAM | ST_NEW_STORAGE_BUFFER,
index 8e6287a..5c1e3a9 100644 (file)
@@ -53,7 +53,6 @@ update_tess(struct st_context *st)
 
 
 const struct st_tracked_state st_update_tess = {
-   "update_tess",              /* name */
    {                           /* dirty */
       0,                       /* mesa */
       ST_NEW_TESS_STATE,       /* st */
index 4b7ad77..ed8c2d3 100644 (file)
@@ -565,7 +565,6 @@ update_compute_textures(struct st_context *st)
 
 
 const struct st_tracked_state st_update_fragment_texture = {
-   "st_update_texture",                                        /* name */
    {                                                   /* dirty */
       _NEW_TEXTURE,                                    /* mesa */
       ST_NEW_FRAGMENT_PROGRAM | ST_NEW_SAMPLER_VIEWS,  /* st */
@@ -575,7 +574,6 @@ const struct st_tracked_state st_update_fragment_texture = {
 
 
 const struct st_tracked_state st_update_vertex_texture = {
-   "st_update_vertex_texture",                         /* name */
    {                                                   /* dirty */
       _NEW_TEXTURE,                                    /* mesa */
       ST_NEW_VERTEX_PROGRAM | ST_NEW_SAMPLER_VIEWS,    /* st */
@@ -585,7 +583,6 @@ const struct st_tracked_state st_update_vertex_texture = {
 
 
 const struct st_tracked_state st_update_geometry_texture = {
-   "st_update_geometry_texture",                       /* name */
    {                                                   /* dirty */
       _NEW_TEXTURE,                                    /* mesa */
       ST_NEW_GEOMETRY_PROGRAM | ST_NEW_SAMPLER_VIEWS,  /* st */
@@ -595,7 +592,6 @@ const struct st_tracked_state st_update_geometry_texture = {
 
 
 const struct st_tracked_state st_update_tessctrl_texture = {
-   "st_update_tessctrl_texture",                       /* name */
    {                                                   /* dirty */
       _NEW_TEXTURE,                                    /* mesa */
       ST_NEW_TESSCTRL_PROGRAM | ST_NEW_SAMPLER_VIEWS,  /* st */
@@ -605,7 +601,6 @@ const struct st_tracked_state st_update_tessctrl_texture = {
 
 
 const struct st_tracked_state st_update_tesseval_texture = {
-   "st_update_tesseval_texture",                       /* name */
    {                                                   /* dirty */
       _NEW_TEXTURE,                                    /* mesa */
       ST_NEW_TESSEVAL_PROGRAM | ST_NEW_SAMPLER_VIEWS,  /* st */
@@ -615,7 +610,6 @@ const struct st_tracked_state st_update_tesseval_texture = {
 
 
 const struct st_tracked_state st_update_compute_texture = {
-   "st_update_compute_texture",                        /* name */
    {                                                   /* dirty */
       _NEW_TEXTURE,                                    /* mesa */
       ST_NEW_COMPUTE_PROGRAM | ST_NEW_SAMPLER_VIEWS,   /* st */
index 9a692ce..f5e09e2 100644 (file)
@@ -83,7 +83,6 @@ update_viewport( struct st_context *st )
 
 
 const struct st_tracked_state st_update_viewport = {
-   "st_update_viewport",                               /* name */
    {                                                   /* dirty */
       _NEW_BUFFERS | _NEW_VIEWPORT,                    /* mesa */
       0,                                               /* st */
index 18394eb..b3cf285 100644 (file)
@@ -74,7 +74,6 @@ struct st_state_flags {
 };
 
 struct st_tracked_state {
-   const char *name;
    struct st_state_flags dirty;
    void (*update)( struct st_context *st );
 };