Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for tbb > 2020 #2

Open
wants to merge 1 commit into
base: release
Choose a base branch
from
Open

Fix for tbb > 2020 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cmd/hd_cmd/hd_render/OutputFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#pragma once

#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/imaging/hd/renderBuffer.h>

#include <string>
Expand Down
1 change: 0 additions & 1 deletion cmd/hd_cmd/hd_render/RenderSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#pragma once

#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/imaging/hd/renderDelegate.h>

#include <string>
Expand Down
1 change: 0 additions & 1 deletion cmd/hd_cmd/hd_render/SceneDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#pragma once

#include "FreeCamera.h"
#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/imaging/hd/sceneDelegate.h>
namespace hd_render {

Expand Down
1 change: 0 additions & 1 deletion cmd/hd_cmd/hd_usd2rdl/RenderSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#pragma once

#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/imaging/hd/renderDelegate.h>

#include <string>
Expand Down
1 change: 0 additions & 1 deletion cmd/hd_cmd/hd_usd2rdl/SceneDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#pragma once

#include "FreeCamera.h"
#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/imaging/hd/sceneDelegate.h>
namespace hd_usd2rdl {

Expand Down
1 change: 0 additions & 1 deletion src/Camera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/imaging/hd/camera.h>
namespace scene_rdl2 {namespace rdl2 { class Camera; } }

Expand Down
1 change: 0 additions & 1 deletion src/CoordSys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/imaging/hd/coordSys.h>

namespace scene_rdl2 {namespace rdl2 { class SceneObject; } }
Expand Down
1 change: 0 additions & 1 deletion src/Instancer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/imaging/hd/instancer.h>
#include <pxr/base/gf/matrix4f.h>
#include <pxr/base/tf/hashmap.h>
Expand Down
1 change: 0 additions & 1 deletion src/Light.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/imaging/hd/light.h>

#include <scene_rdl2/scene/rdl2/Types.h>
Expand Down
1 change: 0 additions & 1 deletion src/LightFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/imaging/hd/sprim.h>
#include <pxr/imaging/hd/material.h>
#include <scene_rdl2/scene/rdl2/LightFilter.h>
Expand Down
1 change: 0 additions & 1 deletion src/Material.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/imaging/hd/material.h>
#include <pxr/imaging/hd/rprim.h>

Expand Down
1 change: 0 additions & 1 deletion src/RenderBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/imaging/hd/renderBuffer.h>
#include <pxr/imaging/hd/aov.h>
#include <pxr/base/gf/vec4f.h>
Expand Down
1 change: 0 additions & 1 deletion src/ValueConverter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include <tbb/tbb_machine.h> // fix for icc-19/tbb bug
#include <pxr/base/gf/vec2f.h>
#include <pxr/base/gf/vec2d.h>
#include <pxr/base/gf/vec3f.h>
Expand Down
2 changes: 0 additions & 2 deletions src/adapters/GeometryLightAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#pragma once

#include <tbb/tbb_machine.h> // This must be included before any pxr headers

#include "pxr/pxr.h"

#include "pxr/usdImaging/usdImaging/lightAdapter.h"
Expand Down
2 changes: 0 additions & 2 deletions src/adapters/MoonrayLightFilterAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#pragma once

#include <tbb/tbb_machine.h> // This must be included before any pxr headers

#include "pxr/pxr.h"

#include "pxr/usdImaging/usdImaging/lightFilterAdapter.h"
Expand Down
2 changes: 0 additions & 2 deletions src/adapters/ProceduralAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#pragma once

#include <tbb/tbb_machine.h> // This must be included before any pxr headers

#include <pxr/pxr.h>
#include "pxr/usdImaging/usdImaging/api.h"
#include "pxr/usdImaging/usdImaging/primAdapter.h"
Expand Down