summaryrefslogtreecommitdiff
path: root/cogl/cogl-texture.c
diff options
context:
space:
mode:
authorNeil Roberts <neil@linux.intel.com>2012-04-17 17:22:15 +0100
committerNeil Roberts <neil@linux.intel.com>2012-04-18 14:47:16 +0100
commit818b34935159e9b45dc1582a1e5f22d45eaf0130 (patch)
tree3946c33aadb265c72b5aeda6fccb43a9f936b35d /cogl/cogl-texture.c
parent5967dad2400d32ca6319cef6cb572e81bf2c15f0 (diff)
downloadcogl-818b34935159e9b45dc1582a1e5f22d45eaf0130.tar.gz
Remove legacy state
This removes the global legacy state for setting the depth state, backface culling and global program. The internal _cogl_push_source wrapper which takes a boolean to set whether legacy state should be applied has been removed. The normal cogl_push_source can always be used instead. The CoglDrawFlag for disable legacy state has been removed. Similarly the boolean argument to disable legacy state when drawing rectangles has also been removed. The legacy state testing in test-backface-culling had already been partially removed in f951d0995f8a8 but the masks were not correctly updated so it was not testing all of the combinations correctly. The legacy state testing from test-depth-state has been removed. Reviewed-by: Robert Bragg <robert@linux.intel.com>
Diffstat (limited to 'cogl/cogl-texture.c')
-rw-r--r--cogl/cogl-texture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cogl/cogl-texture.c b/cogl/cogl-texture.c
index d8056040..5d591d57 100644
--- a/cogl/cogl-texture.c
+++ b/cogl/cogl-texture.c
@@ -885,7 +885,7 @@ _cogl_texture_draw_and_read (CoglTexture *texture,
NULL);
}
- _cogl_push_source (ctx->texture_download_pipeline, FALSE);
+ cogl_push_source (ctx->texture_download_pipeline);
cogl_pipeline_set_layer_texture (ctx->texture_download_pipeline, 0, texture);