diff options
| author | Marek Olšák <[email protected]> | 2015-05-28 16:09:23 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2015-06-05 19:44:32 +0200 |
| commit | e8b040477e271324a88d35c003775337848a500c (patch) | |
| tree | 4b100fbc1bbc4cfab94bd58ac3876ecd85ed0ad8 /src/mesa/main | |
| parent | 3d16b5af1dca889ccc3716470f38c1fa84713f26 (diff) | |
mesa: remove unused geometry shader variables
These states are for GS assembly shaders only. We don't support those.
Reviewed-by: Dave Airlie <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/context.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 7 | ||||
| -rw-r--r-- | src/mesa/main/shared.c | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 8a59b5ed42f..db494ca73cc 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -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._TnlProgram, 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); diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 0aa607653d1..1872845df8d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2275,16 +2275,10 @@ struct gl_vertex_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 * and compiled shader programs). */ 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 gl_vertex_program *DefaultVertexProgram; struct gl_fragment_program *DefaultFragmentProgram; - struct gl_geometry_program *DefaultGeometryProgram; /*@}*/ /* GL_ATI_fragment_shader */ diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c index 0b76cc01218..d5ac9f1fb13 100644 --- a/src/mesa/main/shared.c +++ b/src/mesa/main/shared.c @@ -313,7 +313,6 @@ free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared) _mesa_DeleteHashTable(shared->Programs); _mesa_reference_vertprog(ctx, &shared->DefaultVertexProgram, NULL); - _mesa_reference_geomprog(ctx, &shared->DefaultGeometryProgram, NULL); _mesa_reference_fragprog(ctx, &shared->DefaultFragmentProgram, NULL); _mesa_HashDeleteAll(shared->ATIShaders, delete_fragshader_cb, ctx); |