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

mesa: remove unused geometry shader variables

Browse Source 
These states are for GS assembly shaders only. We don't support those.

Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák
2015-05-28 16:09:23 +02:00
parent 3d16b5af1d
commit e8b040477e
4 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1331,7 +1331,6 @@ _mesa_free_context_data( struct gl_context *ctx )
_mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL); _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
_mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, NULL); _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, NULL);
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current, NULL);
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current, NULL); _mesa_reference_geomprog(ctx, &ctx->GeometryProgram._Current, NULL);
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL); _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);

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

@@ -2275,16 +2275,10 @@ struct gl_vertex_program_state
*/ */
struct gl_geometry_program_state struct gl_geometry_program_state
{ {
GLboolean Enabled; /**< GL_ARB_GEOMETRY_SHADER4 */
GLboolean _Enabled; /**< Enabled and valid program? */
struct gl_geometry_program *Current; /**< user-bound geometry program */
/** Currently enabled and valid program (including internal programs /** Currently enabled and valid program (including internal programs
* and compiled shader programs). * and compiled shader programs).
*/ */
struct gl_geometry_program *_Current; struct gl_geometry_program *_Current;
GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */
}; };
/** /**
@@ -3004,7 +2998,6 @@ struct gl_shared_state
struct _mesa_HashTable *Programs; /**< All vertex/fragment programs */ struct _mesa_HashTable *Programs; /**< All vertex/fragment programs */
struct gl_vertex_program *DefaultVertexProgram; struct gl_vertex_program *DefaultVertexProgram;
struct gl_fragment_program *DefaultFragmentProgram; struct gl_fragment_program *DefaultFragmentProgram;
struct gl_geometry_program *DefaultGeometryProgram;
/*@}*/ /*@}*/
/* GL_ATI_fragment_shader */ /* GL_ATI_fragment_shader */

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

@@ -313,7 +313,6 @@ free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared)
_mesa_DeleteHashTable(shared->Programs); _mesa_DeleteHashTable(shared->Programs);
_mesa_reference_vertprog(ctx, &shared->DefaultVertexProgram, NULL); _mesa_reference_vertprog(ctx, &shared->DefaultVertexProgram, NULL);
_mesa_reference_geomprog(ctx, &shared->DefaultGeometryProgram, NULL);
_mesa_reference_fragprog(ctx, &shared->DefaultFragmentProgram, NULL); _mesa_reference_fragprog(ctx, &shared->DefaultFragmentProgram, NULL);
_mesa_HashDeleteAll(shared->ATIShaders, delete_fragshader_cb, ctx); _mesa_HashDeleteAll(shared->ATIShaders, delete_fragshader_cb, ctx);

9
src/mesa/program/program.c
View File

@@ -97,11 +97,6 @@ _mesa_init_program(struct gl_context *ctx)
assert(ctx->FragmentProgram.Current); assert(ctx->FragmentProgram.Current);
ctx->FragmentProgram.Cache = _mesa_new_program_cache(); ctx->FragmentProgram.Cache = _mesa_new_program_cache();
ctx->GeometryProgram.Enabled = GL_FALSE;
/* right now by default we don't have a geometry program */
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,
NULL);
_mesa_reference_compprog(ctx, &ctx->ComputeProgram.Current, NULL); _mesa_reference_compprog(ctx, &ctx->ComputeProgram.Current, NULL);
/* XXX probably move this stuff */ /* XXX probably move this stuff */
@@ -122,7 +117,6 @@ _mesa_free_program_data(struct gl_context *ctx)
_mesa_delete_program_cache(ctx, ctx->VertexProgram.Cache); _mesa_delete_program_cache(ctx, ctx->VertexProgram.Cache);
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL); _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);
_mesa_delete_shader_cache(ctx, ctx->FragmentProgram.Cache); _mesa_delete_shader_cache(ctx, ctx->FragmentProgram.Cache);
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current, NULL);
_mesa_reference_compprog(ctx, &ctx->ComputeProgram.Current, NULL); _mesa_reference_compprog(ctx, &ctx->ComputeProgram.Current, NULL);
/* XXX probably move this stuff */ /* XXX probably move this stuff */
@@ -153,9 +147,6 @@ _mesa_update_default_objects_program(struct gl_context *ctx)
ctx->Shared->DefaultFragmentProgram); ctx->Shared->DefaultFragmentProgram);
assert(ctx->FragmentProgram.Current); assert(ctx->FragmentProgram.Current);
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,
ctx->Shared->DefaultGeometryProgram);
/* XXX probably move this stuff */ /* XXX probably move this stuff */
if (ctx->ATIFragmentShader.Current) { if (ctx->ATIFragmentShader.Current) {
ctx->ATIFragmentShader.Current->RefCount--; ctx->ATIFragmentShader.Current->RefCount--;