history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-19 08:25:47 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: Linux warning fixes

Browse Source
This commit is contained in:
Connor McLaughlin
2020-01-09 08:46:52 +10:00
parent 06d26084fb
commit c52040434a
14 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/gpu_sw.cpp
View File

@ -1,11 +1,8 @@
#include "gpu_sw.h"
#include "YBaseLib/Log.h"
#include "YBaseLib/Timer.h"
#include "common/gl/texture.h"
#include "YBaseLib/Assert.h"
#include "host_display.h"
#include "system.h"
#include <algorithm>
Log_SetChannel(GPU_SW);
GPU_SW::GPU_SW()
{
@ -350,7 +347,7 @@ void GPU_SW::DrawTriangle(const SWVertex* v0, const SWVertex* v1, const SWVertex
s32 max_y = std::max(py0, std::max(py1, py2));
// reject triangles which cover the whole vram area
if ((max_x - min_x) > MAX_PRIMITIVE_WIDTH || (max_y - min_y) > MAX_PRIMITIVE_HEIGHT)
if (static_cast<u32>(max_x - min_x) > MAX_PRIMITIVE_WIDTH || static_cast<u32>(max_y - min_y) > MAX_PRIMITIVE_HEIGHT)
return;
// clip to drawing area
@ -594,6 +591,10 @@ void GPU_SW::ShadePixel(u32 x, u32 y, u8 color_r, u8 color_g, u8 color_b, u8 tex
#undef BLEND_AVERAGE
}
}
else
{
UNREFERENCED_PARAMETER(transparent);
}
const u16 mask_and = m_GPUSTAT.GetMaskAND();
if ((color.bits & mask_and) != mask_and)