From: Tapani Pälli <tapani.palli@intel.com>
Date: Fri, 22 Mar 2019 12:33:00 +0000 (+0200)
Subject: st/mesa: fix warnings about implicit conversion on enumeration type
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2c240a52161f5ff875fc86e22ad688f843dfb356;p=mesa.git

st/mesa: fix warnings about implicit conversion on enumeration type

These enums match but compiler warns about implicit conversion.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 6b7d4f28167..5f2d50ceb1b 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -310,7 +310,7 @@ st_make_passthrough_vertex_shader(struct st_context *st)
       return;
 
    enum pipe_shader_ir preferred_ir =
-      screen->get_shader_param(screen, MESA_SHADER_VERTEX,
+      screen->get_shader_param(screen, PIPE_SHADER_VERTEX,
                                PIPE_SHADER_CAP_PREFERRED_IR);
 
    if (preferred_ir == PIPE_SHADER_IR_NIR) {
diff --git a/src/mesa/state_tracker/st_cb_drawtex.c b/src/mesa/state_tracker/st_cb_drawtex.c
index 111767d88a4..f08ffde6b01 100644
--- a/src/mesa/state_tracker/st_cb_drawtex.c
+++ b/src/mesa/state_tracker/st_cb_drawtex.c
@@ -127,7 +127,7 @@ lookup_shader(struct st_context *st,
    }
 
    enum pipe_shader_ir preferred_ir =
-      screen->get_shader_param(screen, MESA_SHADER_VERTEX,
+      screen->get_shader_param(screen, PIPE_SHADER_VERTEX,
                                PIPE_SHADER_CAP_PREFERRED_IR);
 
    if (preferred_ir == PIPE_SHADER_IR_NIR) {