Permalink
Browse files

Merge pull request #9784 from unknownbrackets/warnings

Warning fixes
  • Loading branch information...
hrydgard committed Jun 7, 2017
2 parents ae94516 + 21fbacd commit b7263b6dc0406cfd043df8e7f3d4ce663b87f4b5
View
@@ -1748,11 +1748,15 @@ set(NativeAssets
android/assets/ui_atlas.zim
assets/lang
assets/shaders
assets/ppge_atlas.zim
assets/Roboto-Condensed.ttf
assets/7z.png
assets/compat.ini
assets/langregion.ini
assets/gamecontrollerdb.txt
assets/unknown.png)
assets/langregion.ini
assets/ppge_atlas.zim
assets/rargray.png
assets/unknown.png
assets/zip.png)
if(HEADLESS)
View
@@ -383,7 +383,7 @@ static void WriteRecording() {
const std::string filename = GenRecordingFilename();
FILE *fp = File::OpenCFile(filename, "wb");
fwrite(HEADER, sizeof(HEADER), 1, fp);
fwrite(HEADER, 8, 1, fp);
fwrite(&VERSION, sizeof(VERSION), 1, fp);
u32 sz = (u32)commands.size();
@@ -1003,7 +1003,7 @@ bool RunMountedReplay(const std::string &filename) {
pspFileSystem.ReadFile(fp, header, sizeof(header));
pspFileSystem.ReadFile(fp, (u8 *)&version, sizeof(version));
if (memcmp(header, HEADER, sizeof(HEADER)) != 0 || version != VERSION) {
if (memcmp(header, HEADER, sizeof(header)) != 0 || version != VERSION) {
ERROR_LOG(SYSTEM, "Invalid GE dump or unsupported version");
pspFileSystem.CloseFile(fp);
return false;
@@ -39,22 +39,6 @@
namespace Rasterizer {
//static inline int orient2d(const DrawingCoords& v0, const DrawingCoords& v1, const DrawingCoords& v2)
static inline int orient2d(const ScreenCoords& v0, const ScreenCoords& v1, const ScreenCoords& v2)
{
return ((int)v1.x-(int)v0.x)*((int)v2.y-(int)v0.y) - ((int)v1.y-(int)v0.y)*((int)v2.x-(int)v0.x);
}
static inline int orient2dIncX(int dY01)
{
return dY01;
}
static inline int orient2dIncY(int dX01)
{
return -dX01;
}
// Only OK on x64 where our stack is aligned
#if defined(_M_SSE) && !defined(_M_IX86)
static inline __m128 Interpolate(const __m128 &c0, const __m128 &c1, const __m128 &c2, int w0, int w1, int w2, float wsum) {
@@ -348,6 +348,9 @@ void TransformUnit::SubmitPrimitive(void* vertices, void* indices, GEPrimitiveTy
case GE_PRIM_POINTS:
Clipper::ProcessPoint(data[0]);
break;
default:
_dbg_assert_msg_(G3D, false, "Unexpected prim type: %d", prim_type);
}
}
break;
@@ -474,6 +477,10 @@ void TransformUnit::SubmitPrimitive(void* vertices, void* indices, GEPrimitiveTy
}
break;
}
default:
ERROR_LOG(G3D, "Unexpected prim type: %d", prim_type);
break;
}
host->GPUNotifyDraw();
@@ -48,7 +48,7 @@ class DragDropButton : public MultiTouchButton {
scale_ = theScale_;
}
virtual bool IsDown() {
bool IsDown() override {
// Don't want the button to enlarge and throw the user's perspective
// of button size off whack.
return false;
@@ -118,7 +118,7 @@ class PSPActionButtons : public DragDropButton {
squareVisible_ = visible;
}
void Draw(UIContext &dc) {
void Draw(UIContext &dc) override {
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
@@ -151,19 +151,15 @@ class PSPActionButtons : public DragDropButton {
}
};
void GetContentDimensions(const UIContext &dc, float &w, float &h) const{
void GetContentDimensions(const UIContext &dc, float &w, float &h) const override {
const AtlasImage &image = dc.Draw()->GetAtlas()->images[roundId_];
w = (2 * baseActionButtonSpacing * spacing_) + image.w * scale_;
h = (2 * baseActionButtonSpacing * spacing_) + image.h * scale_;
}
virtual float GetSpacing() const { return spacing_; }
virtual void SetSpacing(float s) { spacing_ = s; }
virtual void SavePosition() {
DragDropButton::SavePosition();
}
float GetSpacing() const override { return spacing_; }
void SetSpacing(float s) override { spacing_ = s; }
private:
bool circleVisible_, crossVisible_, triangleVisible_, squareVisible_;
@@ -180,7 +176,7 @@ class PSPDPadButtons : public DragDropButton {
: DragDropButton(x, y, -1, -1, scale), spacing_(spacing) {
}
void Draw(UIContext &dc) {
void Draw(UIContext &dc) override {
float opacity = g_Config.iTouchButtonOpacity / 100.0f;
uint32_t colorBg = colorAlpha(GetButtonColor(), opacity);
@@ -204,14 +200,14 @@ class PSPDPadButtons : public DragDropButton {
}
}
void GetContentDimensions(const UIContext &dc, float &w, float &h) const{
void GetContentDimensions(const UIContext &dc, float &w, float &h) const override {
const AtlasImage &image = dc.Draw()->GetAtlas()->images[I_DIR];
w = 2 * D_pad_Radius * spacing_ + image.w * scale_;
h = 2 * D_pad_Radius * spacing_ + image.h * scale_;
};
float GetSpacing() const { return spacing_; }
virtual void SetSpacing(float s) { spacing_ = s; }
float GetSpacing() const override { return spacing_; }
void SetSpacing(float s) override { spacing_ = s; }
private:
float &spacing_;
View
@@ -3,6 +3,7 @@ xcopy ..\assets\lang assets\lang\ /s /y <d.txt
xcopy ..\assets\shaders assets\shaders\ /s /y <d.txt
copy ..\assets\langregion.ini assets\langregion.ini
copy ..\assets\compat.ini assets\compat.ini
copy ..\assets\Roboto-Condensed.ttf assets\Roboto-Condensed.ttf
copy ..\assets\*.png assets\
SET NDK=C:\AndroidNDK
SET NDK_MODULE_PATH=..\ext;..\ext\native\ext
View
@@ -3,5 +3,6 @@ cp -r ../assets/lang assets/
cp -r ../assets/shaders assets/
cp ../assets/langregion.ini assets/langregion.ini
cp ../assets/compat.ini assets/compat.ini
cp ../assets/Roboto-Condensed.ttf assets/Roboto-Condensed.ttf
cp ../assets/*.png assets/
NDK_MODULE_PATH=../ext:../ext/native/ext $NDK/ndk-build -j3 $*
View
@@ -1,6 +1,10 @@
mkdir -p assets
cp ../assets/7z.png assets/
cp ../assets/rargray.png assets/
cp ../assets/unknown.png assets/
cp ../assets/zip.png assets/
cp ../assets/ui_atlas.zim assets/
cp ../assets/ppge_atlas.zim assets/
cp ../assets/Roboto-Condensed.ttf assets/
cp -r ../assets/flash0 assets/
cp -r ../assets/lang assets/

0 comments on commit b7263b6

Please sign in to comment.