diff options
| author | Ray Strode <rstrode@redhat.com> | 2016-01-12 17:35:06 -0500 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2016-01-12 17:35:06 -0500 |
| commit | f19a275b44d84982828dfac64033e487130c2760 (patch) | |
| tree | 0ba39a02dfe1de74e5683b18d1b7578607749bb5 /cogl/cogl-pipeline-state.c | |
| parent | 3e72da3eb1260166a3d1709f6dd71db8b3a97625 (diff) | |
| download | cogl-wip/rstrode/prepare-for-mutter-merge.tar.gz | |
drop support for GLESwip/rstrode/prepare-for-mutter-merge
Diffstat (limited to 'cogl/cogl-pipeline-state.c')
| -rw-r--r-- | cogl/cogl-pipeline-state.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/cogl/cogl-pipeline-state.c b/cogl/cogl-pipeline-state.c index 04c76f8a..84aa084b 100644 --- a/cogl/cogl-pipeline-state.c +++ b/cogl/cogl-pipeline-state.c @@ -909,7 +909,7 @@ arg_to_gl_blend_factor (CoglBlendStringArgument *arg) return GL_DST_ALPHA; } } -#if defined(HAVE_COGL_GLES2) || defined(HAVE_COGL_GL) +#if defined(HAVE_COGL_GL) else if (arg->factor.source.info->type == COGL_BLEND_STRING_COLOR_SOURCE_CONSTANT) { @@ -1048,7 +1048,7 @@ cogl_pipeline_set_blend_constant (CoglPipeline *pipeline, if (!_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_BLEND_CONSTANT)) return; -#if defined(HAVE_COGL_GLES2) || defined(HAVE_COGL_GL) +#if defined(HAVE_COGL_GL) { CoglPipelineState state = COGL_PIPELINE_STATE_BLEND; CoglPipeline *authority; @@ -1177,17 +1177,6 @@ cogl_pipeline_set_depth_state (CoglPipeline *pipeline, orig_state->range_far == depth_state->range_far) return TRUE; - if (ctx->driver == COGL_DRIVER_GLES1 && - (depth_state->range_near != 0 || - depth_state->range_far != 1)) - { - _cogl_set_error (error, - COGL_SYSTEM_ERROR, - COGL_SYSTEM_ERROR_UNSUPPORTED, - "glDepthRange not available on GLES 1"); - return FALSE; - } - /* - Flush journal primitives referencing the current state. * - Make sure the pipeline has no dependants so it may be modified. * - If the pipeline isn't currently an authority for the state being |