diff options
Diffstat (limited to 'src/osd/modules/render/d3d/d3dhlsl.cpp')
-rw-r--r-- | src/osd/modules/render/d3d/d3dhlsl.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp index 531c56a9d29..0f7b61ea6b0 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.cpp +++ b/src/osd/modules/render/d3d/d3dhlsl.cpp @@ -116,7 +116,7 @@ public: for (int y = 0; y < m_height; y++) { DWORD *src = (DWORD *)((BYTE *)rect.pBits + y * rect.Pitch); - UINT32 *dst = &m_frame.pix32(y); + uint32_t *dst = &m_frame.pix32(y); for (int x = 0; x < m_width; x++) { @@ -131,7 +131,7 @@ public: m_avi_writer->video_frame(m_frame); } - void add_audio(const INT16 *buffer, int samples_this_frame) + void add_audio(const int16_t *buffer, int samples_this_frame) { if (!m_initialized) return; @@ -262,7 +262,7 @@ void shaders::record_movie() // shaders::record_audio //============================================================ -void shaders::record_audio(const INT16 *buffer, int samples_this_frame) +void shaders::record_audio(const int16_t *buffer, int samples_this_frame) { if (!enabled()) return; @@ -309,7 +309,7 @@ void shaders::render_snapshot(IDirect3DSurface9 *surface) for (int y = 0; y < height; y++) { DWORD *src = (DWORD *)((BYTE *)rect.pBits + y * rect.Pitch); - UINT32 *dst = &snapshot.pix32(y); + uint32_t *dst = &snapshot.pix32(y); for (int x = 0; x < width; x++) { @@ -396,7 +396,7 @@ void shaders::remove_render_target(texture_info *texture) remove_render_target(find_render_target(texture)); } -void shaders::remove_render_target(int source_width, int source_height, UINT32 screen_index, UINT32 page_index) +void shaders::remove_render_target(int source_width, int source_height, uint32_t screen_index, uint32_t page_index) { remove_render_target(find_render_target(source_width, source_height, screen_index, page_index)); } @@ -891,8 +891,8 @@ void shaders::blit( IDirect3DSurface9 *dst, bool clear_dst, D3DPRIMITIVETYPE prim_type, - UINT32 prim_index, - UINT32 prim_count) + uint32_t prim_index, + uint32_t prim_count) { HRESULT result; @@ -941,9 +941,9 @@ void shaders::blit( d3d_render_target* shaders::find_render_target(texture_info *texture) { - UINT32 screen_index_data = (UINT32)texture->get_texinfo().osddata; - UINT32 screen_index = screen_index_data >> 1; - UINT32 page_index = screen_index_data & 1; + uint32_t screen_index_data = (uint32_t)texture->get_texinfo().osddata; + uint32_t screen_index = screen_index_data >> 1; + uint32_t page_index = screen_index_data & 1; return find_render_target(texture->get_width(), texture->get_height(), screen_index, page_index); } @@ -953,7 +953,7 @@ d3d_render_target* shaders::find_render_target(texture_info *texture) // shaders::find_render_target //============================================================ -d3d_render_target* shaders::find_render_target(int source_width, int source_height, UINT32 screen_index, UINT32 page_index) +d3d_render_target* shaders::find_render_target(int source_width, int source_height, uint32_t screen_index, uint32_t page_index) { for (auto it = m_render_target_list.begin(); it != m_render_target_list.end(); it++) { @@ -974,7 +974,7 @@ d3d_render_target* shaders::find_render_target(int source_width, int source_heig // shaders::find_cache_target //============================================================ -cache_target *shaders::find_cache_target(UINT32 screen_index, int width, int height) +cache_target *shaders::find_cache_target(uint32_t screen_index, int width, int height) { for (auto it = m_cache_target_list.begin(); it != m_cache_target_list.end(); it++) { @@ -1689,11 +1689,11 @@ bool shaders::create_vector_target(render_primitive *prim) bool shaders::add_render_target(renderer_d3d9* d3d, render_primitive *prim, texture_info* texture, int source_width, int source_height, int target_width, int target_height) { - UINT32 screen_index = 0; - UINT32 page_index = 0; + uint32_t screen_index = 0; + uint32_t page_index = 0; if (texture != nullptr) { - UINT32 screen_index_data = (UINT32)texture->get_texinfo().osddata; + uint32_t screen_index_data = (uint32_t)texture->get_texinfo().osddata; screen_index = screen_index_data >> 1; page_index = screen_index_data & 1; @@ -1911,10 +1911,10 @@ static void get_vector(const char *data, int count, float *out, bool report_erro // be done in a more ideal way. //============================================================ -slider_state* shaders::slider_alloc(running_machine &machine, int id, const char *title, INT32 minval, INT32 defval, INT32 maxval, INT32 incval, void *arg) +slider_state* shaders::slider_alloc(running_machine &machine, int id, const char *title, int32_t minval, int32_t defval, int32_t maxval, int32_t incval, void *arg) { int size = sizeof(slider_state) + strlen(title); - slider_state *state = reinterpret_cast<slider_state *>(auto_alloc_array_clear(machine, UINT8, size)); + slider_state *state = reinterpret_cast<slider_state *>(auto_alloc_array_clear(machine, uint8_t, size)); state->minval = minval; state->defval = defval; @@ -1945,13 +1945,13 @@ enum slider_type SLIDER_VEC2 }; -INT32 slider::update(std::string *str, INT32 newval) +int32_t slider::update(std::string *str, int32_t newval) { switch (m_desc->slider_type) { case SLIDER_INT_ENUM: { - INT32 *val_ptr = reinterpret_cast<INT32 *>(m_value); + int32_t *val_ptr = reinterpret_cast<int32_t *>(m_value); if (newval != SLIDER_NOCHANGE) { *val_ptr = newval; @@ -1988,13 +1988,13 @@ INT32 slider::update(std::string *str, INT32 newval) { *str = string_format(m_desc->format, *val_ptr); } - return (INT32)floor(*val_ptr / m_desc->scale + 0.5f); + return (int32_t)floor(*val_ptr / m_desc->scale + 0.5f); } } return 0; } -INT32 shaders::slider_changed(running_machine& /*machine*/, void *arg, int /*id*/, std::string *str, INT32 newval) +int32_t shaders::slider_changed(running_machine& /*machine*/, void *arg, int /*id*/, std::string *str, int32_t newval) { if (arg != nullptr) { |