diff options
author | Marek Olšák <[email protected]> | 2016-07-17 15:49:56 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2016-07-30 15:02:14 +0200 |
commit | 53bc28920a8524d7bc795c3ce6398dc34a8e2152 (patch) | |
tree | 8dc44c45c614cc3e64a2b1c4a45bd3a8ba51629f | |
parent | f2adba4a4c1e69586a3a112ad51525c1162b01e6 (diff) |
st/mesa: remove st_tracked_state::name
Reviewed-by: Nicolai Hähnle <[email protected]>
20 files changed, 0 insertions, 58 deletions
diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c index 0847184d74d..992d6a961ef 100644 --- a/src/mesa/state_tracker/st_atom_array.c +++ b/src/mesa/state_tracker/st_atom_array.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_atomicbuf.c b/src/mesa/state_tracker/st_atom_atomicbuf.c index a27dbe0460d..d4380710af9 100644 --- a/src/mesa/state_tracker/st_atom_atomicbuf.c +++ b/src/mesa/state_tracker/st_atom_atomicbuf.c @@ -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, diff --git a/src/mesa/state_tracker/st_atom_blend.c b/src/mesa/state_tracker/st_atom_blend.c index 6bb4077f370..8adda10c6b8 100644 --- a/src/mesa/state_tracker/st_atom_blend.c +++ b/src/mesa/state_tracker/st_atom_blend.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_clip.c b/src/mesa/state_tracker/st_atom_clip.c index b820d843385..657aa84ed32 100644 --- a/src/mesa/state_tracker/st_atom_clip.c +++ b/src/mesa/state_tracker/st_atom_clip.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c index 594db1e9f12..a9ec19581c6 100644 --- a/src/mesa/state_tracker/st_atom_constbuf.c +++ b/src/mesa/state_tracker/st_atom_constbuf.c @@ -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, diff --git a/src/mesa/state_tracker/st_atom_depth.c b/src/mesa/state_tracker/st_atom_depth.c index d9cc97029fb..ec8480bfd83 100644 --- a/src/mesa/state_tracker/st_atom_depth.c +++ b/src/mesa/state_tracker/st_atom_depth.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c index 7d769f23dcb..5d91704a05c 100644 --- a/src/mesa/state_tracker/st_atom_framebuffer.c +++ b/src/mesa/state_tracker/st_atom_framebuffer.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_image.c b/src/mesa/state_tracker/st_atom_image.c index bc9344e51b2..a170de0dd8a 100644 --- a/src/mesa/state_tracker/st_atom_image.c +++ b/src/mesa/state_tracker/st_atom_image.c @@ -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, diff --git a/src/mesa/state_tracker/st_atom_msaa.c b/src/mesa/state_tracker/st_atom_msaa.c index 404f54ddcc3..3025534b2c9 100644 --- a/src/mesa/state_tracker/st_atom_msaa.c +++ b/src/mesa/state_tracker/st_atom_msaa.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_pixeltransfer.c b/src/mesa/state_tracker/st_atom_pixeltransfer.c index f94c358afba..a56ff10954c 100644 --- a/src/mesa/state_tracker/st_atom_pixeltransfer.c +++ b/src/mesa/state_tracker/st_atom_pixeltransfer.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_rasterizer.c b/src/mesa/state_tracker/st_atom_rasterizer.c index d17ce302958..463a210516a 100644 --- a/src/mesa/state_tracker/st_atom_rasterizer.c +++ b/src/mesa/state_tracker/st_atom_rasterizer.c @@ -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 | diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c index a1cfa1c34c5..a9e14f8efbc 100644 --- a/src/mesa/state_tracker/st_atom_sampler.c +++ b/src/mesa/state_tracker/st_atom_sampler.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_scissor.c b/src/mesa/state_tracker/st_atom_scissor.c index 72539df24fc..fb13077b55e 100644 --- a/src/mesa/state_tracker/st_atom_scissor.c +++ b/src/mesa/state_tracker/st_atom_scissor.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c index d0c2429dcef..0bb22957926 100644 --- a/src/mesa/state_tracker/st_atom_shader.c +++ b/src/mesa/state_tracker/st_atom_shader.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_stipple.c b/src/mesa/state_tracker/st_atom_stipple.c index 3918a1e495a..b059ca97776 100644 --- a/src/mesa/state_tracker/st_atom_stipple.c +++ b/src/mesa/state_tracker/st_atom_stipple.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_storagebuf.c b/src/mesa/state_tracker/st_atom_storagebuf.c index 0f96e6d79b3..2ee57657435 100644 --- a/src/mesa/state_tracker/st_atom_storagebuf.c +++ b/src/mesa/state_tracker/st_atom_storagebuf.c @@ -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, diff --git a/src/mesa/state_tracker/st_atom_tess.c b/src/mesa/state_tracker/st_atom_tess.c index 8e6287a900c..5c1e3a9870e 100644 --- a/src/mesa/state_tracker/st_atom_tess.c +++ b/src/mesa/state_tracker/st_atom_tess.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index 4b7ad77b47a..ed8c2d3e078 100644 --- a/src/mesa/state_tracker/st_atom_texture.c +++ b/src/mesa/state_tracker/st_atom_texture.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_atom_viewport.c b/src/mesa/state_tracker/st_atom_viewport.c index 9a692cecade..f5e09e26aa6 100644 --- a/src/mesa/state_tracker/st_atom_viewport.c +++ b/src/mesa/state_tracker/st_atom_viewport.c @@ -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 */ diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index 18394eb72fb..b3cf285984f 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -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 ); }; |