diff options
| author | Subv <subv2112@gmail.com> | 2018-06-20 11:39:10 -0500 | 
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2018-06-20 11:39:10 -0500 | 
| commit | a3d82ef5d90b02a256087edf9c0124b51b059c18 (patch) | |
| tree | 859f41acecbdcfcbdf19df80903a045d6e2b0bcb /src/video_core/engines | |
| parent | be1f5dedfbfd88a1e1b13d968d5526ffe14e6d6d (diff) | |
Build: Fixed some MSVC warnings in various parts of the code.
Diffstat (limited to 'src/video_core/engines')
| -rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 5 | ||||
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 4 | 
2 files changed, 5 insertions, 4 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index 86e9dc998..93c43c8cb 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -328,8 +328,9 @@ std::vector<Texture::FullTextureInfo> Maxwell3D::GetStageTextures(Regs::ShaderSt          Texture::FullTextureInfo tex_info{};          // TODO(Subv): Use the shader to determine which textures are actually accessed. -        tex_info.index = (current_texture - tex_info_buffer.address - TextureInfoOffset) / -                         sizeof(Texture::TextureHandle); +        tex_info.index = +            static_cast<u32>(current_texture - tex_info_buffer.address - TextureInfoOffset) / +            sizeof(Texture::TextureHandle);          // Load the TIC data.          if (tex_handle.tic_id != 0) { diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index 5ff861b04..cb4db0679 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h @@ -372,7 +372,7 @@ union Instruction {          BitField<31, 4, u64> component_mask;          bool IsComponentEnabled(size_t component) const { -            return ((1 << component) & component_mask) != 0; +            return ((1ull << component) & component_mask) != 0;          }      } tex; @@ -391,7 +391,7 @@ union Instruction {              ASSERT(component_mask_selector < mask.size()); -            return ((1 << component) & mask[component_mask_selector]) != 0; +            return ((1ull << component) & mask[component_mask_selector]) != 0;          }      } texs;  | 
