Module: Mesa Branch: main Commit: cd0961dce2b3b7ae41e0e5901624277159ed85f7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd0961dce2b3b7ae41e0e5901624277159ed85f7
Author: Dave Airlie <[email protected]> Date: Fri Dec 10 13:14:39 2021 +1000 mesa/st: merge texture object/image structs into mesa This just merges the subclasses into main class Acked-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14327> --- src/mesa/main/externalobjects.c | 10 +- src/mesa/main/mtypes.h | 93 ++++++++ src/mesa/state_tracker/st_atom_image.c | 20 +- src/mesa/state_tracker/st_atom_sampler.c | 4 +- src/mesa/state_tracker/st_atom_texture.c | 16 +- src/mesa/state_tracker/st_cb_bitmap.c | 2 +- src/mesa/state_tracker/st_cb_blit.c | 4 +- src/mesa/state_tracker/st_cb_copyimage.c | 8 +- src/mesa/state_tracker/st_cb_eglimage.c | 23 +- src/mesa/state_tracker/st_cb_fbo.c | 14 +- src/mesa/state_tracker/st_cb_texture.c | 389 +++++++++++++++---------------- src/mesa/state_tracker/st_cb_texture.h | 2 +- src/mesa/state_tracker/st_context.c | 8 +- src/mesa/state_tracker/st_gen_mipmap.c | 9 +- src/mesa/state_tracker/st_manager.c | 18 +- src/mesa/state_tracker/st_pbo_compute.c | 2 +- src/mesa/state_tracker/st_program.h | 2 +- src/mesa/state_tracker/st_sampler_view.c | 152 ++++++------ src/mesa/state_tracker/st_sampler_view.h | 15 +- src/mesa/state_tracker/st_texture.c | 28 ++- src/mesa/state_tracker/st_texture.h | 152 +----------- src/mesa/state_tracker/st_vdpau.c | 30 ++- 22 files changed, 464 insertions(+), 537 deletions(-) Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=cd0961dce2b3b7ae41e0e5901624277159ed85f7
