3b3cfe1824
When an item is added to the journal the current pipeline immediately gets the legacy state applied to it and the modified pipeline is logged instead of the original. However the actual drawing from the journal is done using the vertex attribute API which was also applying the legacy state. This meant that the legacy state used would be a combination of the state set when the journal entry was added as well as the state set when the journal is flushed. To fix this there is now an extra CoglDrawFlag to avoid applying the legacy state when setting up the GL state for the vertex attributes. The journal uses this flag when flushing.
104 lines
3.3 KiB
C
104 lines
3.3 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>
|
|
*/
|
|
|
|
#ifndef __COGL_VERTEX_ATTRIBUTE_PRIVATE_H
|
|
#define __COGL_VERTEX_ATTRIBUTE_PRIVATE_H
|
|
|
|
#include "cogl-object-private.h"
|
|
#include "cogl-vertex-attribute.h"
|
|
|
|
typedef enum
|
|
{
|
|
COGL_VERTEX_ATTRIBUTE_NAME_ID_POSITION_ARRAY,
|
|
COGL_VERTEX_ATTRIBUTE_NAME_ID_COLOR_ARRAY,
|
|
COGL_VERTEX_ATTRIBUTE_NAME_ID_TEXTURE_COORD_ARRAY,
|
|
COGL_VERTEX_ATTRIBUTE_NAME_ID_NORMAL_ARRAY,
|
|
COGL_VERTEX_ATTRIBUTE_NAME_ID_CUSTOM_ARRAY
|
|
} CoglVertexAttributeNameID;
|
|
|
|
struct _CoglVertexAttribute
|
|
{
|
|
CoglObject _parent;
|
|
|
|
CoglVertexArray *array;
|
|
char *name;
|
|
CoglVertexAttributeNameID name_id;
|
|
gsize stride;
|
|
gsize offset;
|
|
int n_components;
|
|
CoglVertexAttributeType type;
|
|
gboolean normalized;
|
|
unsigned int texture_unit;
|
|
|
|
int immutable_ref;
|
|
};
|
|
|
|
typedef enum
|
|
{
|
|
COGL_DRAW_SKIP_JOURNAL_FLUSH = 1 << 0,
|
|
COGL_DRAW_SKIP_PIPELINE_VALIDATION = 1 << 1,
|
|
COGL_DRAW_SKIP_FRAMEBUFFER_FLUSH = 1 << 2,
|
|
/* When flushing from the journal the logged pipeline will already
|
|
contain the legacy state overrides so we don't want to apply them
|
|
again when we flush the pipeline for drawing */
|
|
COGL_DRAW_SKIP_LEGACY_STATE = 1 << 3,
|
|
/* By default the vertex attribute drawing code will assume that if
|
|
there is a color attribute array enabled then we can't determine
|
|
if the colors will be opaque so we need to enabling
|
|
blending. However when drawing from the journal we know what the
|
|
contents of the color array is so we can override this by passing
|
|
this flag. */
|
|
COGL_DRAW_COLOR_ATTRIBUTE_IS_OPAQUE = 1 << 4
|
|
} CoglDrawFlags;
|
|
|
|
CoglVertexAttribute *
|
|
_cogl_vertex_attribute_immutable_ref (CoglVertexAttribute *vertex_attribute);
|
|
|
|
void
|
|
_cogl_vertex_attribute_immutable_unref (CoglVertexAttribute *vertex_attribute);
|
|
|
|
void
|
|
_cogl_draw_vertex_attributes_array (CoglVerticesMode mode,
|
|
int first_vertex,
|
|
int n_vertices,
|
|
CoglVertexAttribute **attributes,
|
|
CoglDrawFlags flags);
|
|
|
|
void
|
|
_cogl_draw_indexed_vertex_attributes_array (CoglVerticesMode mode,
|
|
int first_vertex,
|
|
int n_vertices,
|
|
CoglIndices *indices,
|
|
CoglVertexAttribute **attributes,
|
|
CoglDrawFlags flags);
|
|
|
|
void
|
|
_cogl_vertex_attribute_disable_cached_arrays (void);
|
|
|
|
#endif /* __COGL_VERTEX_ATTRIBUTE_PRIVATE_H */
|
|
|