diff options
author | Jannik Vogel <email@jannikvogel.de> | 2016-05-23 16:03:11 +0200 |
---|---|---|
committer | Jannik Vogel <email@jannikvogel.de> | 2016-06-07 00:06:28 +0200 |
commit | c900c092e329d2e78b9663c1c3fe401da7faaea5 (patch) | |
tree | 63c3eb37dd9871f04fad9e3b4f772d4b58e16817 /src/video_core/renderer_opengl/gl_rasterizer.h | |
parent | Merge pull request #1873 from archshift/remove-config (diff) | |
download | yuzu-c900c092e329d2e78b9663c1c3fe401da7faaea5.tar yuzu-c900c092e329d2e78b9663c1c3fe401da7faaea5.tar.gz yuzu-c900c092e329d2e78b9663c1c3fe401da7faaea5.tar.bz2 yuzu-c900c092e329d2e78b9663c1c3fe401da7faaea5.tar.lz yuzu-c900c092e329d2e78b9663c1c3fe401da7faaea5.tar.xz yuzu-c900c092e329d2e78b9663c1c3fe401da7faaea5.tar.zst yuzu-c900c092e329d2e78b9663c1c3fe401da7faaea5.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index bb7f20161..bdc7bd0f2 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h @@ -316,16 +316,18 @@ private: GLfloat dist_atten_scale; }; - /// Uniform structure for the Uniform Buffer Object, all members must be 16-byte aligned + /// Uniform structure for the Uniform Buffer Object, all vectors must be 16-byte aligned + // NOTE: Always keep a vec4 at the end. The GL spec is not clear wether the alignment at + // the end of a uniform block is included in UNIFORM_BLOCK_DATA_SIZE or not. + // Not following that rule will cause problems on some AMD drivers. struct UniformData { - // A vec4 color for each of the six tev stages - GLvec4 const_color[6]; - GLvec4 tev_combiner_buffer_color; GLint alphatest_ref; GLfloat depth_scale; GLfloat depth_offset; alignas(16) GLvec3 lighting_global_ambient; LightSrc light_src[8]; + alignas(16) GLvec4 const_color[6]; // A vec4 color for each of the six tev stages + alignas(16) GLvec4 tev_combiner_buffer_color; }; static_assert(sizeof(UniformData) == 0x390, "The size of the UniformData structure has changed, update the structure in the shader"); |