diff options
| author |  Lioncash | 2018-08-21 15:08:33 -0400 |
|---|---|---|
| committer | Lioncash | 2018-08-21 15:08:35 -0400 |
| commit | a0e2bd85a5724dd9a4bcf69f9bd3a1ec7a39fe75 (patch) | |
| tree | cd4447d4ff40dadfab513d44cfd8bf5e1e14b2a9 /src | |
| parent | Merge pull request #1143 from lioncash/inc (diff) | |
| download | yuzu-a0e2bd85a5724dd9a4bcf69f9bd3a1ec7a39fe75.tar.gz yuzu-a0e2bd85a5724dd9a4bcf69f9bd3a1ec7a39fe75.tar.xz yuzu-a0e2bd85a5724dd9a4bcf69f9bd3a1ec7a39fe75.zip | |
shader_bytecode: Parenthesize conditional expression within GetTextureType()
Resolves a -Wlogical-op-parentheses warning.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index 875b90359..67194b0e3 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h | |||
| @@ -518,7 +518,7 @@ union Instruction { | |||
| 518 | return TextureType::Texture1D; | 518 | return TextureType::Texture1D; |
| 519 | } | 519 | } |
| 520 | if (texture_info == 2 || texture_info == 8 || texture_info == 12 || | 520 | if (texture_info == 2 || texture_info == 8 || texture_info == 12 || |
| 521 | texture_info >= 4 && texture_info <= 6) { | 521 | (texture_info >= 4 && texture_info <= 6)) { |
| 522 | return TextureType::Texture2D; | 522 | return TextureType::Texture2D; |
| 523 | } | 523 | } |
| 524 | if (texture_info == 7) { | 524 | if (texture_info == 7) { |