X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fplayback3d.C;h=1844f808ef3aade81a87ecdf28f54049a4f01961;hb=0c4a2483761f458447fc3fa451bf1271caa75df5;hp=503e57185b1c01d14462e25a02ea50f93c7933f4;hpb=8e67d840c5a93f77de021102a4f0bfc4e07504f4;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/playback3d.C b/cinelerra-5.1/cinelerra/playback3d.C index 503e5718..1844f808 100644 --- 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" - "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" @@ -521,12 +521,14 @@ void Playback3D::copy_from_sync(Playback3DCommand *command) // 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 +#endif // 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( 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