diff options
Diffstat (limited to 'src/osd')
| -rw-r--r-- | src/osd/osdcomm.h | 6 | ||||
| -rw-r--r-- | src/osd/portmedia/pmmidi.c | 14 | ||||
| -rw-r--r-- | src/osd/sdl/debugqtbreakpointswindow.c | 2 | ||||
| -rw-r--r-- | src/osd/windows/d3dhlsl.h | 111 | ||||
| -rw-r--r-- | src/osd/windows/d3dintf.h | 2 | ||||
| -rw-r--r-- | src/osd/windows/drawd3d.h | 2 | ||||
| -rw-r--r-- | src/osd/windows/winmain.c | 2 | ||||
| -rw-r--r-- | src/osd/windows/winmain.h | 2 | ||||
| -rw-r--r-- | src/osd/windows/winptty.c | 4 |
9 files changed, 72 insertions, 73 deletions
diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h index 66ae5758e6d..5eb3e1a480d 100644 --- a/src/osd/osdcomm.h +++ b/src/osd/osdcomm.h @@ -67,7 +67,7 @@ #define ATTR_CONST __attribute__((const)) #define ATTR_FORCE_INLINE __attribute__((always_inline)) #define ATTR_NONNULL(...) __attribute__((nonnull(__VA_ARGS__))) -#define ATTR_DEPRECATED __attribute__((deprecated)) +#define ATTR_DEPRECATED __attribute__((deprecated)) /* not supported in GCC prior to 4.4.x */ #if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4) #define ATTR_HOT __attribute__((hot)) @@ -83,7 +83,7 @@ #else #define ATTR_UNUSED #if defined(_MSC_VER) && (_MSC_VER >= 1200) -#define ATTR_NORETURN __declspec(noreturn) +#define ATTR_NORETURN __declspec(noreturn) #else #define ATTR_NORETURN #endif @@ -93,7 +93,7 @@ #define ATTR_CONST #define ATTR_FORCE_INLINE #define ATTR_NONNULL(...) -#define ATTR_DEPRECATED __declspec(deprecated) +#define ATTR_DEPRECATED __declspec(deprecated) #define ATTR_HOT #define ATTR_COLD #define UNEXPECTED(exp) (exp) diff --git a/src/osd/portmedia/pmmidi.c b/src/osd/portmedia/pmmidi.c index 5a6d2528347..18a43ade850 100644 --- a/src/osd/portmedia/pmmidi.c +++ b/src/osd/portmedia/pmmidi.c @@ -298,7 +298,7 @@ void osd_write_midi_channel(osd_midi_device *dev, UINT8 data) PmEvent ev; ev.timestamp = 0; // use the current time -// printf("write: %02x (%d)\n", data, dev->xmit_cnt); +// printf("write: %02x (%d)\n", data, dev->xmit_cnt); if (dev->xmit_cnt >= 4) { @@ -314,7 +314,7 @@ void osd_write_midi_channel(osd_midi_device *dev, UINT8 data) // if we get a status that isn't sysex, assume it's system common if ((data & 0x80) && (data != MIDI_EOX)) { -// printf("common during sysex!\n"); +// printf("common during sysex!\n"); ev.message = Pm_Message(data, 0, 0); Pm_Write(dev->pmStream, &ev, 1); return; @@ -330,7 +330,7 @@ void osd_write_midi_channel(osd_midi_device *dev, UINT8 data) dev->xmit_in[0] = dev->xmit_in[1] = dev->xmit_in[2] = dev->xmit_in[3] = 0; dev->xmit_cnt = 0; -// printf("SysEx packet: %08x\n", ev.message); +// printf("SysEx packet: %08x\n", ev.message); // if this is EOX, kill the running status if (data == MIDI_EOX) @@ -352,23 +352,23 @@ void osd_write_midi_channel(osd_midi_device *dev, UINT8 data) { dev->xmit_in[dev->xmit_cnt++] = dev->last_status; dev->xmit_in[dev->xmit_cnt++] = data; -// printf("\trunning status: [%d] = %02x, [%d] = %02x, last_status = %02x\n", dev->xmit_cnt-2, dev->last_status, dev->xmit_cnt-1, data, dev->last_status); +// printf("\trunning status: [%d] = %02x, [%d] = %02x, last_status = %02x\n", dev->xmit_cnt-2, dev->last_status, dev->xmit_cnt-1, data, dev->last_status); } else { dev->xmit_in[dev->xmit_cnt++] = data; -// printf("\tNRS: [%d] = %02x\n", dev->xmit_cnt-1, data); +// printf("\tNRS: [%d] = %02x\n", dev->xmit_cnt-1, data); } if ((dev->xmit_cnt == 1) && (dev->xmit_in[0] == MIDI_SYSEX)) { -// printf("Start SysEx!\n"); +// printf("Start SysEx!\n"); dev->last_status = MIDI_SYSEX; return; } // are we there yet? -// printf("status check: %02x\n", dev->xmit_in[0]); +// printf("status check: %02x\n", dev->xmit_in[0]); switch ((dev->xmit_in[0]>>4) & 0xf) { case 0xc: // 2-byte messages diff --git a/src/osd/sdl/debugqtbreakpointswindow.c b/src/osd/sdl/debugqtbreakpointswindow.c index 82e8bd5dc4b..31000e26c51 100644 --- a/src/osd/sdl/debugqtbreakpointswindow.c +++ b/src/osd/sdl/debugqtbreakpointswindow.c @@ -112,7 +112,7 @@ void BreakpointsWindowQtConfig::applyToQWidget(QWidget* widget) BreakpointsWindow* window = dynamic_cast<BreakpointsWindow*>(widget); QActionGroup* typeGroup = window->findChild<QActionGroup*>("typegroup"); - typeGroup->actions()[m_bwType]->trigger(); + typeGroup->actions()[m_bwType]->trigger(); } diff --git a/src/osd/windows/d3dhlsl.h b/src/osd/windows/d3dhlsl.h index 31fcc7553bb..206262eea15 100644 --- a/src/osd/windows/d3dhlsl.h +++ b/src/osd/windows/d3dhlsl.h @@ -55,7 +55,6 @@ namespace d3d { - class effect; class shaders; @@ -133,33 +132,33 @@ public: uniform(effect *shader, const char *name, uniform_type type, int id); - void set_next(uniform *next); - uniform * get_next() { return m_next; } + void set_next(uniform *next); + uniform * get_next() { return m_next; } - void set(float x, float y, float z, float w); - void set(float x, float y, float z); - void set(float x, float y); - void set(float x); - void set(int x); - void set(matrix *mat); - void set(texture *tex); + void set(float x, float y, float z, float w); + void set(float x, float y, float z); + void set(float x, float y); + void set(float x); + void set(int x); + void set(matrix *mat); + void set(texture *tex); - void upload(); - void update(); + void upload(); + void update(); protected: - uniform *m_next; - - float m_vec[4]; - int m_ival; - matrix *m_mval; - texture *m_texture; - int m_count; - uniform_type m_type; - int m_id; - - effect *m_shader; - D3DXHANDLE m_handle; + uniform *m_next; + + float m_vec[4]; + int m_ival; + matrix *m_mval; + texture *m_texture; + int m_count; + uniform_type m_type; + int m_id; + + effect *m_shader; + D3DXHANDLE m_handle; }; class effect @@ -170,38 +169,38 @@ public: effect(shaders *shadersys, device *dev, const char *name, const char *path); ~effect(); - void begin(UINT *passes, DWORD flags); - void begin_pass(UINT pass); + void begin(UINT *passes, DWORD flags); + void begin_pass(UINT pass); - void end(); - void end_pass(); + void end(); + void end_pass(); - void set_technique(const char *name); + void set_technique(const char *name); - void set_vector(D3DXHANDLE param, int count, float *vector); - void set_float(D3DXHANDLE param, float value); - void set_int(D3DXHANDLE param, int value); - void set_matrix(D3DXHANDLE param, matrix *matrix); - void set_texture(D3DXHANDLE param, texture *tex); + void set_vector(D3DXHANDLE param, int count, float *vector); + void set_float(D3DXHANDLE param, float value); + void set_int(D3DXHANDLE param, int value); + void set_matrix(D3DXHANDLE param, matrix *matrix); + void set_texture(D3DXHANDLE param, texture *tex); - void add_uniform(const char *name, uniform::uniform_type type, int id); - void update_uniforms(); + void add_uniform(const char *name, uniform::uniform_type type, int id); + void update_uniforms(); - D3DXHANDLE get_parameter(D3DXHANDLE param, const char *name); + D3DXHANDLE get_parameter(D3DXHANDLE param, const char *name); - ULONG release(); + ULONG release(); - shaders* get_shaders() { return m_shaders; } + shaders* get_shaders() { return m_shaders; } - bool is_valid() { return m_valid; } + bool is_valid() { return m_valid; } private: - uniform *m_uniform_head; - uniform *m_uniform_tail; + uniform *m_uniform_head; + uniform *m_uniform_tail; ID3DXEffect *m_effect; - shaders *m_shaders; + shaders *m_shaders; - bool m_valid; + bool m_valid; }; class render_target; @@ -358,15 +357,15 @@ private: void remove_cache_target(cache_target *cache); // Shader passes - void ntsc_pass(render_target *rt, vec2f &texsize, vec2f &delta); - void color_convolution_pass(render_target *rt, vec2f &texsize, vec2f &sourcedims); - void prescale_pass(render_target *rt, vec2f &texsize, vec2f &sourcedims); - void deconverge_pass(render_target *rt, vec2f &texsize, vec2f &delta, vec2f &sourcedims); - void defocus_pass(render_target *rt, vec2f &texsize); - void phosphor_pass(render_target *rt, cache_target *ct, vec2f &texsize, bool focus_enable); - void screen_post_pass(render_target *rt, vec2f &texsize, vec2f &delta, vec2f &sourcedims, poly_info *poly, int vertnum); - void avi_post_pass(render_target *rt, vec2f &texsize, vec2f &delta, vec2f &sourcedims, poly_info *poly, int vertnum); - void raster_bloom_pass(render_target *rt, vec2f &texsize, vec2f &delta, poly_info *poly, int vertnum); + void ntsc_pass(render_target *rt, vec2f &texsize, vec2f &delta); + void color_convolution_pass(render_target *rt, vec2f &texsize, vec2f &sourcedims); + void prescale_pass(render_target *rt, vec2f &texsize, vec2f &sourcedims); + void deconverge_pass(render_target *rt, vec2f &texsize, vec2f &delta, vec2f &sourcedims); + void defocus_pass(render_target *rt, vec2f &texsize); + void phosphor_pass(render_target *rt, cache_target *ct, vec2f &texsize, bool focus_enable); + void screen_post_pass(render_target *rt, vec2f &texsize, vec2f &delta, vec2f &sourcedims, poly_info *poly, int vertnum); + void avi_post_pass(render_target *rt, vec2f &texsize, vec2f &delta, vec2f &sourcedims, poly_info *poly, int vertnum); + void raster_bloom_pass(render_target *rt, vec2f &texsize, vec2f &delta, poly_info *poly, int vertnum); base * d3dintf; // D3D interface win_window_info * window; // D3D window info @@ -434,9 +433,9 @@ private: effect * vector_effect; // pointer to the vector-effect object vertex * fsfx_vertices; // pointer to our full-screen-quad object - texture_info * curr_texture; - bool phosphor_passthrough; - float target_size[2]; + texture_info * curr_texture; + bool phosphor_passthrough; + float target_size[2]; public: render_target * targethead; diff --git a/src/osd/windows/d3dintf.h b/src/osd/windows/d3dintf.h index e3b153e4369..3bc73a1726a 100644 --- a/src/osd/windows/d3dintf.h +++ b/src/osd/windows/d3dintf.h @@ -245,7 +245,7 @@ struct base void * d3dobj; HINSTANCE dllhandle; bool post_fx_available; - HINSTANCE libhandle; + HINSTANCE libhandle; // interface pointers interface d3d; diff --git a/src/osd/windows/drawd3d.h b/src/osd/windows/drawd3d.h index f22838a030b..0165c2af0a8 100644 --- a/src/osd/windows/drawd3d.h +++ b/src/osd/windows/drawd3d.h @@ -177,7 +177,7 @@ public: // Setters / getters int get_adapter() { return m_adapter; } int get_width() { return m_width; } - vec2f get_dims() { return vec2f(m_width, m_height); } + vec2f get_dims() { return vec2f(m_width, m_height); } int get_height() { return m_height; } int get_refresh() { return m_refresh; } diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c index c5b077f06a8..3da2c9f8e3f 100644 --- a/src/osd/windows/winmain.c +++ b/src/osd/windows/winmain.c @@ -318,7 +318,7 @@ const options_entry windows_options::s_option_entries[] = { WINOPTION_WINDOW ";w", "0", OPTION_BOOLEAN, "enable window mode; otherwise, full screen mode is assumed" }, { WINOPTION_MAXIMIZE ";max", "1", OPTION_BOOLEAN, "default to maximized windows; otherwise, windows will be minimized" }, { WINOPTION_KEEPASPECT ";ka", "1", OPTION_BOOLEAN, "constrain to the proper aspect ratio" }, - { WINOPTION_UNEVENSTRETCH ";ues", "1", OPTION_BOOLEAN, "allow non-integer stretch factors" }, + { WINOPTION_UNEVENSTRETCH ";ues", "1", OPTION_BOOLEAN, "allow non-integer stretch factors" }, { WINOPTION_PRESCALE, "1", OPTION_INTEGER, "scale screen rendering by this amount in software" }, { WINOPTION_WAITVSYNC ";vs", "0", OPTION_BOOLEAN, "enable waiting for the start of VBLANK before flipping screens; reduces tearing effects" }, { WINOPTION_SYNCREFRESH ";srf", "0", OPTION_BOOLEAN, "enable using the start of VBLANK for throttling instead of the game time" }, diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h index e84adc5425b..b85a6ce37fd 100644 --- a/src/osd/windows/winmain.h +++ b/src/osd/windows/winmain.h @@ -66,7 +66,7 @@ #define WINOPTION_WINDOW "window" #define WINOPTION_MAXIMIZE "maximize" #define WINOPTION_KEEPASPECT "keepaspect" -#define WINOPTION_UNEVENSTRETCH "unevenstretch" +#define WINOPTION_UNEVENSTRETCH "unevenstretch" #define WINOPTION_PRESCALE "prescale" #define WINOPTION_WAITVSYNC "waitvsync" #define WINOPTION_SYNCREFRESH "syncrefresh" diff --git a/src/osd/windows/winptty.c b/src/osd/windows/winptty.c index 0f0bea55b0d..5f582412072 100644 --- a/src/osd/windows/winptty.c +++ b/src/osd/windows/winptty.c @@ -18,9 +18,9 @@ file_error win_open_ptty(const char *path, UINT32 openflags, osd_file **file, UI return FILERR_OUT_OF_MEMORY; pipe = CreateNamedPipe(t_name, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_NOWAIT, 1, 32, 32, 0, NULL); - + osd_free(t_name); - + if(pipe == INVALID_HANDLE_VALUE) return FILERR_ACCESS_DENIED; |
