st/mesa: fix warnings about implicit conversion on enumeration type
authorTapani Pälli <tapani.palli@intel.com>
Fri, 22 Mar 2019 12:33:00 +0000 (14:33 +0200)
committerTapani Pälli <tapani.palli@intel.com>
Mon, 25 Mar 2019 05:44:27 +0000 (07:44 +0200)
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>
src/mesa/state_tracker/st_cb_drawpixels.c
src/mesa/state_tracker/st_cb_drawtex.c

index 6b7d4f28167c28984eb997ef362e2d8858b11e17..5f2d50ceb1b87e022ca3dc96a65630741b3dc472 100644 (file)
@@ -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) {
index 111767d88a42bce66ca82773edeaf66110d7fd12..f08ffde6b01fdc0e112b4d0763f8fb7d1280d7e4 100644 (file)
@@ -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) {