zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 23:32:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

GCC compile fixes

Browse source
This commit is contained in:
Magnus Norddahl 2016-06-30 13:45:06 +02:00
parent 335ca12909
commit d1617fcdf0
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/r_draw_rgba.h
View file

@ -31,6 +31,10 @@
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#ifndef NO_SSE
#include <immintrin.h>
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Drawer functions: // Drawer functions:

16
src/textures/texture.cpp
View file

@ -406,10 +406,10 @@ void FTexture::GenerateBgraMipmaps()
{ {
uint32_t c8 = PixelsBgra[x * Height + y]; uint32_t c8 = PixelsBgra[x * Height + y];
Color4f c; Color4f c;
c.a = std::pow(APART(c8) * (1.0f / 255.0f), 2.2f); c.a = powf(APART(c8) * (1.0f / 255.0f), 2.2f);
c.r = std::pow(RPART(c8) * (1.0f / 255.0f), 2.2f); c.r = powf(RPART(c8) * (1.0f / 255.0f), 2.2f);
c.g = std::pow(GPART(c8) * (1.0f / 255.0f), 2.2f); c.g = powf(GPART(c8) * (1.0f / 255.0f), 2.2f);
c.b = std::pow(BPART(c8) * (1.0f / 255.0f), 2.2f); c.b = powf(BPART(c8) * (1.0f / 255.0f), 2.2f);
image[x * Height + y] = c; image[x * Height + y] = c;
} }
} }
@ -489,10 +489,10 @@ void FTexture::GenerateBgraMipmaps()
int h = MAX(Height >> i, 1); int h = MAX(Height >> i, 1);
for (int j = 0; j < w * h; j++) for (int j = 0; j < w * h; j++)
{ {
uint32_t a = (uint32_t)clamp(std::pow(src[j].a, 1.0f / 2.2f) * 255.0f + 0.5f, 0.0f, 255.0f); uint32_t a = (uint32_t)clamp(powf(src[j].a, 1.0f / 2.2f) * 255.0f + 0.5f, 0.0f, 255.0f);
uint32_t r = (uint32_t)clamp(std::pow(src[j].r, 1.0f / 2.2f) * 255.0f + 0.5f, 0.0f, 255.0f); uint32_t r = (uint32_t)clamp(powf(src[j].r, 1.0f / 2.2f) * 255.0f + 0.5f, 0.0f, 255.0f);
uint32_t g = (uint32_t)clamp(std::pow(src[j].g, 1.0f / 2.2f) * 255.0f + 0.5f, 0.0f, 255.0f); uint32_t g = (uint32_t)clamp(powf(src[j].g, 1.0f / 2.2f) * 255.0f + 0.5f, 0.0f, 255.0f);
uint32_t b = (uint32_t)clamp(std::pow(src[j].b, 1.0f / 2.2f) * 255.0f + 0.5f, 0.0f, 255.0f); uint32_t b = (uint32_t)clamp(powf(src[j].b, 1.0f / 2.2f) * 255.0f + 0.5f, 0.0f, 255.0f);
dest[j] = (a << 24) | (r << 16) | (g << 8) | b; dest[j] = (a << 24) | (r << 16) | (g << 8) | b;
} }
src += w * h; src += w * h;