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

mesa: Delete ctx->GeometryProgram.Cache.

Browse Source 
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@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Kenneth Graunke
2014-08-27 20:14:54 -07:00
parent ca4f0baca2
commit 941269f89c
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2317,9 +2317,6 @@ struct gl_geometry_program_state
struct gl_geometry_program *_Current; struct gl_geometry_program *_Current;
GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */ GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */
/** Cache of fixed-function programs */
struct gl_program_cache *Cache;
}; };
/** /**

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

@@ -100,7 +100,6 @@ _mesa_init_program(struct gl_context *ctx)
/* right now by default we don't have a geometry program */ /* right now by default we don't have a geometry program */
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current, _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,
NULL); NULL);
ctx->GeometryProgram.Cache = _mesa_new_program_cache();
/* XXX probably move this stuff */ /* XXX probably move this stuff */
ctx->ATIFragmentShader.Enabled = GL_FALSE; 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_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_geomprog(ctx, &ctx->GeometryProgram.Current, NULL);
_mesa_delete_program_cache(ctx, ctx->GeometryProgram.Cache);
/* XXX probably move this stuff */ /* XXX probably move this stuff */
if (ctx->ATIFragmentShader.Current) { if (ctx->ATIFragmentShader.Current) {