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

glsl: add transform feedback buffers to resource list

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Timothy Arceri
2016-03-10 15:04:02 +11:00
parent 9e317271d7
commit 7234be0338
5 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3852,7 +3852,8 @@ write_top_level_array_size_and_stride:
* resource data. * resource data.
*/ */
void void
build_program_resource_list(struct gl_shader_program *shProg) build_program_resource_list(struct gl_context *ctx,
struct gl_shader_program *shProg)
{ {
/* Rebuild resource list. */ /* Rebuild resource list. */
if (shProg->ProgramResourceList) { if (shProg->ProgramResourceList) {
@@ -3910,6 +3911,17 @@ build_program_resource_list(struct gl_shader_program *shProg)
} }
} }
/* Add transform feedback buffers. */
for (unsigned i = 0; i < ctx->Const.MaxTransformFeedbackBuffers; i++) {
if ((shProg->LinkedTransformFeedback.ActiveBuffers >> i) & 1) {
shProg->LinkedTransformFeedback.Buffers[i].Binding = i;
if (!add_program_resource(shProg, GL_TRANSFORM_FEEDBACK_BUFFER,
&shProg->LinkedTransformFeedback.Buffers[i],
0))
return;
}
}
/* Add uniforms from uniform storage. */ /* Add uniforms from uniform storage. */
for (unsigned i = 0; i < shProg->NumUniformStorage; i++) { for (unsigned i = 0; i < shProg->NumUniformStorage; i++) {
/* Do not add uniforms internally used by Mesa. */ /* Do not add uniforms internally used by Mesa. */

3
src/compiler/glsl/program.h
View File

@@ -43,7 +43,8 @@ extern void
link_shaders(struct gl_context *ctx, struct gl_shader_program *prog); link_shaders(struct gl_context *ctx, struct gl_shader_program *prog);
extern void extern void
build_program_resource_list(struct gl_shader_program *shProg); build_program_resource_list(struct gl_context *ctx,
struct gl_shader_program *shProg);
extern void extern void
linker_error(struct gl_shader_program *prog, const char *fmt, ...) linker_error(struct gl_shader_program *prog, const char *fmt, ...)

2
src/mesa/drivers/dri/i965/brw_link.cpp
View File

@@ -260,6 +260,6 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)
if (brw->precompile && !brw_shader_precompile(ctx, shProg)) if (brw->precompile && !brw_shader_precompile(ctx, shProg))
return false; return false;
build_program_resource_list(shProg); build_program_resource_list(ctx, shProg);
return true; return true;
} }

2
src/mesa/program/ir_to_mesa.cpp
View File

@@ -2976,7 +2976,7 @@ _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
_mesa_reference_program(ctx, &linked_prog, NULL); _mesa_reference_program(ctx, &linked_prog, NULL);
} }
build_program_resource_list(prog); build_program_resource_list(ctx, prog);
return prog->LinkStatus; return prog->LinkStatus;
} }

2
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View File

@@ -6811,7 +6811,7 @@ st_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
validate_ir_tree(ir); validate_ir_tree(ir);
} }
build_program_resource_list(prog); build_program_resource_list(ctx, prog);
for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) { for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
struct gl_program *linked_prog; struct gl_program *linked_prog;