Mesa (master): st/mesa: don't use cso_context to restore VBs, sampler views for glDrawTex*OES

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 78c0dc2f56ab6723a32ee76ac84c943fedab3cc6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=78c0dc2f56ab6723a32ee76ac84c943fedab3cc6

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Dec 20 02:52:52 2020 -0500

st/mesa: don't use cso_context to restore VBs, sampler views for glDrawTex*OES

These cso_context capabilities will be removed.

Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Zoltán Böszörményi <zboszor at gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8180>

---

 src/mesa/state_tracker/st_cb_drawtex.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_drawtex.c b/src/mesa/state_tracker/st_cb_drawtex.c
index 2ecdc4968d0..56b4f05269d 100644
--- a/src/mesa/state_tracker/st_cb_drawtex.c
+++ b/src/mesa/state_tracker/st_cb_drawtex.c
@@ -295,8 +295,7 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
                         CSO_BIT_TESSCTRL_SHADER |
                         CSO_BIT_TESSEVAL_SHADER |
                         CSO_BIT_GEOMETRY_SHADER |
-                        CSO_BIT_VERTEX_ELEMENTS |
-                        CSO_BIT_AUX_VERTEX_BUFFER_SLOT));
+                        CSO_BIT_VERTEX_ELEMENTS));
 
    {
       void *vs = lookup_shader(st, numAttribs,
@@ -344,6 +343,7 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
 
    /* restore state */
    cso_restore_state(cso);
+   st->dirty |= ST_NEW_VERTEX_ARRAYS;
 }