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

mesa: Use gl_shader_program::_LinkedShaders instead of GeometryProgram

Browse Source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick
2011-08-20 14:26:12 -07:00
parent 010cc547ca
commit 39348bf79f
9 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mesa/main/context.c
View File

@@ -1856,8 +1856,7 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where)
break; break;
case GL_GEOMETRY_SHADER_ARB: case GL_GEOMETRY_SHADER_ARB:
_mesa_append_uniforms_to_file(sh, _mesa_append_uniforms_to_file(sh, sh->Program);
&shProg[i]->GeometryProgram->Base);
break; break;
case GL_FRAGMENT_SHADER: case GL_FRAGMENT_SHADER:

1
src/mesa/main/mtypes.h
View File

@@ -2172,7 +2172,6 @@ struct gl_shader_program
/* post-link info: */ /* post-link info: */
struct gl_fragment_program *FragmentProgram; /**< Linked fragment prog */ struct gl_fragment_program *FragmentProgram; /**< Linked fragment prog */
struct gl_geometry_program *GeometryProgram; /**< Linked geometry prog */
struct gl_uniform_list *Uniforms; struct gl_uniform_list *Uniforms;
struct gl_program_parameter_list *Varying; struct gl_program_parameter_list *Varying;
GLboolean LinkStatus; /**< GL_LINK_STATUS */ GLboolean LinkStatus; /**< GL_LINK_STATUS */

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

