diff options
| author | Brian Paul <[email protected]> | 2018-01-25 12:50:12 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2018-01-26 13:52:48 -0700 |
| commit | bacf72a18dc07ee2a9fb23e8f17aeb04ec31ea50 (patch) | |
| tree | 43a24017244f7ddc5aa9d775f6211be1cd8893ee /src/compiler/glsl | |
| parent | aff5d9c256d471de1722dbfcacdc09faa260799b (diff) | |
mesa: change gl_link_status enums to uppercase
follow the convention of other enums.
Reviewed-by: Neha Bhende <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 6 | ||||
| -rw-r--r-- | src/compiler/glsl/shader_cache.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/standalone.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 39fc3459d3a..ce101935b01 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -456,7 +456,7 @@ linker_error(gl_shader_program *prog, const char *fmt, ...) ralloc_vasprintf_append(&prog->data->InfoLog, fmt, ap); va_end(ap); - prog->data->LinkStatus = linking_failure; + prog->data->LinkStatus = LINKING_FAILURE; } @@ -2282,7 +2282,7 @@ link_intrastage_shaders(void *mem_ctx, _mesa_shader_stage_to_program(shader_list[0]->Stage), prog->Name, false); if (!gl_prog) { - prog->data->LinkStatus = linking_failure; + prog->data->LinkStatus = LINKING_FAILURE; _mesa_delete_linked_shader(ctx, linked); return NULL; } @@ -4748,7 +4748,7 @@ linker_optimisation_loop(struct gl_context *ctx, exec_list *ir, void link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) { - prog->data->LinkStatus = linking_success; /* All error paths will set this to false */ + prog->data->LinkStatus = LINKING_SUCCESS; /* All error paths will set this to false */ prog->data->Validated = false; /* Section 7.3 (Program Objects) of the OpenGL 4.5 Core Profile spec says: diff --git a/src/compiler/glsl/shader_cache.cpp b/src/compiler/glsl/shader_cache.cpp index bdc045e1db6..bf884af7906 100644 --- a/src/compiler/glsl/shader_cache.cpp +++ b/src/compiler/glsl/shader_cache.cpp @@ -248,7 +248,7 @@ shader_cache_read_program_metadata(struct gl_context *ctx, } /* This is used to flag a shader retrieved from cache */ - prog->data->LinkStatus = linking_skipped; + prog->data->LinkStatus = LINKING_SKIPPED; /* Since the program load was successful, CompileStatus of all shaders at * this point should normally be compile_skipped. However because of how diff --git a/src/compiler/glsl/standalone.cpp b/src/compiler/glsl/standalone.cpp index 6ece0746419..c989aeff71a 100644 --- a/src/compiler/glsl/standalone.cpp +++ b/src/compiler/glsl/standalone.cpp @@ -520,7 +520,7 @@ standalone_compile_shader(const struct standalone_options *_options, } else { const gl_shader_stage stage = whole_program->Shaders[0]->Stage; - whole_program->data->LinkStatus = linking_success; + whole_program->data->LinkStatus = LINKING_SUCCESS; whole_program->_LinkedShaders[stage] = link_intrastage_shaders(whole_program /* mem_ctx */, ctx, |