2007-03-26 23:18:39 +00:00
|
|
|
/*
|
2009-03-30 16:07:31 +00:00
|
|
|
* Cogl
|
2007-03-26 23:18:39 +00:00
|
|
|
*
|
2009-04-27 14:48:12 +00:00
|
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
2007-03-26 23:18:39 +00:00
|
|
|
*
|
2009-04-27 14:48:12 +00:00
|
|
|
* Copyright (C) 2007,2008,2009 Intel Corporation.
|
2007-03-26 23:18:39 +00:00
|
|
|
*
|
|
|
|
|
* 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, write to the
|
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
2007-10-12 08:17:00 +00:00
|
|
|
#ifdef HAVE_CONFIG_H
|
2007-04-27 21:13:06 +00:00
|
|
|
#include "config.h"
|
2007-10-12 08:17:00 +00:00
|
|
|
#endif
|
|
|
|
|
|
2007-04-27 21:13:06 +00:00
|
|
|
#include <string.h>
|
2009-03-30 16:07:31 +00:00
|
|
|
|
|
|
|
|
#include "cogl.h"
|
2007-04-27 21:13:06 +00:00
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
#include "cogl-internal.h"
|
|
|
|
|
#include "cogl-context.h"
|
2008-02-01 15:29:00 +00:00
|
|
|
|
2007-10-12 08:17:00 +00:00
|
|
|
gboolean
|
2007-06-14 12:54:47 +00:00
|
|
|
cogl_check_extension (const gchar *name, const gchar *ext)
|
2007-05-16 09:08:30 +00:00
|
|
|
{
|
|
|
|
|
gchar *end;
|
|
|
|
|
gint name_len, n;
|
|
|
|
|
|
|
|
|
|
if (name == NULL || ext == NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
end = (gchar*)(ext + strlen(ext));
|
|
|
|
|
|
|
|
|
|
name_len = strlen(name);
|
|
|
|
|
|
2007-10-12 08:17:00 +00:00
|
|
|
while (ext < end)
|
2007-05-16 09:08:30 +00:00
|
|
|
{
|
|
|
|
|
n = strcspn(ext, " ");
|
|
|
|
|
|
|
|
|
|
if ((name_len == n) && (!strncmp(name, ext, n)))
|
|
|
|
|
return TRUE;
|
|
|
|
|
ext += (n + 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2008-06-27 23:02:30 +00:00
|
|
|
#ifdef HAVE_CLUTTER_OSX
|
|
|
|
|
static gboolean
|
|
|
|
|
really_enable_npot (void)
|
|
|
|
|
{
|
|
|
|
|
/* OSX backend + ATI Radeon X1600 + NPOT texture + GL_REPEAT seems to crash
|
|
|
|
|
* http://bugzilla.openedhand.com/show_bug.cgi?id=929
|
|
|
|
|
*
|
|
|
|
|
* Temporary workaround until post 0.8 we rejig the features set up a
|
|
|
|
|
* little to allow the backend to overide.
|
|
|
|
|
*/
|
|
|
|
|
const char *gl_renderer;
|
|
|
|
|
const char *env_string;
|
|
|
|
|
|
|
|
|
|
/* Regardless of hardware, allow user to decide. */
|
|
|
|
|
env_string = g_getenv ("COGL_ENABLE_NPOT");
|
|
|
|
|
if (env_string != NULL)
|
|
|
|
|
return env_string[0] == '1';
|
|
|
|
|
|
|
|
|
|
gl_renderer = (char*)glGetString (GL_RENDERER);
|
|
|
|
|
if (strstr (gl_renderer, "ATI Radeon X1600") != NULL)
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-03-30 16:07:31 +00:00
|
|
|
void
|
|
|
|
|
_cogl_features_init (void)
|
2007-05-16 09:08:30 +00:00
|
|
|
{
|
2008-10-30 16:52:56 +00:00
|
|
|
CoglFeatureFlags flags = 0;
|
|
|
|
|
const gchar *gl_extensions;
|
|
|
|
|
GLint max_clip_planes = 0;
|
2008-12-04 13:45:09 +00:00
|
|
|
GLint num_stencil_bits = 0;
|
2007-10-12 08:17:00 +00:00
|
|
|
|
2008-06-23 11:01:30 +00:00
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
flags = COGL_FEATURE_TEXTURE_READ_PIXELS;
|
2007-05-16 09:08:30 +00:00
|
|
|
|
|
|
|
|
gl_extensions = (const gchar*) glGetString (GL_EXTENSIONS);
|
|
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
if (cogl_check_extension ("GL_ARB_texture_non_power_of_two", gl_extensions))
|
|
|
|
|
{
|
2008-06-27 23:02:30 +00:00
|
|
|
#ifdef HAVE_CLUTTER_OSX
|
|
|
|
|
if (really_enable_npot ())
|
|
|
|
|
#endif
|
|
|
|
|
flags |= COGL_FEATURE_TEXTURE_NPOT;
|
2008-04-25 13:37:36 +00:00
|
|
|
}
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2007-05-25 10:56:09 +00:00
|
|
|
#ifdef GL_YCBCR_MESA
|
2007-06-14 12:54:47 +00:00
|
|
|
if (cogl_check_extension ("GL_MESA_ycbcr_texture", gl_extensions))
|
2007-05-25 10:56:09 +00:00
|
|
|
{
|
2008-04-25 13:37:36 +00:00
|
|
|
flags |= COGL_FEATURE_TEXTURE_YUV;
|
2007-05-25 10:56:09 +00:00
|
|
|
}
|
|
|
|
|
#endif
|
2007-10-12 08:17:00 +00:00
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
if (cogl_check_extension ("GL_ARB_shader_objects", gl_extensions) &&
|
|
|
|
|
cogl_check_extension ("GL_ARB_vertex_shader", gl_extensions) &&
|
2007-12-03 16:29:18 +00:00
|
|
|
cogl_check_extension ("GL_ARB_fragment_shader", gl_extensions))
|
|
|
|
|
{
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glCreateProgramObjectARB =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLCREATEPROGRAMOBJECTARBPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glCreateProgramObjectARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glCreateShaderObjectARB =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLCREATESHADEROBJECTARBPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glCreateShaderObjectARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glShaderSourceARB =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLSHADERSOURCEARBPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glShaderSourceARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glCompileShaderARB =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLCOMPILESHADERARBPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glCompileShaderARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glAttachObjectARB =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLATTACHOBJECTARBPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glAttachObjectARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glLinkProgramARB =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLLINKPROGRAMARBPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glLinkProgramARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUseProgramObjectARB =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLUSEPROGRAMOBJECTARBPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glUseProgramObjectARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glGetUniformLocationARB =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLGETUNIFORMLOCATIONARBPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glGetUniformLocationARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glDeleteObjectARB =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLDELETEOBJECTARBPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glDeleteObjectARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glGetInfoLogARB =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLGETINFOLOGARBPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glGetInfoLogARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glGetObjectParameterivARB =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLGETOBJECTPARAMETERIVARBPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glGetObjectParameterivARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform1fARB =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLUNIFORM1FARBPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glUniform1fARB");
|
2008-11-10 18:53:14 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glVertexAttribPointerARB =
|
2008-11-10 18:53:14 +00:00
|
|
|
(COGL_PFNGLVERTEXATTRIBPOINTERARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glVertexAttribPointerARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glEnableVertexAttribArrayARB =
|
2008-11-10 18:53:14 +00:00
|
|
|
(COGL_PFNGLENABLEVERTEXATTRIBARRAYARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glEnableVertexAttribArrayARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glDisableVertexAttribArrayARB =
|
2008-11-10 18:53:14 +00:00
|
|
|
(COGL_PFNGLDISABLEVERTEXATTRIBARRAYARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glDisableVertexAttribArrayARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform2fARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM2FARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform2fARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform3fARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM3FARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform3fARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform4fARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM4FARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform4fARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform1fvARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM1FVARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform1fvARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform2fvARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM2FVARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform2fvARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform3fvARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM3FVARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform3fvARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform4fvARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM4FVARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform4fvARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform1iARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM1IARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform1iARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform2iARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM2IARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform2iARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform3iARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM3IARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform3iARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform4iARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM4IARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform4iARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform1ivARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM1IVARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform1ivARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform2ivARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM2IVARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform2ivARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform3ivARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM3IVARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform3ivARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniform4ivARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORM4IVARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniform4ivARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniformMatrix2fvARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORMMATRIX2FVARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniformMatrix2fvARB");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniformMatrix3fvARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORMMATRIX3FVARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniformMatrix3fvARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUniformMatrix4fvARB =
|
2008-11-18 15:08:40 +00:00
|
|
|
(COGL_PFNGLUNIFORMMATRIX4FVARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUniformMatrix4fvARB");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
if (ctx->drv.pf_glCreateProgramObjectARB &&
|
|
|
|
|
ctx->drv.pf_glCreateShaderObjectARB &&
|
|
|
|
|
ctx->drv.pf_glShaderSourceARB &&
|
|
|
|
|
ctx->drv.pf_glCompileShaderARB &&
|
|
|
|
|
ctx->drv.pf_glAttachObjectARB &&
|
|
|
|
|
ctx->drv.pf_glLinkProgramARB &&
|
|
|
|
|
ctx->drv.pf_glUseProgramObjectARB &&
|
|
|
|
|
ctx->drv.pf_glGetUniformLocationARB &&
|
|
|
|
|
ctx->drv.pf_glDeleteObjectARB &&
|
|
|
|
|
ctx->drv.pf_glGetInfoLogARB &&
|
|
|
|
|
ctx->drv.pf_glGetObjectParameterivARB &&
|
|
|
|
|
ctx->drv.pf_glUniform1fARB &&
|
|
|
|
|
ctx->drv.pf_glUniform2fARB &&
|
|
|
|
|
ctx->drv.pf_glUniform3fARB &&
|
|
|
|
|
ctx->drv.pf_glUniform4fARB &&
|
|
|
|
|
ctx->drv.pf_glUniform1fvARB &&
|
|
|
|
|
ctx->drv.pf_glUniform2fvARB &&
|
|
|
|
|
ctx->drv.pf_glUniform3fvARB &&
|
|
|
|
|
ctx->drv.pf_glUniform4fvARB &&
|
|
|
|
|
ctx->drv.pf_glUniform1iARB &&
|
|
|
|
|
ctx->drv.pf_glUniform2iARB &&
|
|
|
|
|
ctx->drv.pf_glUniform3iARB &&
|
|
|
|
|
ctx->drv.pf_glUniform4iARB &&
|
|
|
|
|
ctx->drv.pf_glUniform1ivARB &&
|
|
|
|
|
ctx->drv.pf_glUniform2ivARB &&
|
|
|
|
|
ctx->drv.pf_glUniform3ivARB &&
|
|
|
|
|
ctx->drv.pf_glUniform4ivARB &&
|
|
|
|
|
ctx->drv.pf_glUniformMatrix2fvARB &&
|
|
|
|
|
ctx->drv.pf_glUniformMatrix3fvARB &&
|
|
|
|
|
ctx->drv.pf_glUniformMatrix4fvARB &&
|
|
|
|
|
ctx->drv.pf_glVertexAttribPointerARB &&
|
|
|
|
|
ctx->drv.pf_glEnableVertexAttribArrayARB &&
|
|
|
|
|
ctx->drv.pf_glDisableVertexAttribArrayARB)
|
2008-04-25 13:37:36 +00:00
|
|
|
flags |= COGL_FEATURE_SHADERS_GLSL;
|
2007-12-03 16:29:18 +00:00
|
|
|
}
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2008-02-01 15:29:00 +00:00
|
|
|
if (cogl_check_extension ("GL_EXT_framebuffer_object", gl_extensions) ||
|
|
|
|
|
cogl_check_extension ("GL_ARB_framebuffer_object", gl_extensions))
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
{
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glGenRenderbuffersEXT =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLGENRENDERBUFFERSEXTPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glGenRenderbuffersEXT");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glDeleteRenderbuffersEXT =
|
2008-08-01 12:23:57 +00:00
|
|
|
(COGL_PFNGLDELETERENDERBUFFERSEXTPROC)
|
|
|
|
|
cogl_get_proc_address ("glDeleteRenderbuffersEXT");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glBindRenderbufferEXT =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLBINDRENDERBUFFEREXTPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glBindRenderbufferEXT");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glRenderbufferStorageEXT =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLRENDERBUFFERSTORAGEEXTPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glRenderbufferStorageEXT");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glGenFramebuffersEXT =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLGENFRAMEBUFFERSEXTPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glGenFramebuffersEXT");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glBindFramebufferEXT =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLBINDFRAMEBUFFEREXTPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glBindFramebufferEXT");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glFramebufferTexture2DEXT =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLFRAMEBUFFERTEXTURE2DEXTPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glFramebufferTexture2DEXT");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glFramebufferRenderbufferEXT =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glFramebufferRenderbufferEXT");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glCheckFramebufferStatusEXT =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glCheckFramebufferStatusEXT");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glDeleteFramebuffersEXT =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLDELETEFRAMEBUFFERSEXTPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glDeleteFramebuffersEXT");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glGenerateMipmapEXT =
|
2009-06-04 15:04:57 +00:00
|
|
|
(COGL_PFNGLGENERATEMIPMAPEXTPROC)
|
|
|
|
|
cogl_get_proc_address ("glGenerateMipmapEXT");
|
|
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
if (ctx->drv.pf_glGenRenderbuffersEXT &&
|
|
|
|
|
ctx->drv.pf_glBindRenderbufferEXT &&
|
|
|
|
|
ctx->drv.pf_glRenderbufferStorageEXT &&
|
|
|
|
|
ctx->drv.pf_glGenFramebuffersEXT &&
|
|
|
|
|
ctx->drv.pf_glBindFramebufferEXT &&
|
|
|
|
|
ctx->drv.pf_glFramebufferTexture2DEXT &&
|
|
|
|
|
ctx->drv.pf_glFramebufferRenderbufferEXT &&
|
|
|
|
|
ctx->drv.pf_glCheckFramebufferStatusEXT &&
|
|
|
|
|
ctx->drv.pf_glDeleteFramebuffersEXT &&
|
|
|
|
|
ctx->drv.pf_glGenerateMipmapEXT)
|
2008-04-25 13:37:36 +00:00
|
|
|
flags |= COGL_FEATURE_OFFSCREEN;
|
|
|
|
|
}
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
if (cogl_check_extension ("GL_EXT_framebuffer_blit", gl_extensions))
|
|
|
|
|
{
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glBlitFramebufferEXT =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLBLITFRAMEBUFFEREXTPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glBlitFramebufferEXT");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
if (ctx->drv.pf_glBlitFramebufferEXT)
|
2008-04-25 13:37:36 +00:00
|
|
|
flags |= COGL_FEATURE_OFFSCREEN_BLIT;
|
|
|
|
|
}
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
if (cogl_check_extension ("GL_EXT_framebuffer_multisample", gl_extensions))
|
2008-02-01 15:29:00 +00:00
|
|
|
{
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glRenderbufferStorageMultisampleEXT =
|
2008-05-12 17:20:22 +00:00
|
|
|
(COGL_PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)
|
2008-04-25 13:37:36 +00:00
|
|
|
cogl_get_proc_address ("glRenderbufferStorageMultisampleEXT");
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 16:15:40 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
if (ctx->drv.pf_glRenderbufferStorageMultisampleEXT)
|
2008-04-25 13:37:36 +00:00
|
|
|
flags |= COGL_FEATURE_OFFSCREEN_MULTISAMPLE;
|
2008-02-01 15:29:00 +00:00
|
|
|
}
|
|
|
|
|
|
2008-12-04 13:45:09 +00:00
|
|
|
GE( glGetIntegerv (GL_STENCIL_BITS, &num_stencil_bits) );
|
|
|
|
|
/* We need at least three stencil bits to combine clips */
|
|
|
|
|
if (num_stencil_bits > 2)
|
2008-04-25 13:37:36 +00:00
|
|
|
flags |= COGL_FEATURE_STENCIL_BUFFER;
|
|
|
|
|
|
|
|
|
|
GE( glGetIntegerv (GL_MAX_CLIP_PLANES, &max_clip_planes) );
|
|
|
|
|
if (max_clip_planes >= 4)
|
|
|
|
|
flags |= COGL_FEATURE_FOUR_CLIP_PLANES;
|
2008-06-23 14:57:36 +00:00
|
|
|
|
2008-11-10 18:53:14 +00:00
|
|
|
if (cogl_check_extension ("GL_ARB_vertex_buffer_object", gl_extensions))
|
|
|
|
|
{
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glGenBuffersARB =
|
2008-11-10 18:53:14 +00:00
|
|
|
(COGL_PFNGLGENBUFFERSARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glGenBuffersARB");
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glBindBufferARB =
|
2008-11-10 18:53:14 +00:00
|
|
|
(COGL_PFNGLBINDBUFFERARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glBindBufferARB");
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glBufferDataARB =
|
2008-11-10 18:53:14 +00:00
|
|
|
(COGL_PFNGLBUFFERDATAARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glBufferDataARB");
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glBufferSubDataARB =
|
2008-12-10 12:13:20 +00:00
|
|
|
(COGL_PFNGLBUFFERSUBDATAARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glBufferSubDataARB");
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glDeleteBuffersARB =
|
2008-11-10 18:53:14 +00:00
|
|
|
(COGL_PFNGLDELETEBUFFERSARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glDeleteBuffersARB");
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glMapBufferARB =
|
2008-11-10 18:53:14 +00:00
|
|
|
(COGL_PFNGLMAPBUFFERARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glMapBufferARB");
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glUnmapBufferARB =
|
2008-11-10 18:53:14 +00:00
|
|
|
(COGL_PFNGLUNMAPBUFFERARBPROC)
|
|
|
|
|
cogl_get_proc_address ("glUnmapBufferARB");
|
2009-07-28 00:34:33 +00:00
|
|
|
if (ctx->drv.pf_glGenBuffersARB
|
|
|
|
|
&& ctx->drv.pf_glBindBufferARB
|
|
|
|
|
&& ctx->drv.pf_glBufferDataARB
|
|
|
|
|
&& ctx->drv.pf_glBufferSubDataARB
|
|
|
|
|
&& ctx->drv.pf_glDeleteBuffersARB
|
|
|
|
|
&& ctx->drv.pf_glMapBufferARB
|
|
|
|
|
&& ctx->drv.pf_glUnmapBufferARB)
|
2008-11-10 18:53:14 +00:00
|
|
|
flags |= COGL_FEATURE_VBOS;
|
|
|
|
|
}
|
|
|
|
|
|
2009-02-16 12:42:08 +00:00
|
|
|
/* These should always be available because they are defined in GL
|
|
|
|
|
1.2, but we can't call it directly because under Windows
|
|
|
|
|
functions > 1.1 aren't exported */
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glDrawRangeElements =
|
2008-11-21 16:18:58 +00:00
|
|
|
(COGL_PFNGLDRAWRANGEELEMENTSPROC)
|
|
|
|
|
cogl_get_proc_address ("glDrawRangeElements");
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glActiveTexture =
|
2009-02-16 12:42:08 +00:00
|
|
|
(COGL_PFNGLACTIVETEXTUREPROC)
|
|
|
|
|
cogl_get_proc_address ("glActiveTexture");
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glClientActiveTexture =
|
2009-02-16 12:42:08 +00:00
|
|
|
(COGL_PFNGLCLIENTACTIVETEXTUREPROC)
|
|
|
|
|
cogl_get_proc_address ("glClientActiveTexture");
|
2008-11-21 16:18:58 +00:00
|
|
|
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glBlendEquation =
|
2009-06-04 10:50:06 +00:00
|
|
|
(COGL_PFNGLBLENDEQUATIONPROC)
|
|
|
|
|
cogl_get_proc_address ("glBlendEquation");
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glBlendColor =
|
2009-06-04 10:50:06 +00:00
|
|
|
(COGL_PFNGLBLENDCOLORPROC)
|
|
|
|
|
cogl_get_proc_address ("glBlendColor");
|
|
|
|
|
|
2009-05-10 23:40:41 +00:00
|
|
|
/* Available in 1.4 */
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glBlendFuncSeparate =
|
2009-05-10 23:40:41 +00:00
|
|
|
(COGL_PFNGLBLENDFUNCSEPARATEPROC)
|
|
|
|
|
cogl_get_proc_address ("glBlendFuncSeparate");
|
|
|
|
|
|
|
|
|
|
/* Available in 2.0 */
|
2009-07-28 00:34:33 +00:00
|
|
|
ctx->drv.pf_glBlendEquationSeparate =
|
2009-05-10 23:40:41 +00:00
|
|
|
(COGL_PFNGLBLENDEQUATIONSEPARATEPROC)
|
|
|
|
|
cogl_get_proc_address ("glBlendEquationSeparate");
|
|
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
/* Cache features */
|
|
|
|
|
ctx->feature_flags = flags;
|
|
|
|
|
ctx->features_cached = TRUE;
|
|
|
|
|
}
|
|
|
|
|
|