summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2018-01-25 12:43:48 -0700
committerBrian Paul <[email protected]>2018-01-26 13:52:48 -0700
commitaff5d9c256d471de1722dbfcacdc09faa260799b (patch)
tree2bac71800d18593b7e48887aba2a00289dd99cea /src/mesa
parentd9832f1fc45aa5fcf5eb5e206603265ae9bfa12a (diff)
mesa: change gl_compile_status enums to uppercase
To follow the convention of other enums. Reviewed-by: Neha Bhende <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/common/meta.c2
-rw-r--r--src/mesa/main/ff_fragment_shader.cpp2
-rw-r--r--src/mesa/main/glspirv.c2
-rw-r--r--src/mesa/main/mtypes.h8
-rw-r--r--src/mesa/main/shaderapi.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index f4830ec28a6..a48f7000269 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -137,7 +137,7 @@ meta_compile_shader_with_debug(struct gl_context *ctx, gl_shader_stage stage,
sh = _mesa_new_shader(name, stage);
sh->Source = strdup(source);
- sh->CompileStatus = compile_failure;
+ sh->CompileStatus = COMPILE_FAILURE;
_mesa_compile_shader(ctx, sh);
if (!sh->CompileStatus) {
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index 83541a269ac..2be3ae37de3 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -1116,7 +1116,7 @@ create_new_program(struct gl_context *ctx, struct state_key *key)
reparent_ir(p.shader->ir, p.shader->ir);
- p.shader->CompileStatus = compile_success;
+ p.shader->CompileStatus = COMPILE_SUCCESS;
p.shader->Version = state->language_version;
p.shader_program->Shaders =
(gl_shader **)malloc(sizeof(*p.shader_program->Shaders));
diff --git a/src/mesa/main/glspirv.c b/src/mesa/main/glspirv.c
index 81303057d05..03f761219be 100644
--- a/src/mesa/main/glspirv.c
+++ b/src/mesa/main/glspirv.c
@@ -84,7 +84,7 @@ _mesa_spirv_shader_binary(struct gl_context *ctx,
_mesa_shader_spirv_data_reference(&sh->spirv_data, spirv_data);
_mesa_spirv_module_reference(&spirv_data->SpirVModule, module);
- sh->CompileStatus = compile_failure;
+ sh->CompileStatus = COMPILE_FAILURE;
free((void *)sh->Source);
sh->Source = NULL;
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 15c6d1ade7a..d6d3a075917 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2609,10 +2609,10 @@ struct gl_linked_shader
*/
enum gl_compile_status
{
- compile_failure = 0,
- compile_success,
- compile_skipped,
- compiled_no_opts
+ COMPILE_FAILURE = 0,
+ COMPILE_SUCCESS,
+ COMPILE_SKIPPED,
+ COMPILED_NO_OPTS
};
/**
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 2c11e4d5bb6..91b1f4940ea 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1071,7 +1071,7 @@ set_shader_source(struct gl_shader *sh, const GLchar *source)
*/
_mesa_shader_spirv_data_reference(&sh->spirv_data, NULL);
- if (sh->CompileStatus == compile_skipped && !sh->FallbackSource) {
+ if (sh->CompileStatus == COMPILE_SKIPPED && !sh->FallbackSource) {
/* If shader was previously compiled back-up the source in case of cache
* fallback.
*/
@@ -1114,7 +1114,7 @@ _mesa_compile_shader(struct gl_context *ctx, struct gl_shader *sh)
/* If the user called glCompileShader without first calling
* glShaderSource, we should fail to compile, but not raise a GL_ERROR.
*/
- sh->CompileStatus = compile_failure;
+ sh->CompileStatus = COMPILE_FAILURE;
} else {
if (ctx->_Shader->Flags & GLSL_DUMP) {
_mesa_log("GLSL source for %s shader %d:\n",