isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

pipeline: Remove unsused get_max_texture_image_units()

Browse Source 
This function was not used in the opengl pipeline, probably because of
the more precise get_max_activable_texture_units().

Remove it then.

https://bugzilla.gnome.org/show_bug.cgi?id=657347

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Damien Lespiau 2011-08-25 14:18:01 +01:00 committed by Robert Bragg
parent 11d221af1a
commit 4e1d08d59e
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cogl/cogl-context.c
View File

@ -269,7 +269,6 @@ cogl_context_new (CoglDisplay *display,
_cogl_bitmask_init (&context->arrays_to_change); _cogl_bitmask_init (&context->arrays_to_change);
context->max_texture_units = -1; context->max_texture_units = -1;
context->max_texture_image_units = -1;
context->max_activateable_texture_units = -1; context->max_activateable_texture_units = -1;
context->current_program = COGL_INVALID_HANDLE; context->current_program = COGL_INVALID_HANDLE;

20
cogl/cogl-pipeline-opengl.c
View File

@ -387,26 +387,6 @@ _cogl_use_vertex_program (GLuint gl_program, CoglPipelineProgramType type)
ctx->current_vertex_program_type = type; ctx->current_vertex_program_type = type;
} }
#if defined (COGL_PIPELINE_FRAGEND_GLSL) || \
defined (COGL_PIPELINE_FRAGEND_ARBFP)
int
_cogl_get_max_texture_image_units (void)
{
_COGL_GET_CONTEXT (ctx, 0);
/* This function is called quite often so we cache the value to
avoid too many GL calls */
if (G_UNLIKELY (ctx->max_texture_image_units == -1))
{
ctx->max_texture_image_units = 1;
GE (ctx, glGetIntegerv (GL_MAX_TEXTURE_IMAGE_UNITS,
&ctx->max_texture_image_units));
}
return ctx->max_texture_image_units;
}
#endif
#if defined(HAVE_COGL_GLES2) || defined(HAVE_COGL_GL) #if defined(HAVE_COGL_GLES2) || defined(HAVE_COGL_GL)
static gboolean static gboolean

5
cogl/cogl-pipeline-private.h
View File

@ -916,11 +916,6 @@ typedef struct _CoglPipelineFlushOptions
CoglHandle layer0_override_texture; CoglHandle layer0_override_texture;
} CoglPipelineFlushOptions; } CoglPipelineFlushOptions;
int
_cogl_get_max_texture_image_units (void);
void void
_cogl_use_fragment_program (GLuint gl_program, CoglPipelineProgramType type); _cogl_use_fragment_program (GLuint gl_program, CoglPipelineProgramType type);