import Mesa 11.0.6

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/draw/draw_pipe_wide_point.c b/lib/mesa/src/gallium/auxiliary/draw/draw_pipe_wide_point.c
index 1329ab4e7..348b0e93b 100644
--- a/lib/mesa/src/gallium/auxiliary/draw/draw_pipe_wide_point.c
+++ b/lib/mesa/src/gallium/auxiliary/draw/draw_pipe_wide_point.c
@@ -76,7 +76,7 @@ struct widepoint_stage {
    uint texcoord_gen_slot[PIPE_MAX_SHADER_OUTPUTS];
 
    /* TGSI_SEMANTIC to which sprite_coord_enable applies */
-   enum tgsi_semantic sprite_coord_semantic;
+   unsigned sprite_coord_semantic;
 
    int psize_slot;
 };
@@ -242,7 +242,7 @@ widepoint_first_point(struct draw_stage *stage,
        */
       for (i = 0; i < fs->info.num_inputs; i++) {
          int slot;
-         const enum tgsi_semantic sn = fs->info.input_semantic_name[i];
+         const unsigned sn = fs->info.input_semantic_name[i];
          const unsigned si = fs->info.input_semantic_index[i];
 
          if (sn == wide->sprite_coord_semantic) {
@@ -315,7 +315,7 @@ static void widepoint_destroy( struct draw_stage *stage )
 struct draw_stage *draw_wide_point_stage( struct draw_context *draw )
 {
    struct widepoint_stage *wide = CALLOC_STRUCT(widepoint_stage);
-   if (!wide)
+   if (wide == NULL)
       goto fail;
 
    wide->stage.draw = draw;