projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update ru.po per andrew, fix bg pixmaps tweak, confirm pref update segv, scaling...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
playback3d.C
diff --git
a/cinelerra-5.1/cinelerra/playback3d.C
b/cinelerra-5.1/cinelerra/playback3d.C
index 503e57185b1c01d14462e25a02ea50f93c7933f4..1844f808ef3aade81a87ecdf28f54049a4f01961 100644
(file)
--- a/
cinelerra-5.1/cinelerra/playback3d.C
+++ b/
cinelerra-5.1/cinelerra/playback3d.C
@@
-271,7
+271,7
@@
static const char *feather_frag =
"#version 430\n"
"layout(location=0) out vec4 color;\n"
"uniform sampler2D tex;\n"
"#version 430\n"
"layout(location=0) out vec4 color;\n"
"uniform sampler2D tex;\n"
- "const int MAX =
1024
;\n"
+ "const int MAX =
" SS(MAX_FEATHER) "+1
;\n"
"uniform float psf[MAX];\n"
"uniform int n;\n"
"uniform vec2 dxy;\n"
"uniform float psf[MAX];\n"
"uniform int n;\n"
"uniform vec2 dxy;\n"
@@
-521,12
+521,14
@@
void Playback3D::copy_from_sync(Playback3DCommand *command)
// command->frame->get_w(),
// command->frame->get_h(),
// command->frame->get_color_model());
// command->frame->get_w(),
// command->frame->get_h(),
// command->frame->get_color_model());
-// With NVidia at least,
+#ifdef GLx4
+// With NVidia at least
if(w % 4)
{
printf("Playback3D::copy_from_sync: w=%d not supported because it is not divisible by 4.\n", w);
}
else
if(w % 4)
{
printf("Playback3D::copy_from_sync: w=%d not supported because it is not divisible by 4.\n", w);
}
else
+#endif
// Copy to texture
if(command->want_texture)
{
// Copy to texture
if(command->want_texture)
{
@@
-1408,7
+1410,7
@@
void Playback3D::do_mask_sync(Playback3DCommand *command)
if( r ) {
double sig2 = -log(255.0)/(r*r);
int n = abs((int)r) + 1;
if( r ) {
double sig2 = -log(255.0)/(r*r);
int n = abs((int)r) + 1;
- if( n >
1024 ) n = 1024; // MAX
+ if( n >
MAX_FEATHER+1 ) n = MAX_FEATHER+1;
float psf[n]; // point spot fn
for( int i=0; i<n; ++i )
psf[i] = exp(i*i * sig2);
float psf[n]; // point spot fn
for( int i=0; i<n; ++i )
psf[i] = exp(i*i * sig2);