diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/debugger/graphics_vertex_shader.cpp | 8 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 2 | ||||
| -rw-r--r-- | src/core/hw/y2r.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp index f915d2bab..a5a5fe6b0 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp | |||
| @@ -294,16 +294,16 @@ QVariant GraphicsVertexShaderModel::data(const QModelIndex& index, int role) con | |||
| 294 | { | 294 | { |
| 295 | // Highlight current instruction | 295 | // Highlight current instruction |
| 296 | int current_record_index = par->cycle_index->value(); | 296 | int current_record_index = par->cycle_index->value(); |
| 297 | if (current_record_index < par->debug_data.records.size()) { | 297 | if (current_record_index < static_cast<int>(par->debug_data.records.size())) { |
| 298 | const auto& current_record = par->debug_data.records[current_record_index]; | 298 | const auto& current_record = par->debug_data.records[current_record_index]; |
| 299 | if (index.row() == current_record.instruction_offset) { | 299 | if (index.row() == static_cast<int>(current_record.instruction_offset)) { |
| 300 | return QColor(255, 255, 63); | 300 | return QColor(255, 255, 63); |
| 301 | } | 301 | } |
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | // Use a grey background for instructions which have no debug data associated to them | 304 | // Use a grey background for instructions which have no debug data associated to them |
| 305 | for (const auto& record : par->debug_data.records) | 305 | for (const auto& record : par->debug_data.records) |
| 306 | if (index.row() == record.instruction_offset) | 306 | if (index.row() == static_cast<int>(record.instruction_offset)) |
| 307 | return QVariant(); | 307 | return QVariant(); |
| 308 | 308 | ||
| 309 | return QBrush(QColor(192, 192, 192)); | 309 | return QBrush(QColor(192, 192, 192)); |
| @@ -494,7 +494,7 @@ void GraphicsVertexShaderWidget::Reload(bool replace_vertex_data, void* vertex_d | |||
| 494 | debug_data = Pica::Shader::ProduceDebugInfo(input_vertex, num_attributes, shader_config, shader_setup); | 494 | debug_data = Pica::Shader::ProduceDebugInfo(input_vertex, num_attributes, shader_config, shader_setup); |
| 495 | 495 | ||
| 496 | // Reload widget state | 496 | // Reload widget state |
| 497 | for (unsigned int attr = 0; attr < num_attributes; ++attr) { | 497 | for (int attr = 0; attr < num_attributes; ++attr) { |
| 498 | unsigned source_attr = shader_config.input_register_map.GetRegisterForAttribute(attr); | 498 | unsigned source_attr = shader_config.input_register_map.GetRegisterForAttribute(attr); |
| 499 | input_data_mapping[source_attr]->setText(QString("-> v%1").arg(attr)); | 499 | input_data_mapping[source_attr]->setText(QString("-> v%1").arg(attr)); |
| 500 | input_data_container[source_attr]->setVisible(true); | 500 | input_data_container[source_attr]->setVisible(true); |
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index c10126513..00fa995f6 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -220,7 +220,7 @@ static void SwitchContext(Thread* new_thread) { | |||
| 220 | 220 | ||
| 221 | // Clean up the thread's wait_objects, they'll be restored if needed during | 221 | // Clean up the thread's wait_objects, they'll be restored if needed during |
| 222 | // the svcWaitSynchronization call | 222 | // the svcWaitSynchronization call |
| 223 | for (int i = 0; i < new_thread->wait_objects.size(); ++i) { | 223 | for (size_t i = 0; i < new_thread->wait_objects.size(); ++i) { |
| 224 | SharedPtr<WaitObject> object = new_thread->wait_objects[i]; | 224 | SharedPtr<WaitObject> object = new_thread->wait_objects[i]; |
| 225 | object->RemoveWaitingThread(new_thread); | 225 | object->RemoveWaitingThread(new_thread); |
| 226 | } | 226 | } |
diff --git a/src/core/hw/y2r.cpp b/src/core/hw/y2r.cpp index 15f96ced8..48c45564f 100644 --- a/src/core/hw/y2r.cpp +++ b/src/core/hw/y2r.cpp | |||
| @@ -324,7 +324,7 @@ void PerformConversion(ConversionConfiguration& cvt) { | |||
| 324 | 324 | ||
| 325 | u32* output_buffer = reinterpret_cast<u32*>(data_buffer.get()); | 325 | u32* output_buffer = reinterpret_cast<u32*>(data_buffer.get()); |
| 326 | 326 | ||
| 327 | for (int i = 0; i < num_tiles; ++i) { | 327 | for (size_t i = 0; i < num_tiles; ++i) { |
| 328 | int image_strip_width = 0; | 328 | int image_strip_width = 0; |
| 329 | int output_stride = 0; | 329 | int output_stride = 0; |
| 330 | 330 | ||
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 50eb157a5..a613fe136 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -69,7 +69,7 @@ void RasterizerOpenGL::InitObjects() { | |||
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | // Create sampler objects | 71 | // Create sampler objects |
| 72 | for (int i = 0; i < texture_samplers.size(); ++i) { | 72 | for (size_t i = 0; i < texture_samplers.size(); ++i) { |
| 73 | texture_samplers[i].Create(); | 73 | texture_samplers[i].Create(); |
| 74 | state.texture_units[i].sampler = texture_samplers[i].sampler.handle; | 74 | state.texture_units[i].sampler = texture_samplers[i].sampler.handle; |
| 75 | } | 75 | } |
| @@ -601,8 +601,8 @@ void RasterizerOpenGL::SyncFramebuffer() { | |||
| 601 | PAddr cur_fb_depth_addr = regs.framebuffer.GetDepthBufferPhysicalAddress(); | 601 | PAddr cur_fb_depth_addr = regs.framebuffer.GetDepthBufferPhysicalAddress(); |
| 602 | Pica::Regs::DepthFormat new_fb_depth_format = regs.framebuffer.depth_format; | 602 | Pica::Regs::DepthFormat new_fb_depth_format = regs.framebuffer.depth_format; |
| 603 | 603 | ||
| 604 | bool fb_size_changed = fb_color_texture.width != regs.framebuffer.GetWidth() || | 604 | bool fb_size_changed = fb_color_texture.width != static_cast<GLsizei>(regs.framebuffer.GetWidth()) || |
| 605 | fb_color_texture.height != regs.framebuffer.GetHeight(); | 605 | fb_color_texture.height != static_cast<GLsizei>(regs.framebuffer.GetHeight()); |
| 606 | 606 | ||
| 607 | bool color_fb_prop_changed = fb_color_texture.format != new_fb_color_format || | 607 | bool color_fb_prop_changed = fb_color_texture.format != new_fb_color_format || |
| 608 | fb_size_changed; | 608 | fb_size_changed; |