@@ -813,8 +813,9 @@ print_shader_info(const struct gl_shader_program *shProg)
shProg->_LinkedShaders[MESA_SHADER_VERTEX]->Program->Id); shProg->_LinkedShaders[MESA_SHADER_VERTEX]->Program->Id);
if (shProg->FragmentProgram) if (shProg->FragmentProgram)
printf(" frag prog %u\n", shProg->FragmentProgram->Base.Id); printf(" frag prog %u\n", shProg->FragmentProgram->Base.Id);
if (shProg->GeometryProgram) if (shProg->_LinkedShaders[MESA_SHADER_GEOMETRY])
printf(" geom prog %u\n", shProg->GeometryProgram->Base.Id); printf(" geom prog %u\n",
shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->Program->Id);
} }
@@ -965,7 +966,7 @@ validate_shader_program(const struct gl_shader_program *shProg,
char *errMsg) char *errMsg)
{ {
const struct gl_shader *vs = shProg->_LinkedShaders[MESA_SHADER_VERTEX]; const struct gl_shader *vs = shProg->_LinkedShaders[MESA_SHADER_VERTEX];
const struct gl_geometry_program *gp = shProg->GeometryProgram; const struct gl_shader *gs = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY];
const struct gl_fragment_program *fp = shProg->FragmentProgram; const struct gl_fragment_program *fp = shProg->FragmentProgram;
if (!shProg->LinkStatus) { if (!shProg->LinkStatus) {
@@ -995,7 +996,7 @@ validate_shader_program(const struct gl_shader_program *shProg,
if (vs && !validate_samplers(vs->Program, errMsg)) { if (vs && !validate_samplers(vs->Program, errMsg)) {
return GL_FALSE; return GL_FALSE;
} }
if (gp && !validate_samplers(&gp->Base, errMsg)) { if (gs && !validate_samplers(gs->Program, errMsg)) {
return GL_FALSE; return GL_FALSE;
} }
if (fp && !validate_samplers(&fp->Base, errMsg)) { if (fp && !validate_samplers(&fp->Base, errMsg)) {

1
src/mesa/main/shaderobj.c
View File

@@ -276,7 +276,6 @@ _mesa_clear_shader_program_data(struct gl_context *ctx,
struct gl_shader_program *shProg) struct gl_shader_program *shProg)
{ {
_mesa_reference_fragprog(ctx, &shProg->FragmentProgram, NULL); _mesa_reference_fragprog(ctx, &shProg->FragmentProgram, NULL);
_mesa_reference_geomprog(ctx, &shProg->GeometryProgram, NULL);
if (shProg->Uniforms) { if (shProg->Uniforms) {
_mesa_free_uniform_list(shProg->Uniforms); _mesa_free_uniform_list(shProg->Uniforms);

6
src/mesa/main/state.c
View File

@@ -268,10 +268,12 @@ update_program(struct gl_context *ctx)
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL); _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
} }
if (gsProg && gsProg->LinkStatus && gsProg->GeometryProgram) { if (gsProg && gsProg->LinkStatus
&& gsProg->_LinkedShaders[MESA_SHADER_GEOMETRY]) {
/* Use GLSL geometry shader */ /* Use GLSL geometry shader */
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current, _mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current,
gsProg->GeometryProgram); (struct gl_geometry_program *)
gsProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->Program);
} else { } else {
/* No geometry program */ /* No geometry program */
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current, NULL); _mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current, NULL);

12
src/mesa/main/uniforms.c
View File

@@ -190,7 +190,7 @@ find_uniform_parameter_pos(struct gl_shader_program *shProg, GLint index,
else { else {
pos = shProg->Uniforms->Uniforms[index].GeomPos; pos = shProg->Uniforms->Uniforms[index].GeomPos;
if (pos >= 0) { if (pos >= 0) {
prog = &shProg->GeometryProgram->Base; prog = shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->Program;
} }
} }
} }
@@ -930,11 +930,12 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg,
} }
} }
if (shProg->GeometryProgram) { if (shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]) {
/* convert uniform location to program parameter index */ /* convert uniform location to program parameter index */
GLint index = uniform->GeomPos; GLint index = uniform->GeomPos;
if (index >= 0) { if (index >= 0) {
set_program_uniform(ctx, &shProg->GeometryProgram->Base, set_program_uniform(ctx,
shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->Program,
index, offset, type, count, elems, values); index, offset, type, count, elems, values);
} }
} }
@@ -1078,11 +1079,12 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,
} }
} }
if (shProg->GeometryProgram) { if (shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]) {
/* convert uniform location to program parameter index */ /* convert uniform location to program parameter index */
GLint index = uniform->GeomPos; GLint index = uniform->GeomPos;
if (index >= 0) { if (index >= 0) {
set_program_uniform_matrix(ctx, &shProg->GeometryProgram->Base, set_program_uniform_matrix(ctx,
shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->Program,
index, offset, index, offset,
count, rows, cols, transpose, values); count, rows, cols, transpose, values);
} }

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

@@ -3306,8 +3306,8 @@ _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
linked_prog); linked_prog);
break; break;
case GL_GEOMETRY_SHADER: case GL_GEOMETRY_SHADER:
_mesa_reference_geomprog(ctx, &prog->GeometryProgram, _mesa_reference_program(ctx, &prog->_LinkedShaders[i]->Program,
(struct gl_geometry_program *)linked_prog); linked_prog);
ok = ctx->Driver.ProgramStringNotify(ctx, GL_GEOMETRY_PROGRAM_NV, ok = ctx->Driver.ProgramStringNotify(ctx, GL_GEOMETRY_PROGRAM_NV,
linked_prog); linked_prog);
break; break;
@@ -3428,7 +3428,6 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
} }
_mesa_reference_fragprog(ctx, &prog->FragmentProgram, NULL); _mesa_reference_fragprog(ctx, &prog->FragmentProgram, NULL);
_mesa_reference_geomprog(ctx, &prog->GeometryProgram, NULL);
if (prog->LinkStatus) { if (prog->LinkStatus) {
link_shaders(ctx, prog); link_shaders(ctx, prog);

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

@@ -5202,8 +5202,8 @@ st_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
} }
break; break;
case GL_GEOMETRY_SHADER: case GL_GEOMETRY_SHADER:
_mesa_reference_geomprog(ctx, &prog->GeometryProgram, _mesa_reference_program(ctx, &prog->_LinkedShaders[i]->Program,
(struct gl_geometry_program *)linked_prog); linked_prog);
ok = ctx->Driver.ProgramStringNotify(ctx, GL_GEOMETRY_PROGRAM_NV, ok = ctx->Driver.ProgramStringNotify(ctx, GL_GEOMETRY_PROGRAM_NV,
linked_prog); linked_prog);
if (!ok) { if (!ok) {

4
src/mesa/state_tracker/st_program.c
View File

@@ -1157,8 +1157,8 @@ destroy_shader_program_variants_cb(GLuint key, void *data, void *userData)
shProg->_LinkedShaders[MESA_SHADER_VERTEX]->Program); shProg->_LinkedShaders[MESA_SHADER_VERTEX]->Program);
destroy_program_variants(st, (struct gl_program *) destroy_program_variants(st, (struct gl_program *)
shProg->FragmentProgram); shProg->FragmentProgram);
destroy_program_variants(st, (struct gl_program *) destroy_program_variants(st,
shProg->GeometryProgram); shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->Program);
} }
break; break;
case GL_VERTEX_SHADER: case GL_VERTEX_SHADER: