diff options
author | Neil Roberts <neil@linux.intel.com> | 2010-11-11 16:18:25 +0000 |
---|---|---|
committer | Neil Roberts <neil@linux.intel.com> | 2010-11-11 16:25:13 +0000 |
commit | 22c61c53157840011936b1f5cee3756b19504f45 (patch) | |
tree | c14e0e69f11abaa1a34f5c580a0312dc613d740b /cogl/cogl-journal-private.h | |
parent | 9302d146d16c843603fe06cac142f21f7569893b (diff) | |
download | cogl-22c61c53157840011936b1f5cee3756b19504f45.tar.gz |
cogl-pipeline: Use layer overrides as CoglHandles instead of GLuint
Since d5634e37 the sliced texture backend now works in terms of
CoglTexture2Ds so there's no need to have special casing for
overriding the texture of a pipeline layer with a GL handle. Instead
we can just use cogl_pipeline_set_layer_texture with the
CoglHandle. The special _cogl_pipeline_set_layer_gl_texture_slice
function has now been removed and parts of the code for comparing
materials have been simplified.
Diffstat (limited to 'cogl/cogl-journal-private.h')
-rw-r--r-- | cogl/cogl-journal-private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cogl/cogl-journal-private.h b/cogl/cogl-journal-private.h index 977866eb..79d00146 100644 --- a/cogl/cogl-journal-private.h +++ b/cogl/cogl-journal-private.h @@ -46,7 +46,7 @@ _cogl_journal_log_quad (const float *position, CoglPipeline *pipeline, int n_layers, guint32 fallback_layers, - GLuint layer0_override_texture, + CoglHandle layer0_override_texture, const CoglPipelineWrapModeOverrides * wrap_mode_overrides, const float *tex_coords, |