diff options
| author | Neil Roberts <neil@linux.intel.com> | 2012-03-31 21:30:26 +0100 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2012-04-03 16:36:54 +0100 |
| commit | be9d5b34c66ac81656e37779eb64891a062f90af (patch) | |
| tree | 76662c80a44509693cbd70eee197cd0c5d1ed0d5 | |
| parent | a000189c6844b487786d3599f389fd662feaec3b (diff) | |
| download | cogl-be9d5b34c66ac81656e37779eb64891a062f90af.tar.gz | |
pipeline: Use cogl_depth_state_init to init default depth state
The previous code to initialise the depth state on the default
pipeline wasn't initialising the magic number. If you later tried to
retrieve the depth state using cogl_pipeline_get_depth_state you would
end up with an invalid depth state struct and you would just get
warnings if you tried to use it for anything. This patch just replaces
the initialisation with a call to cogl_depth_state_init because it
uses the same values anyway.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
| -rw-r--r-- | cogl/cogl-depth-state.c | 1 | ||||
| -rw-r--r-- | cogl/cogl-pipeline.c | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/cogl/cogl-depth-state.c b/cogl/cogl-depth-state.c index fb2fafe1..2e5c86fa 100644 --- a/cogl/cogl-depth-state.c +++ b/cogl/cogl-depth-state.c @@ -36,6 +36,7 @@ cogl_depth_state_init (CoglDepthState *state) { state->magic = COGL_DEPTH_STATE_MAGIC; + /* The same as the GL defaults */ state->test_enabled = FALSE; state->write_enabled = TRUE; state->test_function = COGL_DEPTH_TEST_FUNCTION_LESS; diff --git a/cogl/cogl-pipeline.c b/cogl/cogl-pipeline.c index 73934047..7ee1b297 100644 --- a/cogl/cogl-pipeline.c +++ b/cogl/cogl-pipeline.c @@ -106,7 +106,6 @@ _cogl_pipeline_init_default_pipeline (void) CoglPipelineLightingState *lighting_state = &big_state->lighting_state; CoglPipelineAlphaFuncState *alpha_state = &big_state->alpha_state; CoglPipelineBlendState *blend_state = &big_state->blend_state; - CoglDepthState *depth_state = &big_state->depth_state; CoglPipelineLogicOpsState *logic_ops_state = &big_state->logic_ops_state; CoglPipelineCullFaceState *cull_face_state = &big_state->cull_face_state; CoglPipelineUniformsState *uniforms_state = &big_state->uniforms_state; @@ -210,12 +209,7 @@ _cogl_pipeline_init_default_pipeline (void) big_state->user_program = COGL_INVALID_HANDLE; - /* The same as the GL defaults */ - depth_state->test_enabled = FALSE; - depth_state->test_function = COGL_DEPTH_TEST_FUNCTION_LESS; - depth_state->write_enabled = TRUE; - depth_state->range_near = 0; - depth_state->range_far = 1; + cogl_depth_state_init (&big_state->depth_state); big_state->point_size = 1.0f; |