6f480c7530
This removes the gl centric _cogl_texture_prepare_for_upload api from cogl-texture.c and instead adds a _cogl_bitmap_convert_for_upload() api which everything now uses instead. GL specific code that needed the gl internal/format/type enums returned by _cogl_texture_prepare_for_upload now use ->pixel_format_to_gl directly. Since there was a special case optimization in cogl_texture_new_from_file that aimed to avoid copying the temporary bitmap that's created for the given file and allow conversions to happen in-place the new _cogl_bitmap_convert_for_upload() api supports converting in place depending on a 'can_convert_in_place' argument. This ability to convert bitmaps in-place has been integrated across the different components as appropriate. In updating cogl-texture-2d-sliced.c this was able to remove a number of other GL specific parts to how spans are setup. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit e190dd23c655da34b9c5c263a9f6006dcc0413b0) Conflicts: cogl/cogl-auto-texture.c cogl/cogl.symbols
128 lines
4.3 KiB
C
128 lines
4.3 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2009 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/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifndef __COGL_TEXTURE_2D_PRIVATE_H
|
|
#define __COGL_TEXTURE_2D_PRIVATE_H
|
|
|
|
#include "cogl-object-private.h"
|
|
#include "cogl-pipeline-private.h"
|
|
#include "cogl-texture-private.h"
|
|
#include "cogl-texture-2d.h"
|
|
|
|
#ifdef COGL_HAS_EGL_SUPPORT
|
|
#include "cogl-egl-defines.h"
|
|
#endif
|
|
|
|
struct _CoglTexture2D
|
|
{
|
|
CoglTexture _parent;
|
|
|
|
/* The internal format of the GL texture represented as a
|
|
CoglPixelFormat */
|
|
CoglPixelFormat internal_format;
|
|
|
|
CoglBool auto_mipmap;
|
|
CoglBool mipmaps_dirty;
|
|
CoglBool is_foreign;
|
|
|
|
/* TODO: factor out these OpenGL specific members into some form
|
|
* of driver private state. */
|
|
|
|
/* The internal format of the GL texture represented as a GL enum */
|
|
GLenum gl_internal_format;
|
|
/* The texture object number */
|
|
GLuint gl_texture;
|
|
GLenum gl_legacy_texobj_min_filter;
|
|
GLenum gl_legacy_texobj_mag_filter;
|
|
GLint gl_legacy_texobj_wrap_mode_s;
|
|
GLint gl_legacy_texobj_wrap_mode_t;
|
|
CoglTexturePixel first_pixel;
|
|
};
|
|
|
|
CoglTexture2D *
|
|
_cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp,
|
|
CoglPixelFormat internal_format,
|
|
CoglBool can_convert_in_place,
|
|
CoglError **error);
|
|
|
|
#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
|
|
/* NB: The reason we require the width, height and format to be passed
|
|
* even though they may seem redundant is because GLES 1/2 don't
|
|
* provide a way to query these properties. */
|
|
CoglTexture2D *
|
|
_cogl_egl_texture_2d_new_from_image (CoglContext *ctx,
|
|
int width,
|
|
int height,
|
|
CoglPixelFormat format,
|
|
EGLImageKHR image,
|
|
CoglError **error);
|
|
#endif
|
|
|
|
CoglTexture2D *
|
|
_cogl_texture_2d_create_base (CoglContext *ctx,
|
|
int width,
|
|
int height,
|
|
CoglPixelFormat internal_format);
|
|
|
|
void
|
|
_cogl_texture_2d_set_auto_mipmap (CoglTexture *tex,
|
|
CoglBool value);
|
|
|
|
/*
|
|
* _cogl_texture_2d_externally_modified:
|
|
* @texture: A #CoglTexture2D object
|
|
*
|
|
* This should be called whenever the texture is modified other than
|
|
* by using cogl_texture_set_region. It will cause the mipmaps to be
|
|
* invalidated
|
|
*/
|
|
void
|
|
_cogl_texture_2d_externally_modified (CoglTexture *texture);
|
|
|
|
/*
|
|
* _cogl_texture_2d_copy_from_framebuffer:
|
|
* @texture: A #CoglTexture2D pointer
|
|
* @src_x: X-position to within the framebuffer to read from
|
|
* @src_y: Y-position to within the framebuffer to read from
|
|
* @width: width of the rectangle to copy
|
|
* @height: height of the rectangle to copy
|
|
* @src_fb: A source #CoglFramebuffer to copy from
|
|
* @dst_x: X-position to store the image within the texture
|
|
* @dst_y: Y-position to store the image within the texture
|
|
* @level: The mipmap level of @texture to copy too
|
|
*
|
|
* This copies a portion of the given @src_fb into the
|
|
* texture.
|
|
*/
|
|
void
|
|
_cogl_texture_2d_copy_from_framebuffer (CoglTexture2D *texture,
|
|
int src_x,
|
|
int src_y,
|
|
int width,
|
|
int height,
|
|
CoglFramebuffer *src_fb,
|
|
int dst_x,
|
|
int dst_y,
|
|
int level);
|
|
|
|
#endif /* __COGL_TEXTURE_2D_PRIVATE_H */
|