diff options
| author | 2014-12-31 15:02:48 +0100 | |
|---|---|---|
| committer | 2014-12-31 16:32:55 +0100 | |
| commit | 40c720084146e8c2c00b58bc42bf0ebd98fa1496 (patch) | |
| tree | 36c05b73c6553464bcd58800a1598e7dada33179 /src | |
| parent | Pica/CommandProcessor: Cleanups. (diff) | |
| download | yuzu-40c720084146e8c2c00b58bc42bf0ebd98fa1496.tar.gz yuzu-40c720084146e8c2c00b58bc42bf0ebd98fa1496.tar.xz yuzu-40c720084146e8c2c00b58bc42bf0ebd98fa1496.zip | |
Pica/VertexShader: Coding style fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/vertex_shader.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/video_core/vertex_shader.cpp b/src/video_core/vertex_shader.cpp index 090ffd420..ff825e2e1 100644 --- a/src/video_core/vertex_shader.cpp +++ b/src/video_core/vertex_shader.cpp | |||
| @@ -39,38 +39,31 @@ static struct { | |||
| 39 | static std::array<u32, 1024> shader_memory; | 39 | static std::array<u32, 1024> shader_memory; |
| 40 | static std::array<u32, 1024> swizzle_data; | 40 | static std::array<u32, 1024> swizzle_data; |
| 41 | 41 | ||
| 42 | void SubmitShaderMemoryChange(u32 addr, u32 value) | 42 | void SubmitShaderMemoryChange(u32 addr, u32 value) { |
| 43 | { | ||
| 44 | shader_memory[addr] = value; | 43 | shader_memory[addr] = value; |
| 45 | } | 44 | } |
| 46 | 45 | ||
| 47 | void SubmitSwizzleDataChange(u32 addr, u32 value) | 46 | void SubmitSwizzleDataChange(u32 addr, u32 value) { |
| 48 | { | ||
| 49 | swizzle_data[addr] = value; | 47 | swizzle_data[addr] = value; |
| 50 | } | 48 | } |
| 51 | 49 | ||
| 52 | Math::Vec4<float24>& GetFloatUniform(u32 index) | 50 | Math::Vec4<float24>& GetFloatUniform(u32 index) { |
| 53 | { | ||
| 54 | return shader_uniforms.f[index]; | 51 | return shader_uniforms.f[index]; |
| 55 | } | 52 | } |
| 56 | 53 | ||
| 57 | bool& GetBoolUniform(u32 index) | 54 | bool& GetBoolUniform(u32 index) { |
| 58 | { | ||
| 59 | return shader_uniforms.b[index]; | 55 | return shader_uniforms.b[index]; |
| 60 | } | 56 | } |
| 61 | 57 | ||
| 62 | Math::Vec4<u8>& GetIntUniform(u32 index) | 58 | Math::Vec4<u8>& GetIntUniform(u32 index) { |
| 63 | { | ||
| 64 | return shader_uniforms.i[index]; | 59 | return shader_uniforms.i[index]; |
| 65 | } | 60 | } |
| 66 | 61 | ||
| 67 | const std::array<u32, 1024>& GetShaderBinary() | 62 | const std::array<u32, 1024>& GetShaderBinary() { |
| 68 | { | ||
| 69 | return shader_memory; | 63 | return shader_memory; |
| 70 | } | 64 | } |
| 71 | 65 | ||
| 72 | const std::array<u32, 1024>& GetSwizzlePatterns() | 66 | const std::array<u32, 1024>& GetSwizzlePatterns() { |
| 73 | { | ||
| 74 | return swizzle_data; | 67 | return swizzle_data; |
| 75 | } | 68 | } |
| 76 | 69 | ||
| @@ -444,8 +437,7 @@ static void ProcessShaderCode(VertexShaderState& state) { | |||
| 444 | } | 437 | } |
| 445 | } | 438 | } |
| 446 | 439 | ||
| 447 | OutputVertex RunShader(const InputVertex& input, int num_attributes) | 440 | OutputVertex RunShader(const InputVertex& input, int num_attributes) { |
| 448 | { | ||
| 449 | VertexShaderState state; | 441 | VertexShaderState state; |
| 450 | 442 | ||
| 451 | const u32* main = &shader_memory[registers.vs_main_offset]; | 443 | const u32* main = &shader_memory[registers.vs_main_offset]; |