summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-06-25 20:06:02 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-06-25 20:06:02 +0200
commitf75a33f7d1ff7fa0baa893a3a374df2de23b050b (patch)
treef8eb3e351aac4a0a97992cf5f59e38e9c826e21f
parent57e475ada03b412cf5c3cff65c7b70d671304116 (diff)
clang on windows fixes (nw)
-rw-r--r--src/lib/util/unzip.cpp3
-rw-r--r--src/osd/modules/file/windir.cpp2
-rw-r--r--src/osd/modules/render/d3d/d3dhlsl.cpp2
-rw-r--r--src/osd/modules/render/d3d/d3dhlsl.h1
4 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/util/unzip.cpp b/src/lib/util/unzip.cpp
index a7f3295551d..4671149ba38 100644
--- a/src/lib/util/unzip.cpp
+++ b/src/lib/util/unzip.cpp
@@ -617,9 +617,6 @@ public:
std::size_t total_length() const { return minimum_length(); }
static std::size_t minimum_length() { return 0x18; }
-
-private:
- std::size_t m_length;
};
diff --git a/src/osd/modules/file/windir.cpp b/src/osd/modules/file/windir.cpp
index c8efea0e302..ad463f2d337 100644
--- a/src/osd/modules/file/windir.cpp
+++ b/src/osd/modules/file/windir.cpp
@@ -146,7 +146,7 @@ directory::ptr directory::open(std::string const &dirname)
catch (...) { return nullptr; }
if (!dir->open_impl(dirname))
- return false;
+ return nullptr;
return ptr(std::move(dir));
}
diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
index be7138bfe6f..feb88dc0add 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/src/osd/modules/render/d3d/d3dhlsl.cpp
@@ -43,7 +43,7 @@ static void get_vector(const char *data, int count, float *out, bool report_erro
//============================================================
shaders::shaders() :
- d3dintf(nullptr), machine(nullptr), d3d(nullptr), post_fx_enable(false), oversampling_enable(false), paused(true), num_screens(0), curr_screen(0), lastidx(-1),
+ d3dintf(nullptr), machine(nullptr), d3d(nullptr), post_fx_enable(false), oversampling_enable(false), paused(true), num_screens(0), curr_screen(0),
shadow_texture(nullptr), options(nullptr), avi_output_file(nullptr), avi_frame(0), avi_copy_surface(nullptr), avi_copy_texture(nullptr), avi_final_target(nullptr), avi_final_texture(nullptr),
black_surface(nullptr), black_texture(nullptr), render_snap(false), snap_rendered(false), snap_copy_target(nullptr), snap_copy_texture(nullptr), snap_target(nullptr), snap_texture(nullptr),
snap_width(0), snap_height(0), lines_pending(false), initialized(false), backbuffer(nullptr), curr_effect(nullptr), default_effect(nullptr), prescale_effect(nullptr), post_effect(nullptr),
diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h
index 1b3fdc1fa2d..a964c8b4abd 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.h
+++ b/src/osd/modules/render/d3d/d3dhlsl.h
@@ -387,7 +387,6 @@ private:
bool paused; // whether or not rendering is currently paused
int num_screens; // number of emulated physical screens
int curr_screen; // current screen for render target operations
- int lastidx; // index of the last-encountered target
bitmap_argb32 shadow_bitmap; // shadow mask bitmap for post-processing shader
texture_info * shadow_texture; // shadow mask texture for post-processing shader
hlsl_options * options; // current options