mutter/cogl/driver/gl/cogl-texture-gl.c
Neil Roberts da7971f6be Don't set GL_TEXTURE_MAX_LEVEL on GLES
GL_TEXTURE_MAX_LEVEL is not supported on GLES so we can't set it. It
looks like Mesa was letting us get away with this but on other drivers
it may cause errors. The enum is not defined in the GLES headers so it
was failing to compile unless the GL driver is also enabled.

The test-texture-mipmap-get-set test is now marked as n/a on GLES2
because it can't support limiting the sampled mipmaps.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit ba51c393818582b058f5f1e66cf8d13835ad10e5)

Conflicts:
	tests/conform/test-conform-main.c
2013-01-25 18:21:09 +00:00

150 lines
4.7 KiB
C

/*
* Cogl
*
* An object oriented GL/GLES Abstraction/Utility Layer
*
* Copyright (C) 2012 Intel Corporation.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <strings.h>
#include "cogl-context-private.h"
#include "cogl-util-gl-private.h"
#include "cogl-texture-gl-private.h"
#include "cogl-texture-3d-private.h"
#include "cogl-util.h"
#include "cogl-pipeline-opengl-private.h"
static inline int
calculate_alignment (int rowstride)
{
int alignment = 1 << (_cogl_util_ffs (rowstride) - 1);
return MIN (alignment, 8);
}
void
_cogl_texture_gl_prep_alignment_for_pixels_upload (CoglContext *ctx,
int pixels_rowstride)
{
GE( ctx, glPixelStorei (GL_UNPACK_ALIGNMENT,
calculate_alignment (pixels_rowstride)) );
}
void
_cogl_texture_gl_prep_alignment_for_pixels_download (CoglContext *ctx,
int bpp,
int width,
int rowstride)
{
int alignment;
/* If no padding is needed then we can always use an alignment of 1.
* We want to do this even though it is equivalent to the alignment
* of the rowstride because the Intel driver in Mesa currently has
* an optimisation when reading data into a PBO that only works if
* the alignment is exactly 1.
*
* https://bugs.freedesktop.org/show_bug.cgi?id=46632
*/
if (rowstride == bpp * width)
alignment = 1;
else
alignment = calculate_alignment (rowstride);
GE( ctx, glPixelStorei (GL_PACK_ALIGNMENT, alignment) );
}
void
_cogl_texture_gl_flush_legacy_texobj_wrap_modes (CoglTexture *texture,
unsigned int wrap_mode_s,
unsigned int wrap_mode_t,
unsigned int wrap_mode_p)
{
texture->vtable->gl_flush_legacy_texobj_wrap_modes (texture,
wrap_mode_s,
wrap_mode_t,
wrap_mode_p);
}
void
_cogl_texture_gl_flush_legacy_texobj_filters (CoglTexture *texture,
unsigned int min_filter,
unsigned int mag_filter)
{
texture->vtable->gl_flush_legacy_texobj_filters (texture,
min_filter, mag_filter);
}
void
_cogl_texture_gl_maybe_update_max_level (CoglTexture *texture,
int max_level)
{
/* This isn't supported on GLES */
#ifdef HAVE_COGL_GL
CoglContext *ctx = texture->context;
if ((ctx->private_feature_flags & COGL_PRIVATE_FEATURE_TEXTURE_MAX_LEVEL) &&
texture->max_level < max_level)
{
CoglContext *ctx = texture->context;
GLuint gl_handle;
GLenum gl_target;
cogl_texture_get_gl_texture (texture, &gl_handle, &gl_target);
texture->max_level = max_level;
_cogl_bind_gl_texture_transient (gl_target,
gl_handle,
_cogl_texture_is_foreign (texture));
GE( ctx, glTexParameteri (gl_target,
GL_TEXTURE_MAX_LEVEL, texture->max_level));
}
#endif /* HAVE_COGL_GL */
}
void
_cogl_texture_gl_generate_mipmaps (CoglTexture *texture)
{
CoglContext *ctx = texture->context;
int n_levels = _cogl_texture_get_n_levels (texture);
GLuint gl_handle;
GLenum gl_target;
_cogl_texture_gl_maybe_update_max_level (texture, n_levels - 1);
cogl_texture_get_gl_texture (texture, &gl_handle, &gl_target);
_cogl_bind_gl_texture_transient (gl_target,
gl_handle,
_cogl_texture_is_foreign (texture));
GE( ctx, glGenerateMipmap (gl_target) );
}
GLenum
_cogl_texture_gl_get_format (CoglTexture *texture)
{
return texture->vtable->get_gl_format (texture);
}