Skip to content

Commit 1075b2c

Browse files
committed
Fix pandagl dependency
1 parent 7ec24a9 commit 1075b2c

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

cmake/Findpanda3d.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ function(_panda3d_get_dependencies component_name ret)
6262
set(panda3d_DEPENDENCIES_pandadx9 p3windisplay)
6363
set(panda3d_DEPENDENCIES_p3framework panda)
6464
set(panda3d_DEPENDENCIES_pandaegg panda)
65-
set(panda3d_DEPENDENCIES_pandagl pandafx p3windisplay)
65+
if(WIN32)
66+
set(panda3d_DEPENDENCIES_pandagl p3windisplay)
67+
else()
68+
set(panda3d_DEPENDENCIES_pandagl panda)
69+
endif()
6670
set(panda3d_DEPENDENCIES_pandagles panda)
6771
set(panda3d_DEPENDENCIES_pandagles2 panda)
6872
set(panda3d_DEPENDENCIES_pandaode panda)

docs/framework/panda3d_pipeline.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,16 @@ PandaFramework::task_igloop()
113113
}
114114
}
115115
```
116+
117+
#### GraphicsOutput
118+
```cpp
119+
GraphicsOutput::begin_frame()
120+
{
121+
... // GL make current
122+
123+
GraphicsStateGuardian::begin_frame()
124+
{
125+
PreparedGraphicsObjects::begin_frame();
126+
}
127+
}
128+
```

0 commit comments

Comments
 (0)