mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 04:22:05 +00:00
pipeline: don't use near/far symbols
According to 9cc9033347
the windows headers #define near as nothing,
and presumable the same is true for 'far' too. Apparently this define is
to improve compatibility with code written for Windows 3.1, so it's good
that people will be able to incorporate such code into their Clutter
applications.
This commit is contained in:
parent
acd3d61568
commit
ea66156c83
@ -5902,11 +5902,11 @@ _cogl_pipeline_hash_depth_state (CoglPipeline *authority,
|
||||
if (depth_state->depth_writing_enabled)
|
||||
{
|
||||
guint8 enabled = depth_state->depth_writing_enabled;
|
||||
float near = depth_state->depth_range_near;
|
||||
float far = depth_state->depth_range_far;
|
||||
float near_val = depth_state->depth_range_near;
|
||||
float far_val = depth_state->depth_range_far;
|
||||
hash = _cogl_util_one_at_a_time_hash (hash, &enabled, sizeof (enabled));
|
||||
hash = _cogl_util_one_at_a_time_hash (hash, &near, sizeof (near));
|
||||
hash = _cogl_util_one_at_a_time_hash (hash, &far, sizeof (far));
|
||||
hash = _cogl_util_one_at_a_time_hash (hash, &near_val, sizeof (near_val));
|
||||
hash = _cogl_util_one_at_a_time_hash (hash, &far_val, sizeof (far_val));
|
||||
}
|
||||
|
||||
state->hash = hash;
|
||||
|
Loading…
Reference in New Issue
Block a user