diff options
| author | bunnei <bunneidev@gmail.com> | 2016-02-04 06:13:17 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-02-05 23:20:24 +0100 |
| commit | c4d318f6915702e09866442f78d78747251779cb (patch) | |
| tree | aa25cf907f467e4e7b1b8f8be4659815a3890d2f /src | |
| parent | renderer_opengl: Use GLvec3/GLvec4 aliases for commonly used types. (diff) | |
| download | yuzu-c4d318f6915702e09866442f78d78747251779cb.tar yuzu-c4d318f6915702e09866442f78d78747251779cb.tar.gz yuzu-c4d318f6915702e09866442f78d78747251779cb.tar.bz2 yuzu-c4d318f6915702e09866442f78d78747251779cb.tar.lz yuzu-c4d318f6915702e09866442f78d78747251779cb.tar.xz yuzu-c4d318f6915702e09866442f78d78747251779cb.tar.zst yuzu-c4d318f6915702e09866442f78d78747251779cb.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index e7fec30cf..208a7bcb6 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -289,16 +289,11 @@ private: }; struct LightSrc { - GLvec3 specular_0; - INSERT_PADDING_WORDS(1); - GLvec3 specular_1; - INSERT_PADDING_WORDS(1); - GLvec3 diffuse; - INSERT_PADDING_WORDS(1); - GLvec3 ambient; - INSERT_PADDING_WORDS(1); - GLvec3 position; - INSERT_PADDING_WORDS(1); + alignas(16) GLvec3 specular_0; + alignas(16) GLvec3 specular_1; + alignas(16) GLvec3 diffuse; + alignas(16) GLvec3 ambient; + alignas(16) GLvec3 position; }; /// Uniform structure for the Uniform Buffer Object, all members must be 16-byte aligned @@ -308,9 +303,7 @@ private: GLvec4 tev_combiner_buffer_color; GLint alphatest_ref; GLfloat depth_offset; - INSERT_PADDING_WORDS(2); - GLvec3 lighting_global_ambient; - INSERT_PADDING_WORDS(1); + alignas(16) GLvec3 lighting_global_ambient; LightSrc light_src[8]; }; |