summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2019-03-22 14:33:00 +0200
committerTapani Pälli <tapani.palli@intel.com>2019-03-25 07:44:27 +0200
commit2c240a52161f5ff875fc86e22ad688f843dfb356 (patch)
tree46c39a67dbdc3be0e8ba529bb74e34e93d04bdd5
parentec12316489380564ed242118d7cb035c7997e044 (diff)
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>
-rw-r--r--src/mesa/state_tracker/st_cb_drawpixels.c2
-rw-r--r--src/mesa/state_tracker/st_cb_drawtex.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 6b7d4f28167c..5f2d50ceb1b8 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 111767d88a42..f08ffde6b01f 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) {