X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbctexture.h;h=82fcf83abd61a1d8bf576db07db24569e49ba2ea;hp=e0aa34852e4d6c6bdcab40e77582fc45058ba9ba;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d diff --git a/cinelerra-5.1/guicast/bctexture.h b/cinelerra-5.1/guicast/bctexture.h index e0aa3485..82fcf83a 100644 --- a/cinelerra-5.1/guicast/bctexture.h +++ b/cinelerra-5.1/guicast/bctexture.h @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #ifndef BCTEXTURE_H @@ -36,21 +36,21 @@ public: friend class VFrame; -// Create a new texture if *texture if 0 -// or update the existing texture if *texture is +// Create a new texture if *texture if 0 +// or update the existing texture if *texture is // nonzero. The created texture object is stored in *texture. // The texture parameters are stored in the texture manager. // The user must delete *texture when finished with it. // The texture is bound to the current texture unit and enabled. // Must be called from a synchronous opengl thread after enable_opengl. static void new_texture(BC_Texture **texture, - int w, - int h, + int w, + int h, int colormodel); // Bind the frame's texture to GL_TEXTURE_2D and enable it. // If a texture_unit is supplied, the texture unit is made active -// and the commands are run in the right sequence to +// and the commands are run in the right sequence to // initialize it to our preferred specifications. // The texture unit initialization requires the texture to be bound. void bind(int texture_unit = -1);