zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- swapped out the license in two files. 

BSD is preferred over LGPL
This commit is contained in:
Christoph Oelckers 2020-04-21 21:06:11 +02:00
parent 5d49faf190
commit ce95d7379f
4 changed files with 66 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/engine/sc_man.cpp
View File

@ -1119,7 +1119,7 @@ void FScanner::CheckOpen()
{ {
if (ScriptOpen == false) if (ScriptOpen == false)
{ {
I_FatalError ("SC_ call before SC_Open()."); I_Error ("SC_ call before SC_Open().");
} }
} }

2
src/common/textures/image.cpp
View File

@ -175,10 +175,8 @@ int FImageSource::CopyPixels(FBitmap *bmp, int conversion)
{ {
if (conversion == luminance) conversion = normal; // luminance images have no use as an RGB source. if (conversion == luminance) conversion = normal; // luminance images have no use as an RGB source.
PalEntry *palette = GPalette.BaseColors; PalEntry *palette = GPalette.BaseColors;
for(int i=1;i<256;i++) palette[i].a = 255; // set proper alpha values
auto ppix = CreatePalettedPixels(conversion); auto ppix = CreatePalettedPixels(conversion);
bmp->CopyPixelData(0, 0, ppix.Data(), Width, Height, Height, 1, 0, palette, nullptr); bmp->CopyPixelData(0, 0, ppix.Data(), Width, Height, Height, 1, 0, palette, nullptr);
for(int i=1;i<256;i++) palette[i].a = 0;
return 0; return 0;
} }

55
src/rendering/gl/textures/gl_hwtexture.cpp
View File

@ -1,28 +1,35 @@
//
//---------------------------------------------------------------------------
//
// Copyright(C) 2004-2016 Christoph Oelckers
// All rights reserved.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with this program. If not, see http://www.gnu.org/licenses/
//
//--------------------------------------------------------------------------
//
/* /*
** gltexture.cpp ** gl_hwtexture.cpp
** Low level OpenGL texture handling. These classes are also ** GL texture abstraction
** containers for the various translations a texture can have. **
**---------------------------------------------------------------------------
** Copyright 2019 Christoph Oelckers
** All rights reserved.
**
** Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions
** are met:
**
** 1. Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** 2. Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in the
** documentation and/or other materials provided with the distribution.
** 3. The name of the author may not be used to endorse or promote products
** derived from this software without specific prior written permission.
**
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**---------------------------------------------------------------------------
**
** **
*/ */

56
src/rendering/gl/textures/gl_samplers.cpp
View File

@ -1,25 +1,37 @@
// /*
//--------------------------------------------------------------------------- ** gl_samplers.cpp
// **
// Copyright(C) 2014-2016 Christoph Oelckers ** Texture sampler handling
// All rights reserved. **
// **---------------------------------------------------------------------------
// This program is free software: you can redistribute it and/or modify ** Copyright 2015-2019 Christoph Oelckers
// it under the terms of the GNU Lesser General Public License as published by ** All rights reserved.
// the Free Software Foundation, either version 3 of the License, or **
// (at your option) any later version. ** Redistribution and use in source and binary forms, with or without
// ** modification, are permitted provided that the following conditions
// This program is distributed in the hope that it will be useful, ** are met:
// but WITHOUT ANY WARRANTY; without even the implied warranty of **
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** 1. Redistributions of source code must retain the above copyright
// GNU Lesser General Public License for more details. ** notice, this list of conditions and the following disclaimer.
// ** 2. Redistributions in binary form must reproduce the above copyright
// You should have received a copy of the GNU Lesser General Public License ** notice, this list of conditions and the following disclaimer in the
// along with this program. If not, see http://www.gnu.org/licenses/ ** documentation and/or other materials provided with the distribution.
// ** 3. The name of the author may not be used to endorse or promote products
//-------------------------------------------------------------------------- ** derived from this software without specific prior written permission.
// **
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**---------------------------------------------------------------------------
**
*/
#include "gl_system.h" #include "gl_system.h"
#include "c_cvars.h" #include "c_cvars.h"