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

mesa/glsl: move ProgramResourceList to gl_shader_program_data

Browse Source 
We also move NumProgramResourceList at the same time.

GLES does interface validation on SSO at runtime so we need to move
this to be able to switch to storing gl_program pointers in
CurrentProgram.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Timothy Arceri
2016-11-10 19:46:11 +11:00
parent 62f718bfcb
commit 90d950038f
5 changed files with 63 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/compiler/glsl/linker.cpp
View File

@@ -3536,25 +3536,25 @@ add_program_resource(struct gl_shader_program *prog,
if (_mesa_set_search(resource_set, data))
return true;
prog->ProgramResourceList =
prog->data->ProgramResourceList =
reralloc(prog,
prog->ProgramResourceList,
prog->data->ProgramResourceList,
gl_program_resource,
prog->NumProgramResourceList + 1);
prog->data->NumProgramResourceList + 1);
if (!prog->ProgramResourceList) {
if (!prog->data->ProgramResourceList) {
linker_error(prog, "Out of memory during linking.\n");
return false;
}
struct gl_program_resource *res =
&prog->ProgramResourceList[prog->NumProgramResourceList];
&prog->data->ProgramResourceList[prog->data->NumProgramResourceList];
res->Type = type;
res->Data = data;
res->StageReferences = stages;
prog->NumProgramResourceList++;
prog->data->NumProgramResourceList++;
_mesa_set_add(resource_set, data);
@@ -4198,10 +4198,10 @@ build_program_resource_list(struct gl_context *ctx,
struct gl_shader_program *shProg)
{
/* Rebuild resource list. */
if (shProg->ProgramResourceList) {
ralloc_free(shProg->ProgramResourceList);
shProg->ProgramResourceList = NULL;
shProg->NumProgramResourceList = 0;
if (shProg->data->ProgramResourceList) {
ralloc_free(shProg->data->ProgramResourceList);
shProg->data->ProgramResourceList = NULL;
shProg->data->NumProgramResourceList = 0;
}
int input_stage = MESA_SHADER_STAGES, output_stage = 0;