mirror of
https://github.com/brl/mutter.git
synced 2024-12-28 22:02:14 +00:00
eb109e6cc0
Commit 3c1e83c7 changed uses of arrays of CoglAttributes to take a
length instead of being NULL terminated. In cogl_primitive_new it was
still adding the NULL terminator to the array it passes to
cogl_primitive_new_with_attributes but then it was also including this
terminator in the count so it would just segfault when it tries to ref
the NULL pointer. Also _cogl_primitive_new_with_attributes_unref was
still trying to detect the NULL terminator so it would also crash.
559 lines
18 KiB
C
559 lines
18 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2010 Intel Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
*
|
|
*
|
|
* Authors:
|
|
* Robert Bragg <robert@linux.intel.com>
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "cogl-object-private.h"
|
|
#include "cogl-primitive.h"
|
|
#include "cogl-primitive-private.h"
|
|
#include "cogl-attribute-private.h"
|
|
|
|
#include <stdarg.h>
|
|
|
|
static void _cogl_primitive_free (CoglPrimitive *primitive);
|
|
|
|
COGL_OBJECT_DEFINE (Primitive, primitive);
|
|
|
|
CoglPrimitive *
|
|
cogl_primitive_new_with_attributes (CoglVerticesMode mode,
|
|
int n_vertices,
|
|
CoglAttribute **attributes,
|
|
int n_attributes)
|
|
{
|
|
CoglPrimitive *primitive = g_slice_new (CoglPrimitive);
|
|
int i;
|
|
|
|
primitive->mode = mode;
|
|
primitive->first_vertex = 0;
|
|
primitive->n_vertices = n_vertices;
|
|
primitive->indices = NULL;
|
|
primitive->attributes =
|
|
g_array_new (TRUE, FALSE, sizeof (CoglAttribute *));
|
|
primitive->immutable_ref = 0;
|
|
|
|
for (i = 0; i < n_attributes; i++)
|
|
{
|
|
CoglAttribute *attribute = attributes[i];
|
|
cogl_object_ref (attribute);
|
|
|
|
g_return_val_if_fail (cogl_is_attribute (attribute), NULL);
|
|
|
|
g_array_append_val (primitive->attributes, attribute);
|
|
}
|
|
|
|
return _cogl_primitive_object_new (primitive);
|
|
}
|
|
|
|
/* This is just an internal convenience wrapper around
|
|
new_with_attributes that also unrefs the attributes. It is just
|
|
used for the builtin struct constructors */
|
|
static CoglPrimitive *
|
|
_cogl_primitive_new_with_attributes_unref (CoglVerticesMode mode,
|
|
int n_vertices,
|
|
CoglAttribute **attributes,
|
|
int n_attributes)
|
|
{
|
|
CoglPrimitive *primitive;
|
|
int i;
|
|
|
|
primitive = cogl_primitive_new_with_attributes (mode,
|
|
n_vertices,
|
|
attributes,
|
|
n_attributes);
|
|
|
|
for (i = 0; i < n_attributes; i++)
|
|
cogl_object_unref (attributes[i]);
|
|
|
|
return primitive;
|
|
}
|
|
|
|
CoglPrimitive *
|
|
cogl_primitive_new (CoglVerticesMode mode,
|
|
int n_vertices,
|
|
...)
|
|
{
|
|
va_list ap;
|
|
int n_attributes;
|
|
CoglAttribute **attributes;
|
|
int i;
|
|
CoglAttribute *attribute;
|
|
|
|
va_start (ap, n_vertices);
|
|
for (n_attributes = 0; va_arg (ap, CoglAttribute *); n_attributes++)
|
|
;
|
|
va_end (ap);
|
|
|
|
attributes = g_alloca (sizeof (CoglAttribute *) * n_attributes);
|
|
|
|
va_start (ap, n_vertices);
|
|
for (i = 0; (attribute = va_arg (ap, CoglAttribute *)); i++)
|
|
attributes[i] = attribute;
|
|
va_end (ap);
|
|
|
|
return cogl_primitive_new_with_attributes (mode, n_vertices,
|
|
attributes,
|
|
i);
|
|
}
|
|
|
|
CoglPrimitive *
|
|
cogl_primitive_new_p2 (CoglVerticesMode mode,
|
|
int n_vertices,
|
|
const CoglVertexP2 *data)
|
|
{
|
|
CoglAttributeBuffer *attribute_buffer =
|
|
cogl_attribute_buffer_new (n_vertices * sizeof (CoglVertexP2), data);
|
|
CoglAttribute *attributes[1];
|
|
|
|
attributes[0] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_position_in",
|
|
sizeof (CoglVertexP2),
|
|
offsetof (CoglVertexP2, x),
|
|
2,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
|
|
cogl_object_unref (attribute_buffer);
|
|
|
|
return _cogl_primitive_new_with_attributes_unref (mode, n_vertices,
|
|
attributes,
|
|
1);
|
|
}
|
|
|
|
CoglPrimitive *
|
|
cogl_primitive_new_p3 (CoglVerticesMode mode,
|
|
int n_vertices,
|
|
const CoglVertexP3 *data)
|
|
{
|
|
CoglAttributeBuffer *attribute_buffer =
|
|
cogl_attribute_buffer_new (n_vertices * sizeof (CoglVertexP3), data);
|
|
CoglAttribute *attributes[1];
|
|
|
|
attributes[0] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_position_in",
|
|
sizeof (CoglVertexP3),
|
|
offsetof (CoglVertexP3, x),
|
|
3,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
|
|
cogl_object_unref (attribute_buffer);
|
|
|
|
return _cogl_primitive_new_with_attributes_unref (mode, n_vertices,
|
|
attributes,
|
|
1);
|
|
}
|
|
|
|
CoglPrimitive *
|
|
cogl_primitive_new_p2c4 (CoglVerticesMode mode,
|
|
int n_vertices,
|
|
const CoglVertexP2C4 *data)
|
|
{
|
|
CoglAttributeBuffer *attribute_buffer =
|
|
cogl_attribute_buffer_new (n_vertices * sizeof (CoglVertexP2C4), data);
|
|
CoglAttribute *attributes[2];
|
|
|
|
attributes[0] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_position_in",
|
|
sizeof (CoglVertexP2C4),
|
|
offsetof (CoglVertexP2C4, x),
|
|
2,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
attributes[1] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_color_in",
|
|
sizeof (CoglVertexP2C4),
|
|
offsetof (CoglVertexP2C4, r),
|
|
4,
|
|
COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE);
|
|
|
|
cogl_object_unref (attribute_buffer);
|
|
|
|
return _cogl_primitive_new_with_attributes_unref (mode, n_vertices,
|
|
attributes,
|
|
2);
|
|
}
|
|
|
|
CoglPrimitive *
|
|
cogl_primitive_new_p3c4 (CoglVerticesMode mode,
|
|
int n_vertices,
|
|
const CoglVertexP3C4 *data)
|
|
{
|
|
CoglAttributeBuffer *attribute_buffer =
|
|
cogl_attribute_buffer_new (n_vertices * sizeof (CoglVertexP3C4), data);
|
|
CoglAttribute *attributes[2];
|
|
|
|
attributes[0] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_position_in",
|
|
sizeof (CoglVertexP3C4),
|
|
offsetof (CoglVertexP3C4, x),
|
|
3,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
attributes[1] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_color_in",
|
|
sizeof (CoglVertexP3C4),
|
|
offsetof (CoglVertexP3C4, r),
|
|
4,
|
|
COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE);
|
|
|
|
cogl_object_unref (attribute_buffer);
|
|
|
|
return _cogl_primitive_new_with_attributes_unref (mode, n_vertices,
|
|
attributes,
|
|
2);
|
|
}
|
|
|
|
CoglPrimitive *
|
|
cogl_primitive_new_p2t2 (CoglVerticesMode mode,
|
|
int n_vertices,
|
|
const CoglVertexP2T2 *data)
|
|
{
|
|
CoglAttributeBuffer *attribute_buffer =
|
|
cogl_attribute_buffer_new (n_vertices * sizeof (CoglVertexP2T2), data);
|
|
CoglAttribute *attributes[2];
|
|
|
|
attributes[0] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_position_in",
|
|
sizeof (CoglVertexP2T2),
|
|
offsetof (CoglVertexP2T2, x),
|
|
2,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
attributes[1] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_tex_coord0_in",
|
|
sizeof (CoglVertexP2T2),
|
|
offsetof (CoglVertexP2T2, s),
|
|
2,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
|
|
cogl_object_unref (attribute_buffer);
|
|
|
|
return _cogl_primitive_new_with_attributes_unref (mode, n_vertices,
|
|
attributes,
|
|
2);
|
|
}
|
|
|
|
CoglPrimitive *
|
|
cogl_primitive_new_p3t2 (CoglVerticesMode mode,
|
|
int n_vertices,
|
|
const CoglVertexP3T2 *data)
|
|
{
|
|
CoglAttributeBuffer *attribute_buffer =
|
|
cogl_attribute_buffer_new (n_vertices * sizeof (CoglVertexP3T2), data);
|
|
CoglAttribute *attributes[2];
|
|
|
|
attributes[0] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_position_in",
|
|
sizeof (CoglVertexP3T2),
|
|
offsetof (CoglVertexP3T2, x),
|
|
3,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
attributes[1] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_tex_coord0_in",
|
|
sizeof (CoglVertexP3T2),
|
|
offsetof (CoglVertexP3T2, s),
|
|
2,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
|
|
cogl_object_unref (attribute_buffer);
|
|
|
|
return _cogl_primitive_new_with_attributes_unref (mode, n_vertices,
|
|
attributes,
|
|
2);
|
|
}
|
|
|
|
CoglPrimitive *
|
|
cogl_primitive_new_p2t2c4 (CoglVerticesMode mode,
|
|
int n_vertices,
|
|
const CoglVertexP2T2C4 *data)
|
|
{
|
|
CoglAttributeBuffer *attribute_buffer =
|
|
cogl_attribute_buffer_new (n_vertices * sizeof (CoglVertexP2T2C4), data);
|
|
CoglAttribute *attributes[3];
|
|
|
|
attributes[0] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_position_in",
|
|
sizeof (CoglVertexP2T2C4),
|
|
offsetof (CoglVertexP2T2C4, x),
|
|
2,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
attributes[1] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_tex_coord0_in",
|
|
sizeof (CoglVertexP2T2C4),
|
|
offsetof (CoglVertexP2T2C4, s),
|
|
2,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
attributes[2] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_color_in",
|
|
sizeof (CoglVertexP2T2C4),
|
|
offsetof (CoglVertexP2T2C4, r),
|
|
4,
|
|
COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE);
|
|
|
|
cogl_object_unref (attribute_buffer);
|
|
|
|
return _cogl_primitive_new_with_attributes_unref (mode, n_vertices,
|
|
attributes,
|
|
3);
|
|
}
|
|
|
|
CoglPrimitive *
|
|
cogl_primitive_new_p3t2c4 (CoglVerticesMode mode,
|
|
int n_vertices,
|
|
const CoglVertexP3T2C4 *data)
|
|
{
|
|
CoglAttributeBuffer *attribute_buffer =
|
|
cogl_attribute_buffer_new (n_vertices * sizeof (CoglVertexP3T2C4), data);
|
|
CoglAttribute *attributes[3];
|
|
|
|
attributes[0] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_position_in",
|
|
sizeof (CoglVertexP3T2C4),
|
|
offsetof (CoglVertexP3T2C4, x),
|
|
3,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
attributes[1] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_tex_coord0_in",
|
|
sizeof (CoglVertexP3T2C4),
|
|
offsetof (CoglVertexP3T2C4, s),
|
|
2,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
attributes[2] = cogl_attribute_new (attribute_buffer,
|
|
"cogl_color_in",
|
|
sizeof (CoglVertexP3T2C4),
|
|
offsetof (CoglVertexP3T2C4, r),
|
|
4,
|
|
COGL_ATTRIBUTE_TYPE_UNSIGNED_BYTE);
|
|
|
|
cogl_object_unref (attribute_buffer);
|
|
|
|
return _cogl_primitive_new_with_attributes_unref (mode, n_vertices,
|
|
attributes,
|
|
3);
|
|
}
|
|
|
|
static void
|
|
free_attributes_list (CoglPrimitive *primitive)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < primitive->attributes->len; i++)
|
|
{
|
|
CoglAttribute *attribute =
|
|
g_array_index (primitive->attributes, CoglAttribute *, i);
|
|
cogl_object_unref (attribute);
|
|
}
|
|
g_array_set_size (primitive->attributes, 0);
|
|
}
|
|
|
|
static void
|
|
_cogl_primitive_free (CoglPrimitive *primitive)
|
|
{
|
|
free_attributes_list (primitive);
|
|
|
|
g_array_free (primitive->attributes, TRUE);
|
|
|
|
g_slice_free (CoglPrimitive, primitive);
|
|
}
|
|
|
|
static void
|
|
warn_about_midscene_changes (void)
|
|
{
|
|
static gboolean seen = FALSE;
|
|
if (!seen)
|
|
{
|
|
g_warning ("Mid-scene modification of buffers has "
|
|
"undefined results\n");
|
|
seen = TRUE;
|
|
}
|
|
}
|
|
|
|
void
|
|
cogl_primitive_set_attributes (CoglPrimitive *primitive,
|
|
CoglAttribute **attributes,
|
|
int n_attributes)
|
|
{
|
|
int i;
|
|
|
|
g_return_if_fail (cogl_is_primitive (primitive));
|
|
|
|
if (G_UNLIKELY (primitive->immutable_ref))
|
|
{
|
|
warn_about_midscene_changes ();
|
|
return;
|
|
}
|
|
|
|
free_attributes_list (primitive);
|
|
|
|
g_array_set_size (primitive->attributes, 0);
|
|
for (i = 0; i < n_attributes; i++)
|
|
{
|
|
cogl_object_ref (attributes[i]);
|
|
g_return_if_fail (cogl_is_attribute (attributes[i]));
|
|
g_array_append_val (primitive->attributes, attributes[i]);
|
|
}
|
|
}
|
|
|
|
int
|
|
cogl_primitive_get_first_vertex (CoglPrimitive *primitive)
|
|
{
|
|
g_return_val_if_fail (cogl_is_primitive (primitive), 0);
|
|
|
|
return primitive->first_vertex;
|
|
}
|
|
|
|
void
|
|
cogl_primitive_set_first_vertex (CoglPrimitive *primitive,
|
|
int first_vertex)
|
|
{
|
|
g_return_if_fail (cogl_is_primitive (primitive));
|
|
|
|
if (G_UNLIKELY (primitive->immutable_ref))
|
|
{
|
|
warn_about_midscene_changes ();
|
|
return;
|
|
}
|
|
|
|
primitive->first_vertex = first_vertex;
|
|
}
|
|
|
|
int
|
|
cogl_primitive_get_n_vertices (CoglPrimitive *primitive)
|
|
{
|
|
g_return_val_if_fail (cogl_is_primitive (primitive), 0);
|
|
|
|
return primitive->n_vertices;
|
|
}
|
|
|
|
void
|
|
cogl_primitive_set_n_vertices (CoglPrimitive *primitive,
|
|
int n_vertices)
|
|
{
|
|
g_return_if_fail (cogl_is_primitive (primitive));
|
|
|
|
primitive->n_vertices = n_vertices;
|
|
}
|
|
|
|
CoglVerticesMode
|
|
cogl_primitive_get_mode (CoglPrimitive *primitive)
|
|
{
|
|
g_return_val_if_fail (cogl_is_primitive (primitive), 0);
|
|
|
|
return primitive->mode;
|
|
}
|
|
|
|
void
|
|
cogl_primitive_set_mode (CoglPrimitive *primitive,
|
|
CoglVerticesMode mode)
|
|
{
|
|
g_return_if_fail (cogl_is_primitive (primitive));
|
|
|
|
if (G_UNLIKELY (primitive->immutable_ref))
|
|
{
|
|
warn_about_midscene_changes ();
|
|
return;
|
|
}
|
|
|
|
primitive->mode = mode;
|
|
}
|
|
|
|
void
|
|
cogl_primitive_set_indices (CoglPrimitive *primitive,
|
|
CoglIndices *indices)
|
|
{
|
|
g_return_if_fail (cogl_is_primitive (primitive));
|
|
|
|
if (G_UNLIKELY (primitive->immutable_ref))
|
|
{
|
|
warn_about_midscene_changes ();
|
|
return;
|
|
}
|
|
|
|
if (indices)
|
|
cogl_object_ref (indices);
|
|
if (primitive->indices)
|
|
cogl_object_unref (primitive->indices);
|
|
primitive->indices = indices;
|
|
}
|
|
|
|
CoglPrimitive *
|
|
_cogl_primitive_immutable_ref (CoglPrimitive *primitive)
|
|
{
|
|
int i;
|
|
|
|
g_return_val_if_fail (cogl_is_primitive (primitive), NULL);
|
|
|
|
primitive->immutable_ref++;
|
|
|
|
for (i = 0; i < primitive->attributes->len; i++)
|
|
{
|
|
CoglAttribute *attribute =
|
|
g_array_index (primitive->attributes, CoglAttribute *, i);
|
|
_cogl_attribute_immutable_ref (attribute);
|
|
}
|
|
|
|
return primitive;
|
|
}
|
|
|
|
void
|
|
_cogl_primitive_immutable_unref (CoglPrimitive *primitive)
|
|
{
|
|
int i;
|
|
|
|
g_return_if_fail (cogl_is_primitive (primitive));
|
|
g_return_if_fail (primitive->immutable_ref > 0);
|
|
|
|
primitive->immutable_ref--;
|
|
|
|
for (i = 0; i < primitive->attributes->len; i++)
|
|
{
|
|
CoglAttribute *attribute =
|
|
g_array_index (primitive->attributes, CoglAttribute *, i);
|
|
_cogl_attribute_immutable_unref (attribute);
|
|
}
|
|
}
|
|
|
|
/* XXX: cogl_draw_primitive() ? */
|
|
void
|
|
cogl_primitive_draw (CoglPrimitive *primitive)
|
|
{
|
|
CoglAttribute **attributes =
|
|
(CoglAttribute **)primitive->attributes->data;
|
|
|
|
if (primitive->indices)
|
|
cogl_draw_indexed_attributes (primitive->mode,
|
|
primitive->first_vertex,
|
|
primitive->n_vertices,
|
|
primitive->indices,
|
|
attributes,
|
|
primitive->attributes->len);
|
|
else
|
|
cogl_draw_attributes (primitive->mode,
|
|
primitive->first_vertex,
|
|
primitive->n_vertices,
|
|
attributes,
|
|
primitive->attributes->len);
|
|
}
|
|
|