OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: change gl_compile_status enums to uppercase

Browse Source 
To follow the convention of other enums.

Reviewed-by: Neha Bhende <bhenden@vmware.com>
This commit is contained in:
Brian Paul
2018-01-25 12:43:48 -07:00
parent d9832f1fc4
commit aff5d9c256
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/glsl/glsl_parser_extras.cpp
View File

@@ -1971,7 +1971,7 @@ opt_shader_and_create_symbol_table(struct gl_context *ctx,
struct glsl_symbol_table *source_symbols,
struct gl_shader *shader)
{
assert(shader->CompileStatus != compile_failure &&
assert(shader->CompileStatus != COMPILE_FAILURE &&
!shader->ir->is_empty());
struct gl_shader_compiler_options *options =
@@ -2048,7 +2048,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
_mesa_sha1_format(buf, shader->sha1);
fprintf(stderr, "deferring compile of shader: %s\n", buf);
}
shader->CompileStatus = compile_skipped;
shader->CompileStatus = COMPILE_SKIPPED;
free((void *)shader->FallbackSource);
shader->FallbackSource = NULL;
@@ -2060,14 +2060,14 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
* shader cache miss. In which case we can skip the compile if its
* already be done by a previous fallback or the initial compile call.
*/
if (shader->CompileStatus == compile_success)
if (shader->CompileStatus == COMPILE_SUCCESS)
return;
if (shader->CompileStatus == compiled_no_opts) {
if (shader->CompileStatus == COMPILED_NO_OPTS) {
opt_shader_and_create_symbol_table(ctx,
NULL, /* source_symbols */
shader);
shader->CompileStatus = compile_success;
shader->CompileStatus = COMPILE_SUCCESS;
return;
}
}
@@ -2117,7 +2117,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
set_shader_inout_layout(shader, state);
shader->symbols = new(shader->ir) glsl_symbol_table;
shader->CompileStatus = state->error ? compile_failure : compile_success;
shader->CompileStatus = state->error ? COMPILE_FAILURE : COMPILE_SUCCESS;
shader->InfoLog = state->info_log;
shader->Version = state->language_version;
shader->IsES = state->es_shader;
@@ -2130,7 +2130,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
opt_shader_and_create_symbol_table(ctx, state->symbols, shader);
else {
reparent_ir(shader->ir, shader->ir);
shader->CompileStatus = compiled_no_opts;
shader->CompileStatus = COMPILED_NO_OPTS;
}
}

2
src/compiler/glsl/shader_cache.cpp
View File

@@ -258,7 +258,7 @@ shader_cache_read_program_metadata(struct gl_context *ctx,
*/
char sha1_buf[41];
for (unsigned i = 0; i < prog->NumShaders; i++) {
if (prog->Shaders[i]->CompileStatus == compiled_no_opts) {
if (prog->Shaders[i]->CompileStatus == COMPILED_NO_OPTS) {
disk_cache_put_key(cache, prog->Shaders[i]->sha1);
if (ctx->_Shader->Flags & GLSL_CACHE_INFO) {
_mesa_sha1_format(sha1_buf, prog->Shaders[i]->sha1);