KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: split _mesa_lookup_shader_include() in two 

The new local function lookup_shader_include() will be used by
glDeleteNamedStringARB() in the following patch.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Witold Baryluk <witold.baryluk@gmail.com>
This commit is contained in:
Timothy Arceri 2019-08-27 14:22:30 +10:00
parent ae2e41841f
commit f2d01cac7e
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesa/main/shaderapi.c
View File

@ -3280,9 +3280,9 @@ validate_and_tokenise_sh_incl(struct gl_context *ctx,
return true;
}
const char *
_mesa_lookup_shader_include(struct gl_context *ctx, char *path,
bool error_check)
static struct sh_incl_path_ht_entry *
lookup_shader_include(struct gl_context *ctx, char *path,
bool error_check)
{
void *mem_ctx = ralloc_context(NULL);
struct sh_incl_path_entry *path_list;
@ -3313,7 +3313,17 @@ _mesa_lookup_shader_include(struct gl_context *ctx, char *path,
ralloc_free(mem_ctx);
return sh_incl_ht_entry ? sh_incl_ht_entry->shader_source : NULL;
return sh_incl_ht_entry;
}
const char *
_mesa_lookup_shader_include(struct gl_context *ctx, char *path,
bool error_check)
{
struct sh_incl_path_ht_entry *shader_include =
lookup_shader_include(ctx, path, error_check);
return shader_include ? shader_include->shader_source : NULL;
}
static char *