projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
transition at beginning/end, shape xtion fixes
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
virtualvnode.C
diff --git
a/cinelerra-5.1/cinelerra/virtualvnode.C
b/cinelerra-5.1/cinelerra/virtualvnode.C
index 141a2a0c7b461197bf8ed528740538a0986ce681..27c65bba868c84319be7c0711536103cd90c757c 100644
(file)
--- a/
cinelerra-5.1/cinelerra/virtualvnode.C
+++ b/
cinelerra-5.1/cinelerra/virtualvnode.C
@@
-353,17
+353,21
@@
void VirtualVNode::render_mask(VFrame *output_temp,
return;
}
return;
}
- if(use_opengl)
- {
+ if(use_opengl) {
+ if( !((VDeviceX11*)((VirtualVConsole*)vconsole)->get_vdriver())->can_mask(
+ start_position_project, keyframe_set) )
+ use_opengl = 0;
+
+ }
+ if(use_opengl) {
((VDeviceX11*)((VirtualVConsole*)vconsole)->get_vdriver())->do_mask(
((VDeviceX11*)((VirtualVConsole*)vconsole)->get_vdriver())->do_mask(
-
output_temp, start_position_projec
t,
-
keyframe_set,
keyframe, keyframe);
+
output_temp, start_position_project, keyframe_se
t,
+
keyframe, keyframe);
}
}
- else
- {
+ else {
// Revert to software
masker->do_mask(output_temp, start_position_project,
// Revert to software
masker->do_mask(output_temp, start_position_project,
- keyframe_set, keyframe, keyframe);
+
keyframe_set, keyframe, keyframe);
}
}
}
}
@@
-414,7
+418,7
@@
int VirtualVNode::render_projector(VFrame *input, VFrame *output,
// can do dissolves, although a blend equation is still required for 3 component
// colormodels since fractional translation requires blending.
// can do dissolves, although a blend equation is still required for 3 component
// colormodels since fractional translation requires blending.
-// If this is the first playable video track and the mode_keyframe is "src
_over
"
+// If this is the first playable video track and the mode_keyframe is "src"
if(mode == TRANSFER_NORMAL &&
vconsole->current_exit_node == vconsole->total_exit_nodes - 1)
mode = TRANSFER_SRC;
if(mode == TRANSFER_NORMAL &&
vconsole->current_exit_node == vconsole->total_exit_nodes - 1)
mode = TRANSFER_SRC;