isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

pipeline: Use WrapModeInternal in the Layer struct

Browse Source 
Since we're using CoglPipelineWrapModeInternal in the internal API
anyway, and the compiler complains loudly when comparing two enumeration
types without casting, the PipelineLayer struct should store the
wrap modes using the internal enumeration.
This commit is contained in:
Emmanuele Bassi 2010-11-23 13:05:47 +00:00
parent 8e6fac38fa
commit 01c6ccfa13
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
clutter/cogl/cogl/cogl-pipeline-private.h
View File

@ -173,6 +173,25 @@ _cogl_pipeline_node_foreach_child (CoglPipelineNode *node,
CoglPipelineNodeChildCallback callback, CoglPipelineNodeChildCallback callback,
void *user_data); void *user_data);
/* This isn't defined in the GLES headers */
#ifndef GL_CLAMP_TO_BORDER
#define GL_CLAMP_TO_BORDER 0x812d
#endif
/* GL_ALWAYS is just used here as a value that is known not to clash
* with any valid GL wrap modes.
*
* XXX: keep the values in sync with the CoglPipelineWrapMode enum
* so no conversion is actually needed.
*/
typedef enum _CoglPipelineWrapModeInternal
{
COGL_PIPELINE_WRAP_MODE_INTERNAL_REPEAT = GL_REPEAT,
COGL_PIPELINE_WRAP_MODE_INTERNAL_CLAMP_TO_EDGE = GL_CLAMP_TO_EDGE,
COGL_PIPELINE_WRAP_MODE_INTERNAL_CLAMP_TO_BORDER = GL_CLAMP_TO_BORDER,
COGL_PIPELINE_WRAP_MODE_INTERNAL_AUTOMATIC = GL_ALWAYS
} CoglPipelineWrapModeInternal;
struct _CoglPipelineLayer struct _CoglPipelineLayer
{ {
/* XXX: Please think twice about adding members that *have* be /* XXX: Please think twice about adding members that *have* be
@ -234,9 +253,9 @@ struct _CoglPipelineLayer
CoglPipelineFilter mag_filter; CoglPipelineFilter mag_filter;
CoglPipelineFilter min_filter; CoglPipelineFilter min_filter;
CoglPipelineWrapMode wrap_mode_s; CoglPipelineWrapModeInternal wrap_mode_s;
CoglPipelineWrapMode wrap_mode_t; CoglPipelineWrapModeInternal wrap_mode_t;
CoglPipelineWrapMode wrap_mode_p; CoglPipelineWrapModeInternal wrap_mode_p;
/* Infrequent differences aren't currently tracked in /* Infrequent differences aren't currently tracked in
* a separate, dynamically allocated structure as they are * a separate, dynamically allocated structure as they are
@ -645,25 +664,6 @@ typedef enum _CoglPipelineFlushFlag
COGL_PIPELINE_FLUSH_SKIP_GL_COLOR = 1L<<3 COGL_PIPELINE_FLUSH_SKIP_GL_COLOR = 1L<<3
} CoglPipelineFlushFlag; } CoglPipelineFlushFlag;
/* This isn't defined in the GLES headers */
#ifndef GL_CLAMP_TO_BORDER
#define GL_CLAMP_TO_BORDER 0x812d
#endif
/* GL_ALWAYS is just used here as a value that is known not to clash
* with any valid GL wrap modes.
*
* XXX: keep the values in sync with the CoglPipelineWrapMode enum
* so no conversion is actually needed.
*/
typedef enum _CoglPipelineWrapModeInternal
{
COGL_PIPELINE_WRAP_MODE_INTERNAL_REPEAT = GL_REPEAT,
COGL_PIPELINE_WRAP_MODE_INTERNAL_CLAMP_TO_EDGE = GL_CLAMP_TO_EDGE,
COGL_PIPELINE_WRAP_MODE_INTERNAL_CLAMP_TO_BORDER = GL_CLAMP_TO_BORDER,
COGL_PIPELINE_WRAP_MODE_INTERNAL_AUTOMATIC = GL_ALWAYS
} CoglPipelineWrapModeInternal;
/* /*
* CoglPipelineFlushOptions: * CoglPipelineFlushOptions:
* *