Commit d87f06a
glsl_restart: Stop segfaulting
Using git bisect, e497a08 introduces a
window where globalUBOProxy can be null after glsl_restart. Therefore,
also return early, if glboalUBOProxy is null. It will be instantiated
later.
Further, only initialize world shaders *AFTER* all shader storage has
been initialized.1 parent ef2ae9e commit d87f06a
2 files changed
+7
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2830 | 2830 | | |
2831 | 2831 | | |
2832 | 2832 | | |
2833 | | - | |
| 2833 | + | |
2834 | 2834 | | |
2835 | 2835 | | |
2836 | 2836 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
256 | 256 | | |
257 | 257 | | |
258 | 258 | | |
259 | | - | |
260 | | - | |
261 | | - | |
262 | | - | |
263 | | - | |
264 | 259 | | |
265 | 260 | | |
266 | 261 | | |
| |||
384 | 379 | | |
385 | 380 | | |
386 | 381 | | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
387 | 388 | | |
388 | 389 | | |
389 | 390 | | |
| |||
0 commit comments