Mesa (master): st/mesa: s/unsigned/enum pipe_shader_type/
Brian Paul
brianp at kemper.freedesktop.org
Fri Mar 23 15:30:58 UTC 2018
Module: Mesa
Branch: master
Commit: aad23f91ee197446c81718d9003fb08edf680a01
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aad23f91ee197446c81718d9003fb08edf680a01
Author: Brian Paul <brianp at vmware.com>
Date: Thu Mar 15 08:22:55 2018 -0600
st/mesa: s/unsigned/enum pipe_shader_type/
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Neha Bhende <bhenden at vmware.com>
---
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 6 ++++--
src/mesa/state_tracker/st_glsl_to_tgsi.h | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index fc53811be4..5f7a0dcd3e 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -5450,7 +5450,7 @@ struct st_translate {
const ubyte *inputMapping;
const ubyte *outputMapping;
- unsigned procType; /**< PIPE_SHADER_VERTEX/FRAGMENT */
+ enum pipe_shader_type procType; /**< PIPE_SHADER_VERTEX/FRAGMENT */
bool need_uarl;
};
@@ -6290,7 +6290,7 @@ st_translate_interp(enum glsl_interp_mode glsl_qual, GLuint varying)
extern "C" enum pipe_error
st_translate_program(
struct gl_context *ctx,
- uint procType,
+ enum pipe_shader_type procType,
struct ureg_program *ureg,
glsl_to_tgsi_visitor *program,
const struct gl_program *proginfo,
@@ -6723,6 +6723,8 @@ st_translate_program(
}
}
break;
+ default:
+ ; /* nothing - silence compiler warning */
}
out:
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.h b/src/mesa/state_tracker/st_glsl_to_tgsi.h
index f38d41d6c7..8ccfff9bd3 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.h
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.h
@@ -38,7 +38,7 @@ struct ureg_program;
enum pipe_error st_translate_program(
struct gl_context *ctx,
- uint procType,
+ enum pipe_shader_type procType,
struct ureg_program *ureg,
struct glsl_to_tgsi_visitor *program,
const struct gl_program *proginfo,
More information about the mesa-commit
mailing list