Upgrade to mesa 22.1.7

1. Upgrade version number
2. Remove deprecated option
3. Fix some issues which caused by upgrade of mesa22.1.7

Change-Id: I86a928c9f5e272e209825e6a1b7a8bab30425ddf
Signed-off-by: Xuelian Bai <xuelian.bai@samsung.com>

6 files changed, 20 insertions, 5 deletions

diff --git a/packaging/mesa.spec b/packaging/mesa.spec
index ce067798d4a..dc99dc70e94 100644
--- a/packaging/mesa.spec
+++ b/packaging/mesa.spec
@@ -1,5 +1,5 @@
 Name:           mesa
-Version:        21.2.3
+Version:        22.1.7
 Release:        0
 License:        MIT and Apache-2.0 and SGI Free Software License B v2.0 and BSD-3-Clause
 Summary:        System for rendering interactive 3-D graphics
@@ -106,7 +106,6 @@ meson --prefix %{_hal_prefix} build/ \
         -Dgbm=%{?enable_gbm:enabled}%{?!enable_gbm:disabled} \
         -Dplatforms="tizen" \
         -Dgallium-drivers=%{gallium_drivers} \
-        -Ddri-drivers=%{dri_drivers} \
         -Dvulkan-drivers=%{vulkan_drivers}
 
 
diff --git a/src/mesa/main/blit.c b/src/mesa/main/blit.c
index 0b303c28388..94cbbf2430b 100644
--- a/src/mesa/main/blit.c
+++ b/src/mesa/main/blit.c
@@ -371,7 +371,11 @@ do_blit_framebuffer(struct gl_context *ctx,
    } clip;
    struct pipe_blit_info blit;
 
+#ifdef HAVE_TIZEN_PLATFORM
+   st_manager_validate_framebuffers(st, TRUE);
+#else
    st_manager_validate_framebuffers(st);
+#endif
 
    /* Make sure bitmap rendering has landed in the framebuffers */
    st_flush_bitmap_cache(st);
diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index 1776d4029fc..792b17aa479 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -485,7 +485,7 @@ libmesa = static_library(
     inc_libmesa_asm, include_directories('main'),
   ],
   link_with : [libglsl, libmesa_sse41],
-  dependencies : [idep_nir_headers, dep_vdpau, idep_mesautil],
+  dependencies : [idep_nir_headers, dep_vdpau, idep_mesautil, dep_dlog],
   build_by_default : false,
 )
 
diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c
index 34d9484368b..fa4926b9f3a 100644
--- a/src/mesa/state_tracker/st_atom.c
+++ b/src/mesa/state_tracker/st_atom.c
@@ -40,7 +40,6 @@
 
 #include "util/u_cpu_detect.h"
 
-#include "st_cb_fbo.h"
 
 typedef void (*update_func_t)(struct st_context *st);
 
@@ -221,7 +220,7 @@ void st_validate_state( struct st_context *st, enum st_pipeline pipeline )
       }
 
 #ifdef HAVE_TIZEN_PLATFORM
-	  struct st_framebuffer *stdraw = st_ws_framebuffer(st->ctx->DrawBuffer);
+	  struct gl_framebuffer *stdraw = st_ws_framebuffer(st->ctx->DrawBuffer);
 	  bool valid = TRUE;
 
 	  if (stdraw && stdraw->iface->validate_drawable)
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index 264ae4442d6..0d49d92602f 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -78,6 +78,7 @@ struct st_screen
  * We'll only return non-null for window system framebuffers.
  * Note that this function may fail.
  */
+#if 0 /*Move this function to header file to be used by other files*/
 static inline struct gl_framebuffer *
 st_ws_framebuffer(struct gl_framebuffer *fb)
 {
@@ -87,6 +88,7 @@ st_ws_framebuffer(struct gl_framebuffer *fb)
       return fb;
    return NULL;
 }
+#endif
 
 /**
  * Map an attachment to a buffer index.
diff --git a/src/mesa/state_tracker/st_manager.h b/src/mesa/state_tracker/st_manager.h
index 24c4ae43d0f..38e58ddc620 100644
--- a/src/mesa/state_tracker/st_manager.h
+++ b/src/mesa/state_tracker/st_manager.h
@@ -38,6 +38,17 @@ struct st_context;
 struct gl_renderbuffer;
 struct pipe_surface;
 
+
+static inline struct gl_framebuffer *
+st_ws_framebuffer(struct gl_framebuffer *fb)
+{
+   /* FBO cannot be casted.  See st_new_framebuffer */
+   if (fb && _mesa_is_winsys_fbo(fb) &&
+       fb != _mesa_get_incomplete_framebuffer())
+      return fb;
+   return NULL;
+}
+
 void
 st_manager_flush_frontbuffer(struct st_context *st);