Mesa (main): mesa/st: collapse st_program into gl_program object.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 3faa21bda713b9d227d9d62adf062bd3584b1d09
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3faa21bda713b9d227d9d62adf062bd3584b1d09

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Dec 20 15:54:08 2021 +1000

mesa/st: collapse st_program into gl_program object.

Remove the subclass for this.

Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14700>

---

 src/mesa/main/shader_types.h               |  15 ++
 src/mesa/main/shaderapi.c                  |   4 +-
 src/mesa/state_tracker/st_atifs_to_nir.c   |   3 +-
 src/mesa/state_tracker/st_atom.c           |  38 ++--
 src/mesa/state_tracker/st_atom_array.cpp   |   8 +-
 src/mesa/state_tracker/st_atom_constbuf.c  |  12 +-
 src/mesa/state_tracker/st_atom_msaa.c      |   2 +-
 src/mesa/state_tracker/st_atom_shader.c    |  49 ++---
 src/mesa/state_tracker/st_cb_bitmap.c      |   2 +-
 src/mesa/state_tracker/st_cb_drawpixels.c  |   4 +-
 src/mesa/state_tracker/st_cb_feedback.c    |   2 +-
 src/mesa/state_tracker/st_cb_program.c     |  35 ++-
 src/mesa/state_tracker/st_context.c        |  22 +-
 src/mesa/state_tracker/st_context.h        |  12 +-
 src/mesa/state_tracker/st_draw_feedback.c  |   4 +-
 src/mesa/state_tracker/st_glsl_to_ir.cpp   |   6 +-
 src/mesa/state_tracker/st_glsl_to_nir.cpp  |  10 +-
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp |   3 +-
 src/mesa/state_tracker/st_program.c        | 340 ++++++++++++++---------------
 src/mesa/state_tracker/st_program.h        |  59 +----
 src/mesa/state_tracker/st_shader_cache.c   |  36 ++-
 21 files changed, 310 insertions(+), 356 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=3faa21bda713b9d227d9d62adf062bd3584b1d09