1087848 - gfx/thebes/ContextStateTracker.cpp:8:29: fatal error: ProfilerMarkers.h: No such file or directory (non-SPS)

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Jan Beich]

On platforms lacking SPS profiler (Linux/PPC, BSDs, Solaris) the build is broken because of missing MOZ_ENABLE_PROFILER_SPS ifdefs.

gfx/thebes/ContextStateTracker.cpp:8:10: fatal error:
      'ProfilerMarkers.h' file not found
#include "ProfilerMarkers.h"
         ^
1 error generated.

Comment 1

[Benoit Girard (:BenWa)]

Attachment: patch

Comment 2

[Jan Beich]

Attachment: fix

https://treeherder.mozilla.org/ui/#/jobs?repo=try&revision=33d5bd60cbe0

Comment 3

[Benoit Girard (:BenWa)]

Wont you get an error on missing GPUMarkerPayload?

Comment 4

[Jan Beich]

Comment on attachment 8510037 [details] [diff] [review]
fix

Oh, I've lost the race by 5 seconds. ;)

Comment 5

[Benoit Girard (:BenWa)]

Can you confirm this patch is sufficient and that I haven't missed anything else before we land this?

Comment 6

[Jan Beich]

(In reply to Benoit Girard (:BenWa) from comment #3)
> Wont you get an error on missing GPUMarkerPayload?

No, the call is erased by C preprocessor. See PROFILER_MARKER_PAYLOAD() stub in GeckoProfiler.h.

(In reply to Benoit Girard (:BenWa) from comment #5)
> Can you confirm this patch is sufficient and that I haven't missed anything
> else before we land this?

My build succeeds with either patch. Try is green as well.

Comment 7

[Benoit Girard (:BenWa)]

Cool, sorry for the hassle!

https://hg.mozilla.org/integration/mozilla-inbound/rev/bda942a971c2

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/bda942a971c2