Mesa (master): mesa: Delete ctx->GeometryProgram.Cache.

Kenneth Graunke kwg at kemper.freedesktop.org
Sat Aug 30 05:12:10 UTC 2014


Module: Mesa
Branch: master
Commit: 941269f89c147a606787a10e41959ede98da5df6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=941269f89c147a606787a10e41959ede98da5df6

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Wed Aug 27 20:14:54 2014 -0700

mesa: Delete ctx->GeometryProgram.Cache.

The VertexProgram and FragmentProgram have a Cache member for dealing
with fixed function programs.  There are no fixed function geometry
programs, so this should never have existed, and was just copy and
pasted.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/main/mtypes.h     |    3 ---
 src/mesa/program/program.c |    2 --
 2 files changed, 5 deletions(-)

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index adb6788..dc25ea4 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2317,9 +2317,6 @@ struct gl_geometry_program_state
    struct gl_geometry_program *_Current;
 
    GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */
-
-   /** Cache of fixed-function programs */
-   struct gl_program_cache *Cache;
 };
 
 /**
diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index ef5bf6b..6e17fe6 100644
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -100,7 +100,6 @@ _mesa_init_program(struct gl_context *ctx)
    /* right now by default we don't have a geometry program */
    _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,
                             NULL);
-   ctx->GeometryProgram.Cache = _mesa_new_program_cache();
 
    /* XXX probably move this stuff */
    ctx->ATIFragmentShader.Enabled = GL_FALSE;
@@ -121,7 +120,6 @@ _mesa_free_program_data(struct gl_context *ctx)
    _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);
    _mesa_delete_shader_cache(ctx, ctx->FragmentProgram.Cache);
    _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current, NULL);
-   _mesa_delete_program_cache(ctx, ctx->GeometryProgram.Cache);
 
    /* XXX probably move this stuff */
    if (ctx->ATIFragmentShader.Current) {




More information about the mesa-commit mailing list