f80cb197a9
This applies an API naming change that's been deliberated over for a
while now which is to rename CoglMaterial to CoglPipeline.
For now the new pipeline API is marked as experimental and public
headers continue to talk about materials not pipelines. The CoglMaterial
API is now maintained in terms of the cogl_pipeline API internally.
Currently this API is targeting Cogl 2.0 so we will have time to
integrate it properly with other upcoming Cogl 2.0 work.
The basic reasons for the rename are:
- That the term "material" implies to many people that they are
constrained to fragment processing; perhaps as some kind of high-level
texture abstraction.
- In Clutter they get exposed by ClutterTexture actors which may be
re-inforcing this misconception.
- When comparing how other frameworks use the term material, a material
sometimes describes a multi-pass fragment processing technique which
isn't the case in Cogl.
- In code, "CoglPipeline" will hopefully be a much more self documenting
summary of what these objects represent; a full GPU pipeline
configuration including, for example, vertex processing, fragment
processing and blending.
- When considering the API documentation story, at some point we need a
document introducing developers to how the "GPU pipeline" works so it
should become intuitive that CoglPipeline maps back to that
description of the GPU pipeline.
- This is consistent in terminology and concept to OpenGL 4's new
pipeline object which is a container for program objects.
Note: The cogl-material.[ch] files have been renamed to
cogl-material-compat.[ch] because otherwise git doesn't seem to treat
the change as a moving the old cogl-material.c->cogl-pipeline.c and so
we loose all our git-blame history.
91 lines
2.7 KiB
C
91 lines
2.7 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_H
|
|
#define __COGL_TEXTURE_2D_H
|
|
|
|
#include "cogl-handle.h"
|
|
#include "cogl-pipeline-private.h"
|
|
#include "cogl-texture-private.h"
|
|
|
|
#define COGL_TEXTURE_2D(tex) ((CoglTexture2D *) tex)
|
|
|
|
typedef struct _CoglTexture2D CoglTexture2D;
|
|
|
|
struct _CoglTexture2D
|
|
{
|
|
CoglTexture _parent;
|
|
|
|
/* The internal format of the GL texture represented as a
|
|
CoglPixelFormat */
|
|
CoglPixelFormat format;
|
|
/* The internal format of the GL texture represented as a GL enum */
|
|
GLenum gl_format;
|
|
/* The texture object number */
|
|
GLuint gl_texture;
|
|
int width;
|
|
int height;
|
|
GLenum min_filter;
|
|
GLenum mag_filter;
|
|
GLint wrap_mode_s;
|
|
GLint wrap_mode_t;
|
|
gboolean auto_mipmap;
|
|
gboolean mipmaps_dirty;
|
|
gboolean is_foreign;
|
|
|
|
CoglTexturePixel first_pixel;
|
|
};
|
|
|
|
GQuark
|
|
_cogl_handle_texture_2d_get_type (void);
|
|
|
|
CoglHandle
|
|
_cogl_texture_2d_new_with_size (unsigned int width,
|
|
unsigned int height,
|
|
CoglTextureFlags flags,
|
|
CoglPixelFormat internal_format);
|
|
|
|
CoglHandle
|
|
_cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp,
|
|
CoglTextureFlags flags,
|
|
CoglPixelFormat internal_format);
|
|
|
|
CoglHandle
|
|
_cogl_texture_2d_new_from_foreign (GLuint gl_handle,
|
|
GLuint width,
|
|
GLuint height,
|
|
CoglPixelFormat format);
|
|
|
|
/*
|
|
* _cogl_texture_2d_externally_modified:
|
|
* @handle: A handle to a 2D texture
|
|
*
|
|
* 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 (CoglHandle handle);
|
|
|
|
#endif /* __COGL_TEXTURE_2D_H */
